X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=959e1e0faa6212cd8baa84f0eb65aa3c7ac87586;hb=3c371e9aead80bfed91ae208e2ce782c7bf4901b;hp=f88bbbe7904ef1229246f44d84bb53e10246e510;hpb=9115b8273fdc19594e3e277e169174378ef2887b;p=libcxml.git

diff --git a/wscript b/wscript
index f88bbbe..959e1e0 100644
--- a/wscript
+++ b/wscript
@@ -1,17 +1,59 @@
+# -*- mode: python -*-
+#
+#    Copyright (C) 2016-2018 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/>.
+#
+
+import subprocess
+import shlex
+from waflib import Context
+
 APPNAME = 'libcxml'
-VERSION = '0.09pre'
+
+this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
+last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+
+if this_version == '':
+    VERSION = '%sdevel' % last_version[1:].strip()
+else:
+    VERSION = this_version[1:].strip()
+
+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('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
     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')
+    opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11')
 
 def configure(conf):
     conf.load('compiler_cxx')
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2'])
+    if conf.options.enable_debug:
+        conf.env.append_value('CXXFLAGS', '-g')
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2', '-Wno-deprecated-declarations'])
+    if conf.options.force_cpp11:
+        conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
 
     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'
@@ -29,18 +71,17 @@ def configure(conf):
                    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_test_exec_monitor%s' % boost_lib_suffix,
-                                   'boost_system%s' % boost_lib_suffix],
-                              uselib_store='BOOST_TEST')
-
-    conf.recurse('test')
+    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')
 
 def build(bld):
 
@@ -51,4 +92,5 @@ def build(bld):
         install_path='${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
-    bld.recurse('test')
+    if not bld.env.DISABLE_TESTS:
+        bld.recurse('test')