Skip to content

Commit 9e8f54d

Browse files
author
Clement Champetier
committed
Merge pull request #80 from mrn/master - change some build and install procedure
Conflicts: src/SConscript
2 parents 85f5c46 + b9293a1 commit 9e8f54d

File tree

4 files changed

+44
-48
lines changed

4 files changed

+44
-48
lines changed

‎SConstruct

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,13 @@ mymode = ARGUMENTS.get('mode', 'release')
99
if not (mymode in ['debug', 'release']):
1010
raise Exception("Can't select build mode ['debug', 'release']")
1111

12-
avTranscoderVersion = ARGUMENTS.get('version', None)
13-
14-
if not avTranscoderVersion:
15-
import git
16-
# Get version from last tag of git repository
17-
repo = git.Repo( "." )
18-
tags = repo.tags
19-
if tags:
20-
lastTag = tags[-1]
21-
avTranscoderVersion = lastTag.name[1:]
22-
else:
23-
raise Exception( "Can't get last version of AvTranscoder." )
24-
25-
if not avTranscoderVersion:
26-
raise Exception( "Can't get last version of AvTranscoder." )
12+
avtVersionMajor = "0"
13+
avtVersionMinor = "2"
14+
avtVersionMicro = "1"
15+
16+
avtVersion = [avtVersionMajor, avtVersionMinor, avtVersionMicro]
17+
18+
avtVersionStr = ".".join( avtVersion )
2719

2820
config = ConfigParser.RawConfigParser()
2921

@@ -78,6 +70,9 @@ env.Append(
7870
CXXFLAGS = [
7971
'-Wall',
8072
'-fPIC',
73+
'-DAVTRANSCODER_VERSION_MAJOR=' + avtVersionMajor,
74+
'-DAVTRANSCODER_VERSION_MINOR=' + avtVersionMinor,
75+
'-DAVTRANSCODER_VERSION_MICRO=' + avtVersionMicro,
8176
],
8277
LIBPATH = [
8378
libavLibDir,
@@ -206,7 +201,7 @@ Export( "envJava" )
206201
Export( "envPy" )
207202
Export( "resampleLibraryName" )
208203
Export( "mymode" )
209-
Export( "avTranscoderVersion" )
204+
Export( "avtVersionStr" )
210205

211206
VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 )
212207
VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 )

‎app/cpp/SConscript

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import platform
44
Import( 'AvTranscoder' )
55
Import( 'sAvTranscoder' )
66
Import( 'resampleLibraryName' )
7-
Import( 'avTranscoderVersion' )
7+
Import( 'avtVersionStr' )
88
Import( 'env' )
99

