Skip to content

change some build and install procedure #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2014
Merged

change some build and install procedure #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ff04a7
set version from SCons
MarcAntoine-Arnaud Aug 27, 2014
41d5d53
change install man page names
MarcAntoine-Arnaud Aug 30, 2014
b9293a1
small caps lib names, and rename java library
MarcAntoine-Arnaud Aug 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -78,6 +70,9 @@ env.Append(
CXXFLAGS = [
'-Wall',
'-fPIC',
'-DAVTRANSCODER_VERSION_MAJOR=' + avtVersionMajor,
'-DAVTRANSCODER_VERSION_MINOR=' + avtVersionMinor,
'-DAVTRANSCODER_VERSION_MICRO=' + avtVersionMicro,
],
LIBPATH = [
libavLibDir,
Expand Down Expand Up @@ -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 )
Expand Down
26 changes: 13 additions & 13 deletions app/cpp/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -21,7 +21,7 @@ avinfo = env.Program(
)

avmeta = env.Program(
'avmeta-' + avTranscoderVersion,
'avmeta-' + avtVersionStr,
Glob( 'avMeta/*.cpp' ),
LIBS = [
sAvTranscoder,
Expand All @@ -34,7 +34,7 @@ avmeta = env.Program(
)

avtransform = env.Program(
'av++-' + avTranscoderVersion,
'av++-' + avtVersionStr,
Glob( 'avTranscoder/*.cpp' ),
LIBS = [
sAvTranscoder,
Expand All @@ -47,7 +47,7 @@ avtransform = env.Program(
)

avprocessor = env.Program(
'avprocessor-' + avTranscoderVersion,
'avprocessor-' + avtVersionStr,
Glob( 'genericProcessor/*.cpp' ),
LIBS = [
sAvTranscoder,
Expand All @@ -64,7 +64,7 @@ avprocessor = env.Program(

if platform.system() != 'Windows':
avplayer = env.Program(
'avplayer-' + avTranscoderVersion,
'avplayer-' + avtVersionStr,
Glob( 'avplay/*.cpp' ),
LIBS = [
sAvTranscoder,
Expand All @@ -79,7 +79,7 @@ if platform.system() != 'Windows':
)

avprofiles = env.Program(
'avprofiles-' + avTranscoderVersion,
'avprofiles-' + avtVersionStr,
Glob( 'presetChecker/*.cpp' ),
LIBS = [
sAvTranscoder,
Expand All @@ -95,7 +95,7 @@ if platform.system() != 'Windows':
)

avoptions = env.Program(
'avoptions-' + avTranscoderVersion,
'avoptions-' + avtVersionStr,
Glob( 'optionChecker/*.cpp' ),
LIBS = [
sAvTranscoder,
Expand All @@ -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]))
Expand Down
13 changes: 7 additions & 6 deletions src/AvTranscoder/Description.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
26 changes: 13 additions & 13 deletions src/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ Import( "env" )
Import( "envJava" )
Import( "envPy" )
Import( "resampleLibraryName" )
Import( "avTranscoderVersion" )
Import( "avtVersionStr" )

env.Append(
SHLIBVERSION = avTranscoderVersion
SHLIBVERSION = avtVersionStr
)

staticAvTranscoder = env.StaticLibrary(
'sAvTranscoder',
'savtranscoder',
Glob( 'AvTranscoder/*.cpp' ) +
Glob( 'AvTranscoder/*/*.cpp' ),
LIBS = [
Expand All @@ -25,10 +25,10 @@ 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 += '.'+ avTranscoderVersion
sharedAvTranscoderName += '.'+ avtVersionStr
sharedAvTranscoder = env.SharedLibrary(
sharedAvTranscoderName,
Glob( 'AvTranscoder/*.cpp' ) +
Expand All @@ -40,13 +40,13 @@ sharedAvTranscoder = env.SharedLibrary(
'swscale',
resampleLibraryName,
],
SHLIBVERSION = avTranscoderVersion,
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 += '.'+ avTranscoderVersion
javaAvTranscoderName += '.'+ avtVersionStr
javaAvTranscoder = envJava.SharedLibrary(
javaAvTranscoderName,
source=['AvTranscoder/avTranscoder.i'],
Expand All @@ -58,13 +58,13 @@ javaAvTranscoder = envJava.SharedLibrary(
'swscale',
resampleLibraryName,
],
SHLIBVERSION = avTranscoderVersion,
SHLIBVERSION = avtVersionStr,
)

pythonAvTranscoderName = 'pyAvTranscoder'
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',
Expand All @@ -76,7 +76,7 @@ pythonAvTranscoder = envPy.SharedLibrary(
'swscale',
resampleLibraryName,
],
SHLIBVERSION = avTranscoderVersion,
SHLIBVERSION = avtVersionStr,
)

initFile = envPy.Command( os.path.join( 'AvTranscoder/__init__.py' ), '', Touch('$TARGET') )
Expand All @@ -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 )
Expand Down