From eb4a3a05f684923481a87db276db0c291a1d1e89 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:08:17 +0100 Subject: Add dependencies() and build() to script. --- cscript | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 2e09d2bcd..f2b898d52 100644 --- a/cscript +++ b/cscript @@ -47,3 +47,13 @@ def make_manual(): os.chdir('doc/manual') command('make') return [os.path.abspath('pdf'), os.path.abspath('html')] + +def dependencies(): + return (('libdcp', 'v0.43', + ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298') + ('openjpeg', '')) + +def build(prefix): + depends('libdcp', 'v0.43') + depends('ffmpeg', ' + depends('openjpeg') -- cgit v1.2.3 From b0d9a84bd0debd332c23fa7ae6684956d0ca470d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:08:43 +0100 Subject: Fix typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f2b898d52..f0a86266f 100644 --- a/cscript +++ b/cscript @@ -49,7 +49,7 @@ def make_manual(): return [os.path.abspath('pdf'), os.path.abspath('html')] def dependencies(): - return (('libdcp', 'v0.43', + return (('libdcp', 'v0.43'), ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298') ('openjpeg', '')) -- cgit v1.2.3 From 861ca2da59c20b86add17ed5540042e983e04461 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:09:20 +0100 Subject: Typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f0a86266f..8f3fc6cee 100644 --- a/cscript +++ b/cscript @@ -50,7 +50,7 @@ def make_manual(): def dependencies(): return (('libdcp', 'v0.43'), - ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298') + ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298'), ('openjpeg', '')) def build(prefix): -- cgit v1.2.3 From 7294863357668e59e059e78c1323722975226458 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:09:54 +0100 Subject: Another typo. --- cscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8f3fc6cee..015c2761a 100644 --- a/cscript +++ b/cscript @@ -54,6 +54,4 @@ def dependencies(): ('openjpeg', '')) def build(prefix): - depends('libdcp', 'v0.43') - depends('ffmpeg', ' - depends('openjpeg') + pass -- cgit v1.2.3 From ec91dfb170165129c32842ba6581d5effc682bcf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:17:10 +0100 Subject: Various cdist fixes. --- cscript | 84 ++++++++++++++++++++++++++++++++++-------------------------- debian/rules | 3 ++- 2 files changed, 49 insertions(+), 38 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 015c2761a..8280ae526 100644 --- a/cscript +++ b/cscript @@ -1,57 +1,67 @@ import glob +import shutil +import os -release_targets = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] - -def build_release(environment, variant, version): - if environment == 'windows': - command('./waf configure --target-windows') - command('./waf clean') - command('./waf') - shutil.copyfile('build/windows/installer.%s.nsi' % variant, 'build/windows/installer2.%s.nsi' % variant) - command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant)) - command('sed -i "s~%%deps%%~$WINDOWS_PREFIX~g" build/windows/installer2.%s.nsi' % variant) - command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant)) - command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % variant) - command('makensis build/windows/installer2.%s.nsi' % variant) - return glob.glob('build/windows/*%s*.exe' % variant)[0] - elif environment == 'ubuntu': - v = variant.split('-') - bits = v[1] - if bits == '32': +def dependencies(target): + if target.platform == 'windows': + return () + else: + return ('openjpeg-cdist', 'ffmpeg-cdist', 'libdcp') + +def build(env, target): + cmd = './waf configure --prefix=%s' % env.work_dir_cscript() + if target.platform == 'windows': + cmd += ' --target-windows' + else: + cmd += ' --static' + env.command(cmd) + + env.command('./waf') + + if target.platform == 'linux': + env.command('./waf install') + + +def package(env, target, version): + if target.platform == 'windows': + shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits) + env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits)) + env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits) + env.command('makensis build/windows/installer2.%s.nsi' % target.bits) + return os.path.abspath(glob.glob('build/windows/*%s*.exe' % target.bits)[0]) + elif target.platform == 'linux': + if target.bits == 32: cpu = 'i386' else: cpu = 'amd64' - shutil.copyfile(os.path.join('builds', 'control-%s' % variant), os.path.join('debian', 'control')) - command('./waf dist') - f = open(os.path.join('debian', 'files'), 'w') + shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control') + env.command('./waf dist') + f = open('debian/files', 'w') print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) + os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version) - command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) + env.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) os.chdir('dvdomatic-%s' % version) - command('dch -b -v %s-1 "New upstream release."' % version) - command('dpkg-source -b .') - command('dpkg-buildpackage') + env.command('dch -b -v %s-1 "New upstream release."' % version) + env.set('CDIST_LINKFLAGS', env.get('LINKFLAGS')) + env.set('CDIST_CXXFLAGS', env.get('CXXFLAGS')) + env.set('CDIST_PKG_CONFIG_PATH', env.get('PKG_CONFIG_PATH')) + env.command('dpkg-buildpackage') return os.path.abspath(glob.glob('../*.deb')[0]) -def make_pot(): - command('./waf pot') +def make_pot(env): + env.command('./waf pot') return [os.path.abspath('build/src/lib/libdvdomatic.pot'), os.path.abspath('build/src/wx/libdvdomatic-wx.pot'), os.path.abspath('build/src/tools/dvdomatic.pot')] -def make_manual(): +def make_manual(env): os.chdir('doc/manual') - command('make') + env.command('make') return [os.path.abspath('pdf'), os.path.abspath('html')] - -def dependencies(): - return (('libdcp', 'v0.43'), - ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298'), - ('openjpeg', '')) - -def build(prefix): - pass diff --git a/debian/rules b/debian/rules index 3320087a5..a2bf70bd8 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,8 @@ dh $@ override_dh_auto_configure: - ./waf --nocache configure --prefix=/usr --static + LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \ + ./waf --nocache configure --prefix=/usr --static override_dh_auto_build: ./waf --nocache build -- cgit v1.2.3 From 15722eca8bd1caabc3b7275ff063b518dcb14ea2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:26:10 +0100 Subject: Specify dep versions. --- cscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8280ae526..c7794a7bd 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,9 @@ def dependencies(target): if target.platform == 'windows': return () else: - return ('openjpeg-cdist', 'ffmpeg-cdist', 'libdcp') + return (('openjpeg-cdist', None) + ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa' + ('libdcp', 'v0.45')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 From 254a596bfa5fe29f354f95ef6a051d8015b38a07 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:27:51 +0100 Subject: Typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index c7794a7bd..b34eb064c 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None) - ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa' + ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa') ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From f98bd3e7601df2f52a7f4b622757472f41b004e7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:28:47 +0100 Subject: Typo. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index b34eb064c..417e4221c 100644 --- a/cscript +++ b/cscript @@ -6,8 +6,8 @@ def dependencies(target): if target.platform == 'windows': return () else: - return (('openjpeg-cdist', None) - ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa') + return (('openjpeg-cdist', None), + ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From 2669eabbf18a37e79f745865878aeb87bef369ee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Apr 2013 11:11:11 +0100 Subject: Fix ffmpeg revision. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 417e4221c..fa4586cde 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), - ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa'), + ('ffmpeg-cdist', '35a110e4270b070146a84a827b10f75c5916e08a'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From f870b63dbca8c00fb9103faeef1093aca8cc4d2f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Apr 2013 01:23:58 +0100 Subject: Go back to last long-running FFmpeg version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index fa4586cde..d985838fc 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), - ('ffmpeg-cdist', '35a110e4270b070146a84a827b10f75c5916e08a'), + ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3