Skip to content

Commit b94b890

Browse files
Merge pull request #68 from cchampet/build_organize_apps
Build: organize apps
2 parents 7a9f966 + 98e1ccd commit b94b890

File tree

21 files changed

+45
-32
lines changed

21 files changed

+45
-32
lines changed

SConstruct

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,11 @@ Export( "envJava" )
192192
Export( "envPy" )
193193
Export( "installPrefix" )
194194
Export( "resampleLibraryName" )
195+
Export( "mymode" )
195196

196197
VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 )
197198
VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 )
198-
199-
sconscripts = [
200-
'build/src/SConscript',
201-
'build/app/SConscript',
202-
]
203199

204200
SConscript('src/SConscript', variant_dir='build/'+mymode+'/src')
205-
SConscript('app/SConscript', variant_dir='build/'+mymode+'/app')
206-
201+
SConscript('app/cpp/SConscript', variant_dir='build/'+mymode+'/app/cpp')
202+
#SConscript('app/java/SConscript', variant_dir='build/'+mymode+'/app/java')
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/jTranscoder/jTranscoder.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

app/java/SConscript

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import os
2+
import platform
3+
4+
Import( 'env' )
5+
Import( 'envJava' )
6+
Import( 'mymode' )
7+
Import( 'jAvTranscoder' )
8+
Import( 'jAvTranscoderClass' )
9+
Import( 'installPrefix' )
10+
11+
if jAvTranscoderClass:
12+
envJava.Append(
13+
JAVACLASSPATH = '.:build/'+mymode+'/src/jAvTranscoderClass/'
14+
)
15+
16+
javTranscoder_class = envJava.Java(
17+
target = 'javTranscoderClass',
18+
source = Glob( 'jTranscoder/*.java')
19+
)
20+
env.Depends( javTranscoder_class, jAvTranscoder )

app/java/jTranscoder/jTranscoder.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
import org.AvTranscoder.InputFile;
3+
4+
5+
public class jTranscoder {
6+
public static void main( String[] args ){
7+
System.out.println( "hello grosse buse !");
8+
InputFile test = new InputFile( "_Rocky_DNxHD185X.mxf" );
9+
System.out.println( "C'est fini biloute ....");
10+
}
11+
}

src/SConscript

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,23 @@ javaAvTranscoder_class = env.Java(
8686
target = 'jAvTranscoderClass',
8787
source = Glob( envJava['JARCHDIR'] )
8888
)
89-
9089
env.Depends( javaAvTranscoder_class, javaAvTranscoder )
9190

91+
if not javaAvTranscoder_class:
92+
print "Java binding: can't generate JAR file while first build, because java classes are not already generated. Relaunch the build to generate it."
93+
else:
94+
javaAvTranscoder_jar = env.Jar(
95+
# Add version to the JAR name
96+
target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avTranscoderVersion),
97+
source = javaAvTranscoder_class
98+
)
99+
env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )
100+
env.Alias( "install", env.Install( os.path.join( installPrefix, "jar" ), javaAvTranscoder_jar ) )
101+
92102
Export( { 'sAvTranscoder' : staticAvTranscoder } )
93103
Export( { 'AvTranscoder' : sharedAvTranscoder } )
94104
Export( { 'jAvTranscoder' : javaAvTranscoder } )
95105
Export( { 'pyAvTranscoder' : pythonAvTranscoder } )
96-
97106
Export( { 'jAvTranscoderClass' : javaAvTranscoder_class } )
98107

99108
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
111120
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/MediaMetadatasStructures.hpp' ) ) )
112121
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/Print.hpp' ) ) )
113122
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Transcoder" ), Glob( 'AvTranscoder/Transcoder/*.hpp' ) ) )
114-
115-
if not javaAvTranscoder_class:
116-
print "Java binding: can't generate JAR file while first build, because java classes are not already generated. Relaunch the build to generate it."
117-
else:
118-
javaAvTranscoder_jar = env.Jar(
119-
# Add version to the JAR name
120-
target = 'jAvTranscoder.' + avTranscoderVersion,
121-
source = javaAvTranscoder_class
122-
)
123-
env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )
124-
Export( { 'jAvTranscoderJar' : javaAvTranscoder_jar } )
125-
env.Alias( "install", env.Install( os.path.join( installPrefix, "jar" ), javaAvTranscoder_jar ) )

0 commit comments

Comments
 (0)