Skip to content

Commit 40a023d

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
remove prefix for install command. Set jar to share/java path.
1 parent b1fca1d commit 40a023d

File tree

4 files changed

+18
-23
lines changed

4 files changed

+18
-23
lines changed

‎SConstruct

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ config.read( [
1818

1919
commonInclude = []
2020
commonLibDir = []
21-
installPrefix = "/usr/local"
2221

2322
splitChar = ";"
2423

@@ -190,7 +189,6 @@ if mymode == "debug":
190189
Export( "env" )
191190
Export( "envJava" )
192191
Export( "envPy" )
193-
Export( "installPrefix" )
194192
Export( "resampleLibraryName" )
195193
Export( "mymode" )
196194

‎app/cpp/SConscript

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import platform
44
Import( 'AvTranscoder' )
55
Import( 'sAvTranscoder' )
66
#Import( 'AvTranscoder_jar' )
7-
Import( 'installPrefix' )
87
Import( "resampleLibraryName" )
98

109
env = Environment().Clone()
@@ -116,6 +115,6 @@ if platform.system() != 'Windows':
116115

117116
env.Depends( avmeta, sAvTranscoder )
118117

119-
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), avmeta ) )
120-
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), avprocessor ) )
121-
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), avtransform ) )
118+
env.Alias( "install", env.Install("bin", avmeta ) )
119+
env.Alias( "install", env.Install("bin", avprocessor ) )
120+
env.Alias( "install", env.Install("bin", avtransform ) )

‎app/java/SConscript

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Import( 'envJava' )
66
Import( 'mymode' )
77
Import( 'jAvTranscoder' )
88
Import( 'jAvTranscoderClass' )
9-
Import( 'installPrefix' )
109

1110
if jAvTranscoderClass:
1211
envJava.Append(

‎src/SConscript

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import git
66
Import( "env" )
77
Import( "envJava" )
88
Import( "envPy" )
9-
Import( "installPrefix" )
109
Import( "resampleLibraryName" )
1110

1211
# Get version from last tag of git repository
@@ -104,26 +103,26 @@ else:
104103
source = javaAvTranscoder_class
105104
)
106105
env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )
107-
env.Alias( "install", env.Install( os.path.join( installPrefix, "jar" ), javaAvTranscoder_jar ) )
106+
env.Alias( "install", env.Install( os.path.join("share", "java"), javaAvTranscoder_jar ) )
108107

109108
Export( { 'sAvTranscoder' : staticAvTranscoder } )
110109
Export( { 'AvTranscoder' : sharedAvTranscoder } )
111110
Export( { 'jAvTranscoder' : javaAvTranscoder } )
112111
Export( { 'pyAvTranscoder' : pythonAvTranscoder } )
113112
Export( { 'jAvTranscoderClass' : javaAvTranscoder_class } )
114113

115-
env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), sharedAvTranscoder) )
116-
env.Alias( "install", env.Install( os.path.join( installPrefix, "lib" ), staticAvTranscoder ) )
117-
env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), javaAvTranscoder ) )
118-
env.Alias( "install", env.InstallVersionedLib( os.path.join( installPrefix, "lib" ), pythonAvTranscoder ) )
114+
env.Alias( "install", env.InstallVersionedLib( "lib", sharedAvTranscoder) )
115+
env.Alias( "install", env.Install( "lib", staticAvTranscoder ) )
116+
env.Alias( "install", env.InstallVersionedLib( "lib", javaAvTranscoder ) )
117+
env.Alias( "install", env.InstallVersionedLib( "lib", pythonAvTranscoder ) )
119118

120-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder" ), Glob( 'AvTranscoder/*.hpp' ) ) )
121-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/CodedStream" ), Glob( 'AvTranscoder/CodedStream/*.hpp' ) ) )
122-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/CodedStructures" ), Glob( 'AvTranscoder/CodedStructures/*.hpp' ) ) )
123-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/EssenceStream" ), Glob( 'AvTranscoder/EssenceStream/*.hpp' ) ) )
124-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/EssenceStructures" ), Glob( 'AvTranscoder/EssenceStructures/*.hpp' ) ) )
125-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/EssenceTransform" ), Glob( 'AvTranscoder/EssenceTransform/*.hpp' ) ) )
126-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/File" ), Glob( 'AvTranscoder/File/*.hpp' ) ) )
127-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/MediaMetadatasStructures.hpp' ) ) )
128-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Metadatas" ), Glob( 'AvTranscoder/Metadatas/Print.hpp' ) ) )
129-
env.Alias( "install", env.Install(os.path.join( installPrefix, "include/AvTranscoder/Transcoder" ), Glob( 'AvTranscoder/Transcoder/*.hpp' ) ) )
119+
env.Alias( "install", env.Install("include/AvTranscoder", Glob( 'AvTranscoder/*.hpp' ) ) )
120+
env.Alias( "install", env.Install("include/AvTranscoder/CodedStream", Glob( 'AvTranscoder/CodedStream/*.hpp' ) ) )
121+
env.Alias( "install", env.Install("include/AvTranscoder/CodedStructures", Glob( 'AvTranscoder/CodedStructures/*.hpp' ) ) )
122+
env.Alias( "install", env.Install("include/AvTranscoder/EssenceStream", Glob( 'AvTranscoder/EssenceStream/*.hpp' ) ) )
123+
env.Alias( "install", env.Install("include/AvTranscoder/EssenceStructures", Glob( 'AvTranscoder/EssenceStructures/*.hpp' ) ) )
124+
env.Alias( "install", env.Install("include/AvTranscoder/EssenceTransform", Glob( 'AvTranscoder/EssenceTransform/*.hpp' ) ) )
125+
env.Alias( "install", env.Install("include/AvTranscoder/File", Glob( 'AvTranscoder/File/*.hpp' ) ) )
126+
env.Alias( "install", env.Install("include/AvTranscoder/Metadatas", Glob( 'AvTranscoder/Metadatas/MediaMetadatasStructures.hpp' ) ) )
127+
env.Alias( "install", env.Install("include/AvTranscoder/Metadatas", Glob( 'AvTranscoder/Metadatas/Print.hpp' ) ) )
128+
env.Alias( "install", env.Install("include/AvTranscoder/Transcoder", Glob( 'AvTranscoder/Transcoder/*.hpp' ) ) )

0 commit comments

Comments
 (0)