get git version into SConstrcut and fix some deployements

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit fdc79e686f4e · 2014-08-26T00:25:49.000+02:00
- set versionned binaries (missing link during install)
diff --git a/SConstruct b/SConstruct
@@ -7,8 +7,23 @@ import ConfigParser
 mymode = ARGUMENTS.get('mode', 'release')
 
 if not (mymode in ['debug', 'release']):
-    print "Error: expected 'debug' or 'release', found: " + mymode
-    Exit(1)
+    raise Exception("Can't select build mode ['debug', 'release']")
+
+avTranscoderVersion = ARGUMENTS.get('version', None)
+
+if not avTranscoderVersion:
+    import git
+    # Get version from last tag of git repository
+    repo = git.Repo( "." )
+    tags = repo.tags
+    if tags:
+        lastTag = tags[-1]
+        avTranscoderVersion = lastTag.name[1:]
+    else:
+        raise Exception( "Can't get last version of AvTranscoder." )
+
+if not avTranscoderVersion:
+    raise Exception( "Can't get last version of AvTranscoder." )
 
 config = ConfigParser.RawConfigParser()
 
@@ -191,6 +206,7 @@ Export( "envJava" )
 Export( "envPy" )
 Export( "resampleLibraryName" )
 Export( "mymode" )
+Export( "avTranscoderVersion" )
 
 VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 )
 VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 )
diff --git a/app/cpp/SConscript b/app/cpp/SConscript
@@ -3,11 +3,8 @@ import platform
 
 Import( 'AvTranscoder' )
 Import( 'sAvTranscoder' )
-#Import( 'AvTranscoder_jar' )
-Import( "resampleLibraryName" )
-
-env = Environment().Clone()
-
+Import( 'resampleLibraryName' )
+Import( 'avTranscoderVersion' )
 Import( 'env' )
 
 avinfo = env.Program(
@@ -24,7 +21,7 @@ avinfo = env.Program(
         )
 
 avmeta = env.Program(
-        'avmeta',
+        'avmeta-' + avTranscoderVersion,
         Glob( 'avMeta/*.cpp' ),
         LIBS = [
                 sAvTranscoder,
@@ -37,7 +34,7 @@ avmeta = env.Program(
         )
 
 avtransform = env.Program(
-        'av++',
+        'av++-' + avTranscoderVersion,
         Glob( 'avTranscoder/*.cpp' ),
         LIBS = [
                 sAvTranscoder,
@@ -50,7 +47,7 @@ avtransform = env.Program(
         )
 
 avprocessor = env.Program(
-        'avprocessor',
+        'avprocessor-' + avTranscoderVersion,
         Glob( 'genericProcessor/*.cpp' ),
         LIBS = [
                 sAvTranscoder,
@@ -67,7 +64,7 @@ avprocessor = env.Program(
 
 if platform.system() != 'Windows':
         avplayer = env.Program(
-                'avplayer',
+                'avplayer-' + avTranscoderVersion,
                 Glob( 'avplay/*.cpp' ),
                 LIBS = [
                         sAvTranscoder,
@@ -82,7 +79,7 @@ if platform.system() != 'Windows':
                 )
         
         avprofiles = env.Program(
-                'avprofiles',
+                'avprofiles-' + avTranscoderVersion,
                 Glob( 'presetChecker/*.cpp' ),
                 LIBS = [
                         sAvTranscoder,
@@ -97,8 +94,8 @@ if platform.system() != 'Windows':
                         ],
         )
 
-        avprofiles = env.Program(
-                'avoptions',
+        avoptions = env.Program(
+                'avoptions-' + avTranscoderVersion,
                 Glob( 'optionChecker/*.cpp' ),
                 LIBS = [
                         sAvTranscoder,
@@ -115,6 +112,29 @@ if platform.system() != 'Windows':
 
 env.Depends( avmeta, sAvTranscoder )
 
-env.Alias( "install", env.Install("bin", avmeta ) )
-env.Alias( "install", env.Install("bin", avprocessor ) )
-env.Alias( "install", env.Install("bin", avtransform ) )
+env.Alias( "install", env.Install("bin", avinfo) )
+env.Alias( "install", env.Install("bin", avmeta) )
+env.Alias( "install", env.Install("bin", avprocessor) )
+env.Alias( "install", env.Install("share/man/man1", File("avInfo/avinfo.man") ) )
+env.Alias( "install", env.Install("share/man/man1", File("avMeta/avmeta.man") ) )
+env.Alias( "install", env.Install("share/man/man1", File("genericProcessor/avprocessor.man") ) )
+if platform.system() != 'Windows':
+        env.Alias( "install", env.Install("bin", avplayer) )
+        env.Alias( "install", env.Install("bin", avprofiles) )
+        env.Alias( "install", env.Install("share/man/man1", File("avplay/avplayer.man") ) )
+        env.Alias( "install", env.Install("share/man/man1", File("presetChecker/avprofiles.man") ) )
+
+        def SymLink(target, source, env):
+            os.symlink(os.path.basename(str(source[0])), str(target[0]))
+
+        avinfolink = env.Command( 'avinfo', avinfo, SymLink )
+        avmetalink = env.Command( 'avmeta', avmeta, SymLink )
+        avprocessorlink = env.Command( 'avprocessor', avprocessor, SymLink )
+        avplayerlink = env.Command( 'avplayer', avplayer, SymLink )
+        avprofileslink = env.Command( 'avprofiles', avprofiles, SymLink )
+
+        env.Alias( "install", env.Install("bin", avinfolink) )
+        env.Alias( "install", env.Install("bin", avmetalink) )
+        env.Alias( "install", env.Install("bin", avprocessorlink) )
+        env.Alias( "install", env.Install("bin", avplayerlink) )
+        env.Alias( "install", env.Install("bin", avprofileslink) )
diff --git a/src/SConscript b/src/SConscript
@@ -1,21 +1,12 @@
 import glob, re
 import os
 import sys
-import git
 
 Import( "env" )
 Import( "envJava" )
 Import( "envPy" )
 Import( "resampleLibraryName" )
-
-# Get version from last tag of git repository
-repo = git.Repo( "." )
-tags = repo.tags
-if tags:
-	lastTag = tags[-1]
-	avTranscoderVersion = lastTag.name[1:]
-else:
-	raise Exception( "Can't get last version of AvTranscoder." )
+Import( "avTranscoderVersion" )
 
 env.Append(
     SHLIBVERSION = avTranscoderVersion
@@ -91,8 +82,6 @@ pythonAvTranscoder = envPy.SharedLibrary(
 initFile = envPy.Command( os.path.join( 'AvTranscoder/__init__.py' ), '', Touch('$TARGET') )
 envPy.Requires( pythonAvTranscoder, initFile )
 
-Touch('AvTranscoder/__init__.py')
-
 javaAvTranscoder_class = env.Java(
     target = 'jAvTranscoderClass',
     source = Glob( envJava['JARCHDIR'] )
