Whitespace.
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:38:14 +0000 (16:38 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:38:14 +0000 (16:38 +0100)
wscript

diff --git a/wscript b/wscript
index c02685b99952ddc024ed84436b717b6ce46f6fd7..9ce74e063e4bfb3281c1b8484f1ed9da31cc05bb 100644 (file)
--- a/wscript
+++ b/wscript
@@ -35,14 +35,14 @@ def configure(conf):
     if not conf.options.osx:
         conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter'])
 
-    conf.check_cfg(package = 'openssl', args = '--cflags --libs', uselib_store = 'OPENSSL', mandatory = True)
-    conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
-    conf.check_cfg(package = 'xmlsec1', args = '--cflags --libs', uselib_store = 'XMLSEC1', mandatory = True)
+    conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
+    conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
+    conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1]
 
     if conf.options.static:
-        conf.check_cc(fragment = """
+        conf.check_cc(fragment="""
                        #include <stdio.h>\n
                        #include <openjpeg.h>\n
                        int main () {\n
@@ -50,7 +50,7 @@ def configure(conf):
                        return 0;\n
                        }
                        """,
-                       msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG', mandatory = True)
+                       msg='Checking for library openjpeg', stlib='openjpeg', uselib_store='OPENJPEG', mandatory=True)
         
         conf.env.HAVE_CXML = 1
         conf.env.STLIB_CXML = ['cxml']
@@ -70,42 +70,42 @@ def configure(conf):
         # Windows builds are any more reliable
         conf.env.append_value('CXXFLAGS', '-O2')
 
-    conf.check_cxx(fragment = """
+    conf.check_cxx(fragment="""
                               #include <boost/version.hpp>\n
                               #if BOOST_VERSION < 104500\n
                               #error boost too old\n
                               #endif\n
                               int main(void) { return 0; }\n
                               """,
-                   mandatory = True,
-                   msg = 'Checking for boost library >= 1.45',
-                   okmsg = 'yes',
-                   errmsg = 'too old\nPlease install boost version 1.45 or higher.')
+                   mandatory=True,
+                   msg='Checking for boost library >= 1.45',
+                   okmsg='yes',
+                   errmsg='too old\nPlease install boost version 1.45 or higher.')
 
-    conf.check_cxx(fragment = """
+    conf.check_cxx(fragment="""
                              #include <boost/filesystem.hpp>\n
                              int main() { boost::filesystem::copy_file ("a", "b"); }\n
                              """,
-                   msg = 'Checking for boost filesystem library',
-                   libpath = '/usr/local/lib',
-                   lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
-                   uselib_store = 'BOOST_FILESYSTEM')
+                   msg='Checking for boost filesystem library',
+                   libpath='/usr/local/lib',
+                   lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                   uselib_store='BOOST_FILESYSTEM')
 
-    conf.check_cxx(fragment = """
+    conf.check_cxx(fragment="""
                              #include <boost/signals2.hpp>\n
                              int main() { boost::signals2::signal<void (int)> x; }\n
                              """,
-                   msg = 'Checking for boost signals2 library',
-                   uselib_store = 'BOOST_SIGNALS2')
+                   msg='Checking for boost signals2 library',
+                   uselib_store='BOOST_SIGNALS2')
 
-    conf.check_cxx(fragment = """
+    conf.check_cxx(fragment="""
                              #include <boost/date_time.hpp>\n
                              int main() { boost::gregorian::day_clock::local_day(); }\n
                              """,
-                   msg = 'Checking for boost datetime library',
-                   libpath = '/usr/local/lib',
-                   lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
-                   uselib_store = 'BOOST_DATETIME')
+                   msg='Checking for boost datetime library',
+                   libpath='/usr/local/lib',
+                   lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                   uselib_store='BOOST_DATETIME')
 
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
@@ -119,11 +119,11 @@ def build(bld):
     else:
         boost_lib_suffix = ''
 
-    bld(source = 'libdcp.pc.in',
-        version = VERSION,
-        includedir = '%s/include' % bld.env.PREFIX,
-        libs = "-L${libdir} -ldcp -lasdcp-libdcp -lkumu-libdcp -lcxml -lboost_system%s" % boost_lib_suffix,
-        install_path = '${LIBDIR}/pkgconfig')
+    bld(source='libdcp.pc.in',
+        version=VERSION,
+        includedir='%s/include' % bld.env.PREFIX,
+        libs="-L${libdir} -ldcp -lasdcp-libdcp -lkumu-libdcp -lcxml -lboost_system%s" % boost_lib_suffix,
+        install_path='${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
     bld.recurse('tools')