From 3ff04a745ae8f369f79c22d9b3b16adb2aa9b859 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 27 Aug 2014 22:28:46 +0200 Subject: [PATCH 1/3] set version from SCons --- SConstruct | 27 +++++++++++---------------- app/cpp/SConscript | 16 ++++++++-------- src/AvTranscoder/Description.cpp | 13 +++++++------ src/SConscript | 18 +++++++++--------- 4 files changed, 35 insertions(+), 39 deletions(-) diff --git a/SConstruct b/SConstruct index f8cb6cf6..249d0235 100644 --- a/SConstruct +++ b/SConstruct @@ -9,21 +9,13 @@ mymode = ARGUMENTS.get('mode', 'release') if not (mymode in ['debug', 'release']): 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." ) +avtVersionMajor = "0" +avtVersionMinor = "2" +avtVersionMicro = "1" + +avtVersion = [avtVersionMajor, avtVersionMinor, avtVersionMicro] + +avtVersionStr = ".".join( avtVersion ) config = ConfigParser.RawConfigParser() @@ -78,6 +70,9 @@ env.Append( CXXFLAGS = [ '-Wall', '-fPIC', + '-DAVTRANSCODER_VERSION_MAJOR=' + avtVersionMajor, + '-DAVTRANSCODER_VERSION_MINOR=' + avtVersionMinor, + '-DAVTRANSCODER_VERSION_MICRO=' + avtVersionMicro, ], LIBPATH = [ libavLibDir, @@ -206,7 +201,7 @@ Export( "envJava" ) Export( "envPy" ) Export( "resampleLibraryName" ) Export( "mymode" ) -Export( "avTranscoderVersion" ) +Export( "avtVersionStr" ) VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 ) VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 ) diff --git a/app/cpp/SConscript b/app/cpp/SConscript index 4d0efbe8..459e2344 100644 --- a/app/cpp/SConscript +++ b/app/cpp/SConscript @@ -4,11 +4,11 @@ import platform Import( 'AvTranscoder' ) Import( 'sAvTranscoder' ) Import( 'resampleLibraryName' ) -Import( 'avTranscoderVersion' ) +Import( 'avtVersionStr' ) Import( 'env' ) avinfo = env.Program( - 'avinfo-' + avTranscoderVersion, + 'avinfo-' + avtVersionStr, Glob( 'avInfo/*.cpp' ), LIBS = [ sAvTranscoder, @@ -21,7 +21,7 @@ avinfo = env.Program( ) avmeta = env.Program( - 'avmeta-' + avTranscoderVersion, + 'avmeta-' + avtVersionStr, Glob( 'avMeta/*.cpp' ), LIBS = [ sAvTranscoder, @@ -34,7 +34,7 @@ avmeta = env.Program( ) avtransform = env.Program( - 'av++-' + avTranscoderVersion, + 'av++-' + avtVersionStr, Glob( 'avTranscoder/*.cpp' ), LIBS = [ sAvTranscoder, @@ -47,7 +47,7 @@ avtransform = env.Program( ) avprocessor = env.Program( - 'avprocessor-' + avTranscoderVersion, + 'avprocessor-' + avtVersionStr, Glob( 'genericProcessor/*.cpp' ), LIBS = [ sAvTranscoder, @@ -64,7 +64,7 @@ avprocessor = env.Program( if platform.system() != 'Windows': avplayer = env.Program( - 'avplayer-' + avTranscoderVersion, + 'avplayer-' + avtVersionStr, Glob( 'avplay/*.cpp' ), LIBS = [ sAvTranscoder, @@ -79,7 +79,7 @@ if platform.system() != 'Windows': ) avprofiles = env.Program( - 'avprofiles-' + avTranscoderVersion, + 'avprofiles-' + avtVersionStr, Glob( 'presetChecker/*.cpp' ), LIBS = [ sAvTranscoder, @@ -95,7 +95,7 @@ if platform.system() != 'Windows': ) avoptions = env.Program( - 'avoptions-' + avTranscoderVersion, + 'avoptions-' + avtVersionStr, Glob( 'optionChecker/*.cpp' ), LIBS = [ sAvTranscoder, diff --git a/src/AvTranscoder/Description.cpp b/src/AvTranscoder/Description.cpp index f955f375..78243e6f 100644 --- a/src/AvTranscoder/Description.cpp +++ b/src/AvTranscoder/Description.cpp @@ -78,15 +78,16 @@ Libraries getLibraries() { Libraries libs; - libs.push_back( Library( "avutil", avutil_license(), LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO ) ); - libs.push_back( Library( "avformat", avformat_license(), LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO ) ); - libs.push_back( Library( "avcodec", avcodec_license(), LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO ) ); + libs.push_back( Library( "avtranscoder", avutil_license(), AVTRANSCODER_VERSION_MAJOR, AVTRANSCODER_VERSION_MINOR, AVTRANSCODER_VERSION_MICRO ) ); + libs.push_back( Library( "avutil", avutil_license(), LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO ) ); + libs.push_back( Library( "avformat", avformat_license(), LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO ) ); + libs.push_back( Library( "avcodec", avcodec_license(), LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO ) ); #ifdef AV_RESAMPLE_LIBRARY - libs.push_back( Library( "avresample", avutil_license(), LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO ) ); + libs.push_back( Library( "avresample", avutil_license(), LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO ) ); #else - libs.push_back( Library( "swresample", avutil_license(), LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO ) ); + libs.push_back( Library( "swresample", avutil_license(), LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO ) ); #endif - libs.push_back( Library( "swscale", avutil_license(), LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO ) ); + libs.push_back( Library( "swscale", avutil_license(), LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO ) ); return libs; } diff --git a/src/SConscript b/src/SConscript index 39ea6b13..f5b7747b 100644 --- a/src/SConscript +++ b/src/SConscript @@ -6,10 +6,10 @@ Import( "env" ) Import( "envJava" ) Import( "envPy" ) Import( "resampleLibraryName" ) -Import( "avTranscoderVersion" ) +Import( "avtVersionStr" ) env.Append( - SHLIBVERSION = avTranscoderVersion + SHLIBVERSION = avtVersionStr ) staticAvTranscoder = env.StaticLibrary( @@ -28,7 +28,7 @@ staticAvTranscoder = env.StaticLibrary( sharedAvTranscoderName = 'AvTranscoder' # if windows plateform, add version to the name if os.name == "nt" and sys.platform.startswith("win"): - sharedAvTranscoderName += '.'+ avTranscoderVersion + sharedAvTranscoderName += '.'+ avtVersionStr sharedAvTranscoder = env.SharedLibrary( sharedAvTranscoderName, Glob( 'AvTranscoder/*.cpp' ) + @@ -40,13 +40,13 @@ sharedAvTranscoder = env.SharedLibrary( 'swscale', resampleLibraryName, ], - SHLIBVERSION = avTranscoderVersion, + SHLIBVERSION = avtVersionStr, ) javaAvTranscoderName = 'jAvTranscoder' # if windows plateform, add version to the name if os.name == "nt" and sys.platform.startswith("win"): - javaAvTranscoderName += '.'+ avTranscoderVersion + javaAvTranscoderName += '.'+ avtVersionStr javaAvTranscoder = envJava.SharedLibrary( javaAvTranscoderName, source=['AvTranscoder/avTranscoder.i'], @@ -58,13 +58,13 @@ javaAvTranscoder = envJava.SharedLibrary( 'swscale', resampleLibraryName, ], - SHLIBVERSION = avTranscoderVersion, + SHLIBVERSION = avtVersionStr, ) pythonAvTranscoderName = 'pyAvTranscoder' # if windows plateform, add version to the name if os.name == "nt" and sys.platform.startswith("win"): - pythonAvTranscoderName += '.'+ avTranscoderVersion + pythonAvTranscoderName += '.'+ avtVersionStr pythonAvTranscoder = envPy.SharedLibrary( pythonAvTranscoderName, source='AvTranscoder/avTranscoder.i', @@ -76,7 +76,7 @@ pythonAvTranscoder = envPy.SharedLibrary( 'swscale', resampleLibraryName, ], - SHLIBVERSION = avTranscoderVersion, + SHLIBVERSION = avtVersionStr, ) initFile = envPy.Command( os.path.join( 'AvTranscoder/__init__.py' ), '', Touch('$TARGET') ) @@ -93,7 +93,7 @@ if not javaAvTranscoder_class: else: javaAvTranscoder_jar = env.Jar( # Add version to the JAR name - target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avTranscoderVersion), + target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avtVersionStr), source = javaAvTranscoder_class ) env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class ) From 41d5d53410b27fb0d43704314fc8687c8f773ca4 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 30 Aug 2014 16:07:02 +0200 Subject: [PATCH 2/3] change install man page names --- app/cpp/SConscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/cpp/SConscript b/app/cpp/SConscript index 459e2344..4b7bd00f 100644 --- a/app/cpp/SConscript +++ b/app/cpp/SConscript @@ -115,14 +115,14 @@ env.Depends( avmeta, sAvTranscoder ) 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") ) ) +env.Alias( "install", env.InstallAs("share/man/man1/avinfo.1", File("avInfo/avinfo.man") ) ) +env.Alias( "install", env.InstallAs("share/man/man1/avmeta.1", File("avMeta/avmeta.man") ) ) +env.Alias( "install", env.InstallAs("share/man/man1/avprocessor.1", 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") ) ) + env.Alias( "install", env.InstallAs("share/man/man1/avplayer.1", File("avplay/avplayer.man") ) ) + env.Alias( "install", env.InstallAs("share/man/man1/avprofiles.1", File("presetChecker/avprofiles.man") ) ) def SymLink(target, source, env): os.symlink(os.path.basename(str(source[0])), str(target[0])) From b9293a1d7e7ba2622cfe4f7cfbf46021d149a6fb Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 30 Aug 2014 16:07:17 +0200 Subject: [PATCH 3/3] small caps lib names, and rename java library --- src/SConscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SConscript b/src/SConscript index f5b7747b..cd8a62fd 100644 --- a/src/SConscript +++ b/src/SConscript @@ -13,7 +13,7 @@ env.Append( ) staticAvTranscoder = env.StaticLibrary( - 'sAvTranscoder', + 'savtranscoder', Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/*/*.cpp' ), LIBS = [ @@ -25,7 +25,7 @@ staticAvTranscoder = env.StaticLibrary( ] ) -sharedAvTranscoderName = 'AvTranscoder' +sharedAvTranscoderName = 'avtranscoder' # if windows plateform, add version to the name if os.name == "nt" and sys.platform.startswith("win"): sharedAvTranscoderName += '.'+ avtVersionStr @@ -43,7 +43,7 @@ sharedAvTranscoder = env.SharedLibrary( SHLIBVERSION = avtVersionStr, ) -javaAvTranscoderName = 'jAvTranscoder' +javaAvTranscoderName = 'avtranscoder-java' # if windows plateform, add version to the name if os.name == "nt" and sys.platform.startswith("win"): javaAvTranscoderName += '.'+ avtVersionStr @@ -61,7 +61,7 @@ javaAvTranscoder = envJava.SharedLibrary( SHLIBVERSION = avtVersionStr, ) -pythonAvTranscoderName = 'pyAvTranscoder' +pythonAvTranscoderName = 'pyavtranscoder' # if windows plateform, add version to the name if os.name == "nt" and sys.platform.startswith("win"): pythonAvTranscoderName += '.'+ avtVersionStr