Sconscript of src: refactoring

Clement Champetier · Clement Champetier · commit 542ffcd1c8aa · 2014-08-21T16:27:22.000+02:00
Move how to generate JAR before install instructions.
diff --git a/src/SConscript b/src/SConscript
@@ -86,14 +86,23 @@ javaAvTranscoder_class = env.Java(
     target = 'jAvTranscoderClass',
     source = Glob( envJava['JARCHDIR'] )
 )
-
 env.Depends( javaAvTranscoder_class, javaAvTranscoder )
 
+if not javaAvTranscoder_class:
+	print "Java binding: can't generate JAR file while first build, because java classes are not already generated. Relaunch the build to generate it."
+else:
+	javaAvTranscoder_jar = env.Jar(
+		# Add version to the JAR name
+		target = 'jAvTranscoder.' + avTranscoderVersion,
+		source = javaAvTranscoder_class
+	)
+	env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )
+	env.Alias( "install", env.Install( os.path.join( installPrefix, "jar" ), javaAvTranscoder_jar ) )
+
 Export( { 'sAvTranscoder' : staticAvTranscoder } )
 Export( { 'AvTranscoder'  : sharedAvTranscoder } )
 Export( { 'jAvTranscoder'  : javaAvTranscoder } )
 Export( { 'pyAvTranscoder'  : pythonAvTranscoder } )
-
 Export( { 'jAvTranscoderClass'  : javaAvTranscoder_class } )
 
 env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), sharedAvTranscoder) )
@@ -111,15 +120,3 @@ env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTransc
 env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/MediaMetadatasStructures.hpp' ) ) )
 env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/Print.hpp' ) ) )
 env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Transcoder" ), Glob( 'AvTranscoder/Transcoder/*.hpp' ) ) )
-
-if not javaAvTranscoder_class:
-	print "Java binding: can't generate JAR file while first build, because java classes are not already generated. Relaunch the build to generate it."
-else:
-	javaAvTranscoder_jar = env.Jar(
-		# Add version to the JAR name
-		target = 'jAvTranscoder.' + avTranscoderVersion,
-		source = javaAvTranscoder_class
-	)
-	env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )
-	Export( { 'jAvTranscoderJar'  : javaAvTranscoder_jar } )
-	env.Alias( "install", env.Install( os.path.join( installPrefix, "jar" ), javaAvTranscoder_jar ) )
