Sconscript: refactoring

Clement Champetier · Clement Champetier · commit b7eefa155f31 · 2014-08-18T11:58:30.000+02:00
Rename variables, to distinguish the lib's name from the name of the
lib's variable.
diff --git a/src/SConscript b/src/SConscript
@@ -7,13 +7,13 @@ Import( "envPy" )
 Import( "installPrefix" )
 Import( "resampleLibraryName" )
 
-AvTranscoderVersion = "0.0.1"
+avTranscoderVersion = "0.0.1"
 
 env.Append(
-    SHLIBVERSION = AvTranscoderVersion
+    SHLIBVERSION = avTranscoderVersion
 )
 
-sAvTranscoder = env.StaticLibrary(
+staticAvTranscoder = env.StaticLibrary(
     'sAvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) +
     Glob( 'AvTranscoder/*/*.cpp' ),
@@ -26,7 +26,7 @@ sAvTranscoder = env.StaticLibrary(
     ]
 )
 
-SharedAvTranscoder = env.SharedLibrary(
+sharedAvTranscoder = env.SharedLibrary(
     'AvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) +
     Glob( 'AvTranscoder/*/*.cpp' ),
@@ -37,34 +37,34 @@ SharedAvTranscoder = env.SharedLibrary(
         'swscale',
         resampleLibraryName,
     ],
-    SHLIBVERSION = AvTranscoderVersion,
+    SHLIBVERSION = avTranscoderVersion,
 )
 
-jAvTranscoder = envJava.SharedLibrary(
-        'jAvTranscoder',
-        source=['AvTranscoder/avTranscoder.i'],
-        LIBS=[ 
-            sAvTranscoder,
-            'avutil',
-            'avcodec',
-            'avformat',
-            'swscale',
-            resampleLibraryName,
-        ],
-    )
-
-pyAvTranscoder = envPy.SharedLibrary(
-        'pyAvTranscoder',
-        source='AvTranscoder/avTranscoder.i',
-        LIBS=[
-            sAvTranscoder,
-            'avutil',
-            'avcodec',
-            'avformat',
-            'swscale',
-            resampleLibraryName,
-        ],
-    )
+javaAvTranscoder = envJava.SharedLibrary(
+	'jAvTranscoder',
+	source=['AvTranscoder/avTranscoder.i'],
+	LIBS=[ 
+		staticAvTranscoder,
+		'avutil',
+		'avcodec',
+		'avformat',
+		'swscale',
+		resampleLibraryName,
+	],
+)
+
+pythonAvTranscoder = envPy.SharedLibrary(
+	'pyAvTranscoder',
+	source='AvTranscoder/avTranscoder.i',
+	LIBS=[
+		staticAvTranscoder,
+		'avutil',
+		'avcodec',
+		'avformat',
+		'swscale',
+		resampleLibraryName,
+	],
+)
 
 #avTranscoder_class = env.Java(
 #    target='AvTranscoderClass',
@@ -79,16 +79,15 @@ pyAvTranscoder = envPy.SharedLibrary(
 
 # env.Depends( avTranscoder_class, jAvTranscoder )
 # env.Depends( avTranscoder_jar, avTranscoder_class )
+Export( { 'sAvTranscoder' : staticAvTranscoder } )
+Export( { 'AvTranscoder'  : sharedAvTranscoder } )
 
-Export( { 'sAvTranscoder' : sAvTranscoder } )
-Export( { 'AvTranscoder'  : 'AvTranscoder' } )
 # Export( { 'AvTranscoder_jar': avTranscoder_class } )
 
-installSharedLib = env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), SharedAvTranscoder)
+env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), sharedAvTranscoder) )
+env.Alias( "install", env.Install( os.path.join( installPrefix, "lib" ), staticAvTranscoder ) )
+env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), javaAvTranscoder ) )
 
-env.Alias( "install", env.Install(os.path.join( installPrefix, "lib" ), sAvTranscoder ) )
-env.Alias( "install", installSharedLib )
-env.Alias( "install", env.Install(os.path.join( installPrefix, "lib" ), jAvTranscoder ) )
 
 env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder" ), Glob( 'AvTranscoder/*.hpp' ) ) )
 env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/CodedStream" ), Glob( 'AvTranscoder/CodedStream/*.hpp' ) ) )
