X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=750fd758d8ed85b60cc7a5d62dc3b1c2542b4dfe;hb=71dfc65c45f6ee3058fd158adeab4894f5a26555;hp=cd60162d94324d720a42ce05004672419182f044;hpb=85a0f18db9430dd670c65725a91f2c742294c30d;p=dcpomatic.git diff --git a/cscript b/cscript index cd60162d9..750fd758d 100644 --- a/cscript +++ b/cscript @@ -3,45 +3,41 @@ import shutil import os def dependencies(target): - if target.platform == 'windows': - return () - else: - return (('openjpeg-cdist', None), - ('libcxml', None), - ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), - ('libdcp', 'v0.45')) + return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'), + ('libdcp', 'ef26e37fce728cba6fb50e9e6743a012b1bbbf64')) -def build(env, target): - cmd = './waf configure --prefix=%s' % env.work_dir_cscript() +def build(target): + cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' - else: + elif target.platform == 'linux': cmd += ' --static' - env.command(cmd) + target.command(cmd) - env.command('./waf') + target.command('./waf') - if target.platform == 'linux': - env.command('./waf install') + if target.platform == 'linux' or target.platform == 'osx': + target.command('./waf install') -def package(env, target, version): +def package(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]) + 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~%%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) + return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) elif target.platform == 'linux': if target.bits == 32: cpu = 'i386' else: cpu = 'amd64' - shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control') - env.command('./waf dist') + shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control') + target.command('./waf dist') f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) @@ -49,22 +45,30 @@ def package(env, target, version): os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) - env.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version) + target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version) os.chdir('dcpomatic-%s' % version) - 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]) + target.command('dch -b -v %s-1 "New upstream release."' % version) + target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS')) + target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) + target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) + target.command('dpkg-buildpackage') + + debs = [] + for p in glob.glob('../*.deb'): + debs.append(os.path.abspath(p)) + + return debs + elif target.platform == 'osx': + target.command('bash platform/osx/make_dmg.sh') + return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0]) -def make_pot(env): - env.command('./waf pot') +def make_pot(target): + target.command('./waf pot') return [os.path.abspath('build/src/lib/libdcpomatic.pot'), os.path.abspath('build/src/wx/libdcpomatic-wx.pot'), os.path.abspath('build/src/tools/dcpomatic.pot')] -def make_manual(env): +def make_manual(target): os.chdir('doc/manual') - env.command('make') + target.command('make') return [os.path.abspath('pdf'), os.path.abspath('html')]