1010
avinfo = env.Program(
11-
'avinfo-' + avTranscoderVersion,
11+
'avinfo-' + avtVersionStr,
1212
Glob( 'avInfo/*.cpp' ),
1313
LIBS = [
1414
sAvTranscoder,
@@ -21,7 +21,7 @@ avinfo = env.Program(
2121
)
2222

2323
avmeta = env.Program(
24-
'avmeta-' + avTranscoderVersion,
24+
'avmeta-' + avtVersionStr,
2525
Glob( 'avMeta/*.cpp' ),
2626
LIBS = [
2727
sAvTranscoder,
@@ -34,7 +34,7 @@ avmeta = env.Program(
3434
)
3535

3636
avtransform = env.Program(
37-
'av++-' + avTranscoderVersion,
37+
'av++-' + avtVersionStr,
3838
Glob( 'avTranscoder/*.cpp' ),
3939
LIBS = [
4040
sAvTranscoder,
@@ -47,7 +47,7 @@ avtransform = env.Program(
4747
)
4848

4949
avprocessor = env.Program(
50-
'avprocessor-' + avTranscoderVersion,
50+
'avprocessor-' + avtVersionStr,
5151
Glob( 'genericProcessor/*.cpp' ),
5252
LIBS = [
5353
sAvTranscoder,
@@ -64,7 +64,7 @@ avprocessor = env.Program(
6464

6565
if platform.system() != 'Windows':
6666
avplayer = env.Program(
67-
'avplayer-' + avTranscoderVersion,
67+
'avplayer-' + avtVersionStr,
6868
Glob( 'avplay/*.cpp' ),
6969
LIBS = [
7070
sAvTranscoder,
@@ -79,7 +79,7 @@ if platform.system() != 'Windows':
7979
)
8080

8181
avprofiles = env.Program(
82-
'avprofiles-' + avTranscoderVersion,
82+
'avprofiles-' + avtVersionStr,
8383
Glob( 'presetChecker/*.cpp' ),
8484
LIBS = [
8585
sAvTranscoder,
@@ -95,7 +95,7 @@ if platform.system() != 'Windows':
9595
)
9696

9797
avoptions = env.Program(
98-
'avoptions-' + avTranscoderVersion,
98+
'avoptions-' + avtVersionStr,
9999
Glob( 'optionChecker/*.cpp' ),
100100
LIBS = [
101101
sAvTranscoder,
@@ -115,14 +115,14 @@ env.Depends( avmeta, sAvTranscoder )
115115
env.Alias( "install", env.Install("bin", avinfo) )
116116
env.Alias( "install", env.Install("bin", avmeta) )
117117
env.Alias( "install", env.Install("bin", avprocessor) )
118-
env.Alias( "install", env.Install("share/man/man1", File("avInfo/avinfo.man") ) )
119-
env.Alias( "install", env.Install("share/man/man1", File("avMeta/avmeta.man") ) )
120-
env.Alias( "install", env.Install("share/man/man1", File("genericProcessor/avprocessor.man") ) )
118+
env.Alias( "install", env.InstallAs("share/man/man1/avinfo.1", File("avInfo/avinfo.man") ) )
119+
env.Alias( "install", env.InstallAs("share/man/man1/avmeta.1", File("avMeta/avmeta.man") ) )
120+
env.Alias( "install", env.InstallAs("share/man/man1/avprocessor.1", File("genericProcessor/avprocessor.man") ) )
121121
if platform.system() != 'Windows':
122122
env.Alias( "install", env.Install("bin", avplayer) )
123123
env.Alias( "install", env.Install("bin", avprofiles) )
124-
env.Alias( "install", env.Install("share/man/man1", File("avplay/avplayer.man") ) )
125-
env.Alias( "install", env.Install("share/man/man1", File("presetChecker/avprofiles.man") ) )
124+
env.Alias( "install", env.InstallAs("share/man/man1/avplayer.1", File("avplay/avplayer.man") ) )
125+
env.Alias( "install", env.InstallAs("share/man/man1/avprofiles.1", File("presetChecker/avprofiles.man") ) )
126126

127127
def SymLink(target, source, env):
128128
os.symlink(os.path.basename(str(source[0])), str(target[0]))

‎src/AvTranscoder/Description.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,16 @@ Libraries getLibraries()
7878
{
7979
Libraries libs;
8080

81-
libs.push_back( Library( "avutil", avutil_license(), LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO ) );
82-
libs.push_back( Library( "avformat", avformat_license(), LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO ) );
83-
libs.push_back( Library( "avcodec", avcodec_license(), LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO ) );
81+
libs.push_back( Library( "avtranscoder", avutil_license(), AVTRANSCODER_VERSION_MAJOR, AVTRANSCODER_VERSION_MINOR, AVTRANSCODER_VERSION_MICRO ) );
82+
libs.push_back( Library( "avutil", avutil_license(), LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO ) );
83+
libs.push_back( Library( "avformat", avformat_license(), LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO ) );
84+
libs.push_back( Library( "avcodec", avcodec_license(), LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO ) );
8485
#ifdef AV_RESAMPLE_LIBRARY
85-
libs.push_back( Library( "avresample", avutil_license(), LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO ) );
86+
libs.push_back( Library( "avresample", avutil_license(), LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO ) );
8687
#else
87-
libs.push_back( Library( "swresample", avutil_license(), LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO ) );
88+
libs.push_back( Library( "swresample", avutil_license(), LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO ) );
8889
#endif
89-
libs.push_back( Library( "swscale", avutil_license(), LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO ) );
90+
libs.push_back( Library( "swscale", avutil_license(), LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO ) );
9091

9192
return libs;
9293
}

‎src/SConscript

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ Import( "env" )
66
Import( "envJava" )
77
Import( "envPy" )
88
Import( "resampleLibraryName" )
9-
Import( "avTranscoderVersion" )
9+
Import( "avtVersionStr" )
1010

1111
env.Append(
12-
SHLIBVERSION = avTranscoderVersion
12+
SHLIBVERSION = avtVersionStr
1313
)
1414

1515
staticAvTranscoder = env.StaticLibrary(
16-
'sAvTranscoder',
16+
'savtranscoder',
1717
Glob( 'AvTranscoder/*.cpp' ) +
1818
Glob( 'AvTranscoder/*/*.cpp' ),
1919
LIBS = [
@@ -25,10 +25,10 @@ staticAvTranscoder = env.StaticLibrary(
2525
]
2626
)
2727

28-
sharedAvTranscoderName = 'AvTranscoder'
28+
sharedAvTranscoderName = 'avtranscoder'
2929
# if windows plateform, add version to the name
3030
if os.name == "nt" and sys.platform.startswith("win"):
31-
sharedAvTranscoderName += '-'+ avTranscoderVersion
31+
sharedAvTranscoderName += '-'+ avtVersionStr
3232
sharedAvTranscoder = env.SharedLibrary(
3333
sharedAvTranscoderName,
3434
Glob( 'AvTranscoder/*.cpp' ) +
@@ -40,13 +40,13 @@ sharedAvTranscoder = env.SharedLibrary(
4040
'swscale',
4141
resampleLibraryName,
4242
],
43-
SHLIBVERSION = avTranscoderVersion,
43+
SHLIBVERSION = avtVersionStr,
4444
)
4545

46-
javaAvTranscoderName = 'jAvTranscoder'
46+
javaAvTranscoderName = 'avtranscoder-java'
4747
# if windows plateform, add version to the name
4848
if os.name == "nt" and sys.platform.startswith("win"):
49-
javaAvTranscoderName += '-'+ avTranscoderVersion
49+
javaAvTranscoderName += '-'+ avtVersionStr
5050
javaAvTranscoder = envJava.SharedLibrary(
5151
javaAvTranscoderName,
5252
source=['AvTranscoder/avTranscoder.i'],
@@ -58,13 +58,13 @@ javaAvTranscoder = envJava.SharedLibrary(
5858
'swscale',
5959
resampleLibraryName,
6060
],
61-
SHLIBVERSION = avTranscoderVersion,
61+
SHLIBVERSION = avtVersionStr,
6262
)
6363

64-
pythonAvTranscoderName = 'pyAvTranscoder'
64+
pythonAvTranscoderName = 'pyavtranscoder'
6565
# if windows plateform, add version to the name
6666
if os.name == "nt" and sys.platform.startswith("win"):
67-
pythonAvTranscoderName += '-'+ avTranscoderVersion
67+
pythonAvTranscoderName += '-'+ avtVersionStr
6868
pythonAvTranscoder = envPy.SharedLibrary(
6969
pythonAvTranscoderName,
7070
source='AvTranscoder/avTranscoder.i',
@@ -76,7 +76,7 @@ pythonAvTranscoder = envPy.SharedLibrary(
7676
'swscale',
7777
resampleLibraryName,
7878
],
79-
SHLIBVERSION = avTranscoderVersion,
79+
SHLIBVERSION = avtVersionStr,
8080
)
8181

8282
initFile = envPy.Command( os.path.join( 'AvTranscoder/__init__.py' ), '', Touch('$TARGET') )
@@ -93,7 +93,7 @@ if not javaAvTranscoder_class:
9393
else:
9494
javaAvTranscoder_jar = env.Jar(
9595
# Add version to the JAR name
96-
target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avTranscoderVersion),
96+
target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avtVersionStr),
9797
source = javaAvTranscoder_class
9898
)
9999
env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class )

0 commit comments

Comments
 (0)