X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=959e1e0faa6212cd8baa84f0eb65aa3c7ac87586;hb=670c528a584d96e8bb6009f996204e9ecf174f54;hp=75a9a4383fd9a8ddbb4d484a1407b0d28ac6aed7;hpb=4943f237457d994daced9e2c366b913cc0ec6555;p=libcxml.git

diff --git a/wscript b/wscript
index 75a9a43..959e1e0 100644
--- a/wscript
+++ b/wscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libcxml.
 #
@@ -18,10 +18,20 @@
 #    along with libcxml.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import subprocess
+import shlex
 from waflib import Context
 
 APPNAME = 'libcxml'
-VERSION = '0.15.5'
+
+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):
@@ -36,7 +46,7 @@ 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'])
+    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'])
 
@@ -51,7 +61,6 @@ 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