Skip to content

Commit 22499b4

Browse files
author
Clement Champetier
committed
Sconscript: versioning java and python libs
1 parent b7eefa1 commit 22499b4

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

src/SConscript

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ javaAvTranscoder = envJava.SharedLibrary(
5151
'swscale',
5252
resampleLibraryName,
5353
],
54+
SHLIBVERSION = avTranscoderVersion,
5455
)
5556

5657
pythonAvTranscoder = envPy.SharedLibrary(
@@ -64,30 +65,36 @@ pythonAvTranscoder = envPy.SharedLibrary(
6465
'swscale',
6566
resampleLibraryName,
6667
],
68+
SHLIBVERSION = avTranscoderVersion,
6769
)
6870

69-
#avTranscoder_class = env.Java(
70-
# target='AvTranscoderClass',
71-
# source=Glob( envJava['JARCHDIR'] )
72-
#)
71+
javaAvTranscoder_class = env.Java(
72+
target = 'jAvTranscoderClass',
73+
source = Glob( envJava['JARCHDIR'] )
74+
)
7375

74-
#avTranscoder_jar = env.Jar(
75-
# target='jAvTranscoder.jar',
76-
# source=avTranscoder_class,
77-
#)
76+
javaAvTranscoder_jar = env.Jar(
77+
target = 'jAvTranscoderJar',
78+
source = javaAvTranscoder_class
79+
)
7880

81+
env.Depends( javaAvTranscoder_class, javaAvTranscoder )
82+
env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )
7983

80-
# env.Depends( avTranscoder_class, jAvTranscoder )
81-
# env.Depends( avTranscoder_jar, avTranscoder_class )
8284
Export( { 'sAvTranscoder' : staticAvTranscoder } )
8385
Export( { 'AvTranscoder' : sharedAvTranscoder } )
86+
Export( { 'jAvTranscoder' : javaAvTranscoder } )
87+
Export( { 'pyAvTranscoder' : pythonAvTranscoder } )
8488

85-
# Export( { 'AvTranscoder_jar': avTranscoder_class } )
89+
Export( { 'jAvTranscoderClass' : javaAvTranscoder_class } )
90+
Export( { 'jAvTranscoderJar' : javaAvTranscoder_jar } )
8691

8792
env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), sharedAvTranscoder) )
8893
env.Alias( "install", env.Install( os.path.join( installPrefix, "lib" ), staticAvTranscoder ) )
8994
env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), javaAvTranscoder ) )
95+
env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), pythonAvTranscoder ) )
9096

97+
env.Alias( "install", env.Install( os.path.join( installPrefix, "jar" ), javaAvTranscoder_jar) )
9198

9299
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder" ), Glob( 'AvTranscoder/*.hpp' ) ) )
93100
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/CodedStream" ), Glob( 'AvTranscoder/CodedStream/*.hpp' ) ) )
@@ -98,6 +105,4 @@ env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTransc
98105
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/File" ), Glob( 'AvTranscoder/File/*.hpp' ) ) )
99106
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/MediaMetadatasStructures.hpp' ) ) )
100107
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/Print.hpp' ) ) )
101-
#env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Profiles" ), Glob( 'AvTranscoder/Profiles/*.hpp' ) ) )
102108
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Transcoder" ), Glob( 'AvTranscoder/Transcoder/*.hpp' ) ) )
103-

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy