X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=d55213f05a346ae8891edc72cd3fa88017ea0afb;hb=220ba2521fde0692063f384bf92d178940f3c793;hp=fda4bac772b881b561a31b8d4dcf5952ef33ef49;hpb=51701447357322a6e76b2ba1c2f3e884e72da51f;p=libcxml.git

diff --git a/wscript b/wscript
index fda4bac..d55213f 100644
--- a/wscript
+++ b/wscript
@@ -1,10 +1,34 @@
+# -*- mode: python -*-
+#
+#    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libcxml.
+#
+#    libcxml is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libcxml is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libcxml.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from waflib import Context
+
 APPNAME = 'libcxml'
-VERSION = '0.04pre'
+VERSION = '0.15.3devel'
+API_VERSION = '0.0.0'
 
 def options(opt):
     opt.load('compiler_cxx')
-    opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows')
-    opt.add_option('--static', action='store_true', default = False, help = 'build statically')
+    opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows')
+    opt.add_option('--static', action='store_true', default=False, help='build statically')
+    opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -12,41 +36,53 @@ def configure(conf):
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.STATIC = conf.options.static
+    conf.env.DISABLE_TESTS = conf.options.disable_tests
+    conf.env.API_VERSION = API_VERSION
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
     else:
         boost_lib_suffix = ''
 
-    conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
+    conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
+    conf.check_cfg(package='locked_sstream', args='--cflags --libs', uselib_store='LOCKED_SSTREAM', mandatory=True)
 
-    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')
-
-    conf.check_cxx(fragment = """
-                              #define BOOST_TEST_MODULE Config test\n
-    			      #include <boost/test/unit_test.hpp>\n
-                              int main() {}
-                              """,
-                              msg = 'Checking for boost unit testing library',
-                              lib = ['boost_unit_test_framework%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
-                              uselib_store = 'BOOST_TEST')
-
-    conf.recurse('test')
+                   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')
+
+    if not conf.options.disable_tests:
+        conf.check_cxx(fragment="""
+                                  #define BOOST_TEST_MODULE Config test\n
+    	                          #include <boost/test/unit_test.hpp>\n
+                                  int main() {}
+                                  """,
+                                  msg='Checking for boost unit testing library',
+                                  lib=['boost_unit_test_framework%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                                  uselib_store='BOOST_TEST')
+
+        conf.recurse('test')
+
+    # libxml++ 2.39.1 and later must be built with -std=c++11
+    libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH)
+    s = libxmlpp_version.split('.')
+    v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
+    if v >= 0x022701:
+        conf.env.append_value('CXXFLAGS', '-std=c++11')
 
 def build(bld):
 
-    bld(source = 'libcxml.pc.in',
-        version = VERSION,
-        includedir = '%s/include' % bld.env.PREFIX,
-        libs = "-L${libdir} -lcxml",
-        install_path = '${LIBDIR}/pkgconfig')
+    bld(source='libcxml.pc.in',
+        version=VERSION,
+        includedir='%s/include' % bld.env.PREFIX,
+        libs="-L${libdir} -lcxml",
+        install_path='${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
-    bld.recurse('test')
+    if not bld.env.DISABLE_TESTS:
+        bld.recurse('test')