From 01176a95c403299ab4e95236a021e43951f48c6b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 2 Aug 2014 16:21:06 +0100 Subject: Bump deps for cscript fixes. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 5ea5a4cfd..0c5838ed2 100644 --- a/cscript +++ b/cscript @@ -156,8 +156,8 @@ def make_control(debian_version, bits, filename, debug): print >>f,'' def dependencies(target): - return (('ffmpeg-cdist', '67dc770'), - ('libdcp', '009e07f')) + return (('ffmpeg-cdist', '7e95caa'), + ('libdcp', '7f029e7')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 20b2311bb30deaa6710300661a2b1faed62ea611 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 2 Aug 2014 16:32:06 +0100 Subject: cscript fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0c5838ed2..3377d2bc9 100644 --- a/cscript +++ b/cscript @@ -160,7 +160,7 @@ def dependencies(target): ('libdcp', '7f029e7')) def build(target, options): - cmd = './waf configure --prefix=%s' % target.work_dir_cscript() + cmd = './waf configure --prefix=%s' % target.directory if target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'linux': -- cgit v1.2.3 From c1c32ec488524f5a562f4f0037c37f8c33038ba9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 13:50:51 +0100 Subject: cdist updates. --- cscript | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 3377d2bc9..12b4fde70 100644 --- a/cscript +++ b/cscript @@ -184,7 +184,7 @@ def package_windows(target): shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits)) - target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.work_dir_cscript(), target.bits)) + target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, target.bits)) target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits) @@ -217,11 +217,11 @@ def package_debian(target, cpu, version): return debs def package_centos(target, cpu, version): - os.makedirs('%s/rpmbuild/BUILD' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/RPMS' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/SOURCES' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/SPECS' % target.work_dir_cdist()) - os.makedirs('%s/rpmbuild/SRPMS' % target.work_dir_cdist()) + os.makedirs('%s/rpmbuild/BUILD' % target.directory) + os.makedirs('%s/rpmbuild/RPMS' % target.directory) + os.makedirs('%s/rpmbuild/SOURCES' % target.directory) + os.makedirs('%s/rpmbuild/SPECS' % target.directory) + os.makedirs('%s/rpmbuild/SRPMS' % target.directory) f = open('%s/.rpmmacros' % target.dir_in_chroot, 'w') print >>f,"%%_topdir %srpmbuild" % target.dir_in_chroot @@ -229,8 +229,8 @@ def package_centos(target, cpu, version): target.command('./waf dist') shutil.copyfile( - "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.work_dir_cdist(), version), - "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.work_dir_cdist(), version) + "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), + "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.directory, version) ) target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec') @@ -239,7 +239,7 @@ def package_centos(target, cpu, version): if cpu == "amd64": cpu = "x86_64" - for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.work_dir_cdist(), cpu)): + for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.directory, cpu)): rpms.append(os.path.abspath(p)) return rpms @@ -258,7 +258,7 @@ def package(target, version): elif target.distro == 'centos': return package_centos(target, cpu, version) elif target.platform == 'osx': - target.command('bash platform/osx/make_dmg.sh %s' % target.work_dir_cscript()) + target.command('bash platform/osx/make_dmg.sh %s' % target.directory) return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0]) def make_pot(target): -- cgit v1.2.3 From b2b5e9f825ba5b045f371ac8f83cb6d65a17260e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 14:24:18 +0100 Subject: cdist fix. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 12b4fde70..13382b266 100644 --- a/cscript +++ b/cscript @@ -223,8 +223,8 @@ def package_centos(target, cpu, version): os.makedirs('%s/rpmbuild/SPECS' % target.directory) os.makedirs('%s/rpmbuild/SRPMS' % target.directory) - f = open('%s/.rpmmacros' % target.dir_in_chroot, 'w') - print >>f,"%%_topdir %srpmbuild" % target.dir_in_chroot + f = open(os.path.expanduser('~/.rpmmacros', 'w') + print >>f,os.path.expanduser("%%_topdir ~/srpmbuild") f.close() target.command('./waf dist') -- cgit v1.2.3 From 0596eebfacc9a35090bccd6807d7fcf56d67e94a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 14:26:23 +0100 Subject: Typo in previous. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 13382b266..951f69fe5 100644 --- a/cscript +++ b/cscript @@ -223,7 +223,7 @@ def package_centos(target, cpu, version): os.makedirs('%s/rpmbuild/SPECS' % target.directory) os.makedirs('%s/rpmbuild/SRPMS' % target.directory) - f = open(os.path.expanduser('~/.rpmmacros', 'w') + f = open(os.path.expanduser('~/.rpmmacros'), 'w') print >>f,os.path.expanduser("%%_topdir ~/srpmbuild") f.close() -- cgit v1.2.3 From 03dac049c58c884d754c90b934bbd814c5f0f5ee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 18:40:37 +0100 Subject: cdist fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 951f69fe5..48b24f3ef 100644 --- a/cscript +++ b/cscript @@ -224,7 +224,7 @@ def package_centos(target, cpu, version): os.makedirs('%s/rpmbuild/SRPMS' % target.directory) f = open(os.path.expanduser('~/.rpmmacros'), 'w') - print >>f,os.path.expanduser("%%_topdir ~/srpmbuild") + print >>f,os.path.expanduser("%_topdir ~/srpmbuild") f.close() target.command('./waf dist') -- cgit v1.2.3 From c93d58a9ed4276c7b1d40165ebc542fc3cde496d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 18:52:31 +0100 Subject: cdist fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 48b24f3ef..6d15bc99f 100644 --- a/cscript +++ b/cscript @@ -224,7 +224,7 @@ def package_centos(target, cpu, version): os.makedirs('%s/rpmbuild/SRPMS' % target.directory) f = open(os.path.expanduser('~/.rpmmacros'), 'w') - print >>f,os.path.expanduser("%_topdir ~/srpmbuild") + print >>f,os.path.expanduser("%_topdir ~/rpmbuild") f.close() target.command('./waf dist') -- cgit v1.2.3 From b3ab2230281429ab8c0fcfd75c5b421ec958bcac Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 19:37:55 +0100 Subject: More RPM tweaks. --- cscript | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 6d15bc99f..0bfde74be 100644 --- a/cscript +++ b/cscript @@ -217,29 +217,29 @@ def package_debian(target, cpu, version): return debs def package_centos(target, cpu, version): - os.makedirs('%s/rpmbuild/BUILD' % target.directory) - os.makedirs('%s/rpmbuild/RPMS' % target.directory) - os.makedirs('%s/rpmbuild/SOURCES' % target.directory) - os.makedirs('%s/rpmbuild/SPECS' % target.directory) - os.makedirs('%s/rpmbuild/SRPMS' % target.directory) - - f = open(os.path.expanduser('~/.rpmmacros'), 'w') - print >>f,os.path.expanduser("%_topdir ~/rpmbuild") + os.makedirs('build/rpmbuild/BUILD') + os.makedirs('build/rpmbuild/RPMS') + os.makedirs('build/rpmbuild/SOURCES') + os.makedirs('build/rpmbuild/SPECS') + os.makedirs('build/rpmbuild/SRPMS') + + f = open('build/rpmmacros', 'w') + print >>f,os.path.expanduser("%_topdir ~/build/rpmbuild") f.close() target.command('./waf dist') shutil.copyfile( "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), - "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.directory, version) + "build/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % version ) - target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec') + target.command('rpmbuild --rcfile build/rpmmacros -bb build/platform/linux/dcpomatic.spec') rpms = [] if cpu == "amd64": cpu = "x86_64" - for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.directory, cpu)): + for p in glob.glob('build/rpmbuild/RPMS/%s/*.rpm' % cpu): rpms.append(os.path.abspath(p)) return rpms -- cgit v1.2.3 From a46119090829f463ff11797348111d9f62cb71e4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 20:20:42 +0100 Subject: More RPM tweaks. --- cscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0bfde74be..4d4737865 100644 --- a/cscript +++ b/cscript @@ -223,17 +223,13 @@ def package_centos(target, cpu, version): os.makedirs('build/rpmbuild/SPECS') os.makedirs('build/rpmbuild/SRPMS') - f = open('build/rpmmacros', 'w') - print >>f,os.path.expanduser("%_topdir ~/build/rpmbuild") - f.close() - target.command('./waf dist') shutil.copyfile( "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), "build/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % version ) - target.command('rpmbuild --rcfile build/rpmmacros -bb build/platform/linux/dcpomatic.spec') + target.command('rpmbuild --define \'_topdir build/rpmbuild\' -bb build/platform/linux/dcpomatic.spec') rpms = [] if cpu == "amd64": -- cgit v1.2.3 From 6f3bd7f8b5eb02a4fc8d1f93583b02191b08fbb8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 21:02:13 +0100 Subject: More RPM tweaks. --- cscript | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4d4737865..05a7f868c 100644 --- a/cscript +++ b/cscript @@ -217,25 +217,26 @@ def package_debian(target, cpu, version): return debs def package_centos(target, cpu, version): - os.makedirs('build/rpmbuild/BUILD') - os.makedirs('build/rpmbuild/RPMS') - os.makedirs('build/rpmbuild/SOURCES') - os.makedirs('build/rpmbuild/SPECS') - os.makedirs('build/rpmbuild/SRPMS') + topdir = os.path.realpath('build/rpmbuild') + os.makedirs('%s/BUILD' % topdir) + os.makedirs('%s/RPMS' % topdir) + os.makedirs('%s/SOURCES' % topdir) + os.makedirs('%s/SPECS' % topdir) + os.makedirs('%s/SRPMS' % topdir) target.command('./waf dist') shutil.copyfile( "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), - "build/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % version + "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) - target.command('rpmbuild --define \'_topdir build/rpmbuild\' -bb build/platform/linux/dcpomatic.spec') + target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic.spec' % topdir) rpms = [] if cpu == "amd64": cpu = "x86_64" - for p in glob.glob('build/rpmbuild/RPMS/%s/*.rpm' % cpu): + for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): rpms.append(os.path.abspath(p)) return rpms -- cgit v1.2.3