X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b4f47474daa74cad077bc0964548838a80a8a2af;hb=7c0e5f60ac7a2cb3dc1067d95f18fce6e268a145;hp=4ac9280abbc7cc739686c6f3df5ac43679bc22d5;hpb=cda98e03e4460c34bbe9612a7f579d0e49a16a90;p=libcxml.git

diff --git a/wscript b/wscript
index 4ac9280..b4f4747 100644
--- a/wscript
+++ b/wscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libcxml.
 #
@@ -18,21 +18,37 @@
 #    along with libcxml.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import subprocess
+import shlex
 from waflib import Context
 
 APPNAME = 'libcxml'
-VERSION = '0.15.2'
+
+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
@@ -41,11 +57,12 @@ def configure(conf):
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
+        conf.env.append_value('CXXFLAGS', '-DLIBCXML_WINDOWS')
     else:
         boost_lib_suffix = ''
+        conf.env.append_value('CXXFLAGS', '-DLIBCXML_POSIX')
 
     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="""
  		   #include <boost/filesystem.hpp>\n
@@ -68,13 +85,6 @@ def configure(conf):
 
         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',