More centos build fixes.

4 files changed, 26 insertions, 17 deletions

diff --git a/cscript b/cscript
index 46eaaf929..5ea5a4cfd 100644
--- a/cscript
+++ b/cscript
@@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '67dc770'),
-            ('libdcp', '563c7fd'))
+            ('libdcp', '009e07f'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -170,7 +170,7 @@ def build(target, options):
                 cmd += ' --debian-unstable'
         elif target.distro == 'centos':
             if target.version == '6.5':
-                cmd += ' --target-centos-6'
+                cmd += ' --target-centos-6 --disable-tests'
             elif target.version == '7':
                 cmd += ' --target-centos-7'
 
diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in
index 46a0d1ce4..f39c2cbd8 100644
--- a/platform/linux/dcpomatic.spec.in
+++ b/platform/linux/dcpomatic.spec.in
@@ -1,6 +1,6 @@
 Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files
 Name:dcpomatic
-Version:@version@
+Version:@VERSION@
 Release:1%{?dist}
 License:GPL
 Group:Applications/Multimedia
@@ -49,15 +49,15 @@ digital projectors.
 %{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic.mo
 
 %prep
-rm -rf $RPM_BUILD_DIR/dcpomatic-@version@
-tar xjf $RPM_SOURCE_DIR/dcpomatic-@version@.tar.bz2
+rm -rf $RPM_BUILD_DIR/dcpomatic-@VERSION@
+tar xjf $RPM_SOURCE_DIR/dcpomatic-@VERSION@.tar.bz2
 %build
-cd dcpomatic-@version@
+cd dcpomatic-@VERSION@
 export PKG_CONFIG_PATH=/home/carl/lib/pkgconfig:/usr/local/lib/pkgconfig
-CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos
+CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
 ./waf
 %install
-cd dcpomatic-@version@
+cd dcpomatic-@VERSION@
 ./waf install
 
 %post
diff --git a/platform/linux/wscript b/platform/linux/wscript
index fe6f4e2db..3aab4f7fb 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -1,25 +1,30 @@
 def build(bld):
-    d = { 'INSTALL_PREFIX' : bld.env.INSTALL_PREFIX }
-    d = { 'VERSION' : bld.env.VERSION }
-
     obj = bld(features='subst')
     obj.source = 'dcpomatic.desktop.in'
     obj.target = 'dcpomatic.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic_batch.desktop.in'
     obj.target = 'dcpomatic_batch.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic_server.desktop.in'
     obj.target = 'dcpomatic_server.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic.spec.in'
     obj.target = 'dcpomatic.spec'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
+    if bld.env.TARGET_CENTOS_6:
+        obj.CENTOS_VERSION = '6'
+    elif bld.env.TARGET_CENTOS_7:
+        obj.CENTOS_VERSION = '7'
 
     bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop'])
diff --git a/wscript b/wscript
index 866d977b0..ef72a61e5 100644
--- a/wscript
+++ b/wscript
@@ -11,6 +11,7 @@ def options(opt):
 
     opt.add_option('--enable-debug',      action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--disable-gui',       action='store_true', default=False, help='disable building of GUI tools')
+    opt.add_option('--disable-tests',     action='store_true', default=False, help='disable building of tests')
     opt.add_option('--target-windows',    action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
     opt.add_option('--target-debian',     action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package')
     opt.add_option('--debian-unstable',   action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable')
@@ -164,6 +165,7 @@ def configure(conf):
     # conf.options -> conf.env
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
+    conf.env.DISABLE_TESTS = conf.options.disable_tests
     conf.env.TARGET_DEBIAN = conf.options.target_debian
     conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable
     conf.env.TARGET_CENTOS_6 = conf.options.target_centos_6
@@ -340,13 +342,15 @@ def configure(conf):
     conf.define('DATADIR', datadir)
 
     conf.recurse('src')
-    conf.recurse('test')
+    if not conf.env.DISABLE_TESTS:
+        conf.recurse('test')
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
 
     bld.recurse('src')
-    bld.recurse('test')
+    if not bld.env.DISABLE_TESTS:
+        bld.recurse('test')
     if bld.env.TARGET_WINDOWS:
         bld.recurse('platform/windows')
     if bld.env.TARGET_LINUX: