avTranscoder · MarcAntoine-Arnaud · Aug 21, 2014 · Aug 21, 2014 · Aug 21, 2014 · Aug 21, 2014
diff --git a/SConstruct b/SConstruct
@@ -169,15 +169,11 @@ Export( "envJava" )
 Export( "envPy" )
 Export( "installPrefix" )
 Export( "resampleLibraryName" )
+Export( "mymode" )
 
 VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 )
 VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 )
-
-sconscripts = [
-    'build/src/SConscript',
-    'build/app/SConscript',
-]
 
 SConscript('src/SConscript', variant_dir='build/'+mymode+'/src')
-SConscript('app/SConscript', variant_dir='build/'+mymode+'/app')
-
+SConscript('app/cpp/SConscript', variant_dir='build/'+mymode+'/app/cpp')
+#SConscript('app/java/SConscript', variant_dir='build/'+mymode+'/app/java')
diff --git a/app/SConscript → app/cpp/SConscript b/app/SConscript → app/cpp/SConscript
diff --git a/app/avInfo/avInfo.cpp → app/cpp/avInfo/avInfo.cpp b/app/avInfo/avInfo.cpp → app/cpp/avInfo/avInfo.cpp
diff --git a/app/avInfo/avinfo.man → app/cpp/avInfo/avinfo.man b/app/avInfo/avinfo.man → app/cpp/avInfo/avinfo.man
diff --git a/app/avMeta/avMeta.cpp → app/cpp/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp → app/cpp/avMeta/avMeta.cpp
diff --git a/app/avMeta/avmeta.man → app/cpp/avMeta/avmeta.man b/app/avMeta/avmeta.man → app/cpp/avMeta/avmeta.man
diff --git a/app/avTranscoder/av++.man → app/cpp/avTranscoder/av++.man b/app/avTranscoder/av++.man → app/cpp/avTranscoder/av++.man
diff --git a/app/avTranscoder/avTranscoder.cpp → app/cpp/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp → app/cpp/avTranscoder/avTranscoder.cpp
diff --git a/app/avplay/AvReader.hpp → app/cpp/avplay/AvReader.hpp b/app/avplay/AvReader.hpp → app/cpp/avplay/AvReader.hpp
diff --git a/app/avplay/Reader.hpp → app/cpp/avplay/Reader.hpp b/app/avplay/Reader.hpp → app/cpp/avplay/Reader.hpp
diff --git a/app/avplay/Window.cpp → app/cpp/avplay/Window.cpp b/app/avplay/Window.cpp → app/cpp/avplay/Window.cpp
diff --git a/app/avplay/Window.hpp → app/cpp/avplay/Window.hpp b/app/avplay/Window.hpp → app/cpp/avplay/Window.hpp
diff --git a/app/avplay/main.cpp → app/cpp/avplay/main.cpp b/app/avplay/main.cpp → app/cpp/avplay/main.cpp
diff --git a/app/genericProcessor/avprocessor.man → app/cpp/genericProcessor/avprocessor.man b/app/genericProcessor/avprocessor.man → app/cpp/genericProcessor/avprocessor.man
diff --git a/app/genericProcessor/genericProcessor.cpp → ...cpp/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp → ...cpp/genericProcessor/genericProcessor.cpp
diff --git a/app/optionChecker/optionChecker.cpp → app/cpp/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp → app/cpp/optionChecker/optionChecker.cpp
diff --git a/app/presetChecker/presetChecker.cpp → app/cpp/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp → app/cpp/presetChecker/presetChecker.cpp
diff --git a/app/jTranscoder/jTranscoder.java b/app/jTranscoder/jTranscoder.java
diff --git a/app/java/SConscript b/app/java/SConscript
@@ -0,0 +1,20 @@
+import os
+import platform
+
+Import( 'env' )
+Import( 'envJava' )
+Import( 'mymode' )
+Import( 'jAvTranscoder' )
+Import( 'jAvTranscoderClass' )
+Import( 'installPrefix' )
+
+if jAvTranscoderClass:
+	envJava.Append( 
+		JAVACLASSPATH = '.:build/'+mymode+'/src/jAvTranscoderClass/'
+	)
+
+	javTranscoder_class = envJava.Java(
+		target = 'javTranscoderClass',
+		source = Glob( 'jTranscoder/*.java')
+	)
+	env.Depends( javTranscoder_class, jAvTranscoder )
diff --git a/app/java/jTranscoder/jTranscoder.java b/app/java/jTranscoder/jTranscoder.java
@@ -0,0 +1,11 @@
+
+import org.AvTranscoder.InputFile;
+
+
+public class jTranscoder {
+	public static void main( String[] args ){
+		System.out.println( "hello grosse buse !");
+		InputFile test = new InputFile( "_Rocky_DNxHD185X.mxf" );
+		System.out.println( "C'est fini biloute ....");
+	}
+}
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 =  os.path.join( 'jAvTranscoderJar', '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 ) )