X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=658a7b76d303f967b0c985a93441f3563b9e1b4f;hb=fd7e004e0b0a08a9d9b323888c7f60834c93eafc;hp=94c815a1dbf29ec87f3237ccfc534ce3985d92c3;hpb=b5952eb3b4ce079980053103a9aeac3fbe40b25f;p=libcxml.git

diff --git a/wscript b/wscript
index 94c815a..658a7b7 100644
--- a/wscript
+++ b/wscript
@@ -1,16 +1,54 @@
+# -*- 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.13.0'
+
+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')
+    if conf.options.enable_debug:
+        conf.env.append_value('CXXFLAGS', '-g')
     conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2'])
+    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
@@ -23,6 +61,7 @@ def configure(conf):
         boost_lib_suffix = ''
 
     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