From 2c4e430261091733b2b1a017fc7b2922f6dc2fb6 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 21 Aug 2014 16:10:36 +0200 Subject: [PATCH 1/4] Apps: create cpp folder for cpp apps * Want an app directory like this: * app * cpp * SConscript * java * SConscript * python * SConscript * The Sconscript in app will call each SConscript (in cpp, java, and python). --- SConstruct | 7 +------ app/{ => cpp}/SConscript | 0 app/{ => cpp}/avInfo/avInfo.cpp | 0 app/{ => cpp}/avInfo/avinfo.man | 0 app/{ => cpp}/avMeta/avMeta.cpp | 0 app/{ => cpp}/avMeta/avmeta.man | 0 app/{ => cpp}/avTranscoder/av++.man | 0 app/{ => cpp}/avTranscoder/avTranscoder.cpp | 0 app/{ => cpp}/avplay/AvReader.hpp | 0 app/{ => cpp}/avplay/Reader.hpp | 0 app/{ => cpp}/avplay/Window.cpp | 0 app/{ => cpp}/avplay/Window.hpp | 0 app/{ => cpp}/avplay/main.cpp | 0 app/{ => cpp}/genericProcessor/avprocessor.man | 0 app/{ => cpp}/genericProcessor/genericProcessor.cpp | 0 app/{ => cpp}/optionChecker/optionChecker.cpp | 0 app/{ => cpp}/presetChecker/presetChecker.cpp | 0 17 files changed, 1 insertion(+), 6 deletions(-) rename app/{ => cpp}/SConscript (100%) rename app/{ => cpp}/avInfo/avInfo.cpp (100%) rename app/{ => cpp}/avInfo/avinfo.man (100%) rename app/{ => cpp}/avMeta/avMeta.cpp (100%) rename app/{ => cpp}/avMeta/avmeta.man (100%) rename app/{ => cpp}/avTranscoder/av++.man (100%) rename app/{ => cpp}/avTranscoder/avTranscoder.cpp (100%) rename app/{ => cpp}/avplay/AvReader.hpp (100%) rename app/{ => cpp}/avplay/Reader.hpp (100%) rename app/{ => cpp}/avplay/Window.cpp (100%) rename app/{ => cpp}/avplay/Window.hpp (100%) rename app/{ => cpp}/avplay/main.cpp (100%) rename app/{ => cpp}/genericProcessor/avprocessor.man (100%) rename app/{ => cpp}/genericProcessor/genericProcessor.cpp (100%) rename app/{ => cpp}/optionChecker/optionChecker.cpp (100%) rename app/{ => cpp}/presetChecker/presetChecker.cpp (100%) diff --git a/SConstruct b/SConstruct index f3ffbb90..f9a53a7c 100644 --- a/SConstruct +++ b/SConstruct @@ -172,12 +172,7 @@ Export( "resampleLibraryName" ) 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') diff --git a/app/SConscript b/app/cpp/SConscript similarity index 100% rename from app/SConscript rename to app/cpp/SConscript diff --git a/app/avInfo/avInfo.cpp b/app/cpp/avInfo/avInfo.cpp similarity index 100% rename from app/avInfo/avInfo.cpp rename to app/cpp/avInfo/avInfo.cpp diff --git a/app/avInfo/avinfo.man b/app/cpp/avInfo/avinfo.man similarity index 100% rename from app/avInfo/avinfo.man rename to app/cpp/avInfo/avinfo.man diff --git a/app/avMeta/avMeta.cpp b/app/cpp/avMeta/avMeta.cpp similarity index 100% rename from app/avMeta/avMeta.cpp rename to app/cpp/avMeta/avMeta.cpp diff --git a/app/avMeta/avmeta.man b/app/cpp/avMeta/avmeta.man similarity index 100% rename from app/avMeta/avmeta.man rename to app/cpp/avMeta/avmeta.man diff --git a/app/avTranscoder/av++.man b/app/cpp/avTranscoder/av++.man similarity index 100% rename from app/avTranscoder/av++.man rename to app/cpp/avTranscoder/av++.man diff --git a/app/avTranscoder/avTranscoder.cpp b/app/cpp/avTranscoder/avTranscoder.cpp similarity index 100% rename from app/avTranscoder/avTranscoder.cpp rename to app/cpp/avTranscoder/avTranscoder.cpp diff --git a/app/avplay/AvReader.hpp b/app/cpp/avplay/AvReader.hpp similarity index 100% rename from app/avplay/AvReader.hpp rename to app/cpp/avplay/AvReader.hpp diff --git a/app/avplay/Reader.hpp b/app/cpp/avplay/Reader.hpp similarity index 100% rename from app/avplay/Reader.hpp rename to app/cpp/avplay/Reader.hpp diff --git a/app/avplay/Window.cpp b/app/cpp/avplay/Window.cpp similarity index 100% rename from app/avplay/Window.cpp rename to app/cpp/avplay/Window.cpp diff --git a/app/avplay/Window.hpp b/app/cpp/avplay/Window.hpp similarity index 100% rename from app/avplay/Window.hpp rename to app/cpp/avplay/Window.hpp diff --git a/app/avplay/main.cpp b/app/cpp/avplay/main.cpp similarity index 100% rename from app/avplay/main.cpp rename to app/cpp/avplay/main.cpp diff --git a/app/genericProcessor/avprocessor.man b/app/cpp/genericProcessor/avprocessor.man similarity index 100% rename from app/genericProcessor/avprocessor.man rename to app/cpp/genericProcessor/avprocessor.man diff --git a/app/genericProcessor/genericProcessor.cpp b/app/cpp/genericProcessor/genericProcessor.cpp similarity index 100% rename from app/genericProcessor/genericProcessor.cpp rename to app/cpp/genericProcessor/genericProcessor.cpp diff --git a/app/optionChecker/optionChecker.cpp b/app/cpp/optionChecker/optionChecker.cpp similarity index 100% rename from app/optionChecker/optionChecker.cpp rename to app/cpp/optionChecker/optionChecker.cpp diff --git a/app/presetChecker/presetChecker.cpp b/app/cpp/presetChecker/presetChecker.cpp similarity index 100% rename from app/presetChecker/presetChecker.cpp rename to app/cpp/presetChecker/presetChecker.cpp From a4ed697077674fda5a0ad4a4158dbed7ccdc3f07 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 21 Aug 2014 16:24:16 +0200 Subject: [PATCH 2/4] Apps: create java folder for java apps * Update jTranscoder app to fit to the package name and an existing avTranscoder class. * Comment the line which calls the Sconscript of java apps from SConstruct (need several builds to generate class files of java apps...need to find something better). --- SConstruct | 3 ++- app/jTranscoder/jTranscoder.java | 11 ----------- app/java/SConscript | 20 ++++++++++++++++++++ app/java/jTranscoder/jTranscoder.java | 11 +++++++++++ 4 files changed, 33 insertions(+), 12 deletions(-) delete mode 100644 app/jTranscoder/jTranscoder.java create mode 100644 app/java/SConscript create mode 100644 app/java/jTranscoder/jTranscoder.java diff --git a/SConstruct b/SConstruct index f9a53a7c..e323f7d3 100644 --- a/SConstruct +++ b/SConstruct @@ -169,10 +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 ) SConscript('src/SConscript', variant_dir='build/'+mymode+'/src') SConscript('app/cpp/SConscript', variant_dir='build/'+mymode+'/app/cpp') - +#SConscript('app/java/SConscript', variant_dir='build/'+mymode+'/app/java') diff --git a/app/jTranscoder/jTranscoder.java b/app/jTranscoder/jTranscoder.java deleted file mode 100644 index eb47b444..00000000 --- a/app/jTranscoder/jTranscoder.java +++ /dev/null @@ -1,11 +0,0 @@ - -import avTranscoder.Media; - - -public class jTranscoder { - public static void main( String[] args ){ - System.out.println( "hello grosse buse !"); - Media m = new Media( "/mnt/backup/PADdef/Livraison_20131003/001_From_OpenCube/Wrapped/OpenCube_Server_BWF/PADdef_1.2.3_3\'_Rocky_DNxHD185X.mxf" ); - System.out.println( "C'est fini biloute ...."); - } -} \ No newline at end of file diff --git a/app/java/SConscript b/app/java/SConscript new file mode 100644 index 00000000..8482f074 --- /dev/null +++ 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 ) \ No newline at end of file diff --git a/app/java/jTranscoder/jTranscoder.java b/app/java/jTranscoder/jTranscoder.java new file mode 100644 index 00000000..099736ff --- /dev/null +++ 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 ...."); + } +} \ No newline at end of file From 542ffcd1c8aaf8efd2c61dac4ac8269817a2644e Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 21 Aug 2014 11:48:55 +0200 Subject: [PATCH 3/4] Sconscript of src: refactoring Move how to generate JAR before install instructions. --- src/SConscript | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/SConscript b/src/SConscript index ef45f5ab..ea4df033 100644 --- 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 ) ) From 98e1ccdbf29c870d6575a822ed06e7a9df9ed459 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 21 Aug 2014 12:15:37 +0200 Subject: [PATCH 4/4] Sconscript: put Jar in a directory when build it --- src/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SConscript b/src/SConscript index ea4df033..f58a8716 100644 --- a/src/SConscript +++ b/src/SConscript @@ -93,7 +93,7 @@ if not javaAvTranscoder_class: else: javaAvTranscoder_jar = env.Jar( # Add version to the JAR name - target = 'jAvTranscoder.' + avTranscoderVersion, + target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avTranscoderVersion), source = javaAvTranscoder_class ) env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )