Merge branch 'feat-74' into develop

Author: Herbert Koelman

Makefile.in

@@ -9,12 +9,13 @@ INCLUDEDIR=@includedir@/pthread
 LIBDIR=@libdir@
 LOCALEDIR=@localedir@
 
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_DEV=@PACKAGE_NAME@-@BUILD@-@[email protected]
+PACKAGE_SRC=@PACKAGE_NAME@-@[email protected]
+
 INSTALL=@INSTALL@ 
 RM=@RM@
 MKDIR=@MKDIR_P@
-PACKAGE_NAME=@PACKAGE_NAME@
-PACKAGE_DEVELOP=@PACKAGE_NAME@-@BUILD@-@[email protected]
-PACKAGE=@PACKAGE_NAME@-@PACKAGE_VERSION@-@[email protected]
 HEADERS=@HEADERS@
 DOXYGEN=@DOXYGEN@
 CODECHECK=@CODECHECK@
@@ -29,11 +30,13 @@ all:
 
 pkg: clean all
 	$(MKDIR) distrib
-	tar cf - include lib  | gzip -c > distrib/$(PACKAGE_DEVELOP)
+	tar cf - include lib    | gzip -c > distrib/$(PACKAGE_DEV)
+	tar cf - `git ls-files` | gzip -c > distrib/$(PACKAGE_SRC)
 
 # this target can only be used if REPOSITORY is set (hence the test)
 deploy: pkg
-	@test ! -z "$(REPOSITORY)" && ( cd distrib && $(DEPLOY) $(PACKAGE_DEVELOP) $(REPOSITORY) 2> /dev/null && echo "deployed $(PACKAGE_DEVELOP) here $(REPOSITORY)" ) || echo "WARNING use ./configure --enable-repository to enable deploy target"
+	@test ! -z "$(REPOSITORY)" && ( cd distrib && $(DEPLOY) $(PACKAGE_DEV) $(REPOSITORY) 2> /dev/null && echo "deployed $(PACKAGE_DEV) here $(REPOSITORY)" ) || echo "WARNING use ./configure --enable-repository to enable deploy target"
+	@test ! -z "$(REPOSITORY)" && ( cd distrib && $(DEPLOY) $(PACKAGE_SRC) $(REPOSITORY) 2> /dev/null && echo "deployed $(PACKAGE_SRC) here $(REPOSITORY)" ) || echo "WARNING use ./configure --enable-repository to enable deploy target"
 
 globber:clean
 	-$(RM) -R Makefile autom4te.cache config.log config.status doxyfile sonar-project.properties
@@ -53,11 +56,7 @@ doxygen:
 	${DOXYGEN} doxyfile
 
 install:
-	$(MKDIR) $(INCLUDEDIR)
-	$(INSTALL) include/pthread/*.hpp include/pthread/*.h $(INCLUDEDIR)
-	$(INSTALL) lib/lib@[email protected] @libdir@
+	-(cd src && $(MAKE) install)
 
 uninstall:
-	$(RM) -R  $(INCLUDEDIR)
-# not a good idea	$(RM) @libdir@/lib@PACKAGE_NAME@-@[email protected] @libdir@/lib@[email protected] 
-	$(RM) @libdir@/lib@PACKAGE_NAME@*.a
+	-(cd src && $(MAKE) uninstall)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cpp-pthread v1.7.2.
+# Generated by GNU Autoconf 2.69 for cpp-pthread v1.7.3.
 #
 # Report bugs to <[email protected]>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cpp-pthread'
 PACKAGE_TARNAME='cpp-pthread'
-PACKAGE_VERSION='v1.7.2'
-PACKAGE_STRING='cpp-pthread v1.7.2'
+PACKAGE_VERSION='v1.7.3'
+PACKAGE_STRING='cpp-pthread v1.7.3'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://herbertkoelman.github.io/cpp-pthread/'
 
@@ -645,8 +645,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_build
-enable_release
+enable_snapshot
 enable_repository
 enable_codecheck
 '
@@ -1194,7 +1193,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cpp-pthread v1.7.2 to adapt to many kinds of systems.
+\`configure' configures cpp-pthread v1.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1258,15 +1257,14 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cpp-pthread v1.7.2:";;
+     short | recursive ) echo "Configuration of cpp-pthread v1.7.3:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-build          build name.
   --enable-release        build as release.
   --enable-repository     use the given name to locate the remote repository
 \
@@ -1342,7 +1340,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cpp-pthread configure v1.7.2
+cpp-pthread configure v1.7.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1359,7 +1357,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cpp-pthread $as_me v1.7.2, which was
+It was created by cpp-pthread $as_me v1.7.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1744,14 +1742,11 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-# Check whether --enable-build was given.
-if test "${enable_build+set}" = set; then :
-  enableval=$enable_build; BUILD=$enable_build
-fi
-
-# Check whether --enable-release was given.
-if test "${enable_release+set}" = set; then :
-  enableval=$enable_release; BUILD=$PACKAGE_VERSION
+# Check whether --enable-snapshot was given.
+if test "${enable_snapshot+set}" = set; then :
+  enableval=$enable_snapshot; BUILD="SNAPSHOT"
+else
+  BUILD=$PACKAGE_VERSION
 fi
 
 # Check whether --enable-repository was given.
@@ -1767,12 +1762,14 @@ then
 
 fi
 
-if test -z "$BUILD"
-then
-  BUILD="SNAPSHOT"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: using default BUILD name $BUILD" >&5
-$as_echo "$as_me: using default BUILD name $BUILD" >&6;}
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}:
+
+    Build $PACKAGE_NAME version $BUILD
+" >&5
+$as_echo "$as_me:
+
+    Build $PACKAGE_NAME version $BUILD
+" >&6;}
 BUILD=$BUILD
 
 
@@ -2044,8 +2041,8 @@ else
 $as_echo "no, using $LN_S" >&6; }
 fi
 
-# Extract the first word of "basic_deploy.sh", so it can be a program name with args.
-set dummy basic_deploy.sh; ac_word=$2
+# Extract the first word of "nexus-upload", so it can be a program name with args.
+set dummy nexus-upload; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DEPLOY+:} false; then :
@@ -2061,15 +2058,15 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DEPLOY="basic_deploy.sh"
+    ac_cv_prog_DEPLOY="nexus-upload"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_DEPLOY" && ac_cv_prog_DEPLOY="echo \"please install basic_deploy.sh, make sure it\'s in your PATH and re-run ./configure\""
+  test -z "$ac_cv_prog_DEPLOY" && ac_cv_prog_DEPLOY="echo \"please install nexus-upload, make sure it\'s in your PATH and re-run ./configure\""
 fi
 fi
 DEPLOY=$ac_cv_prog_DEPLOY
@@ -2735,7 +2732,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cpp-pthread $as_me v1.7.2, which was
+This file was extended by cpp-pthread $as_me v1.7.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2789,7 +2786,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cpp-pthread config.status v1.7.2
+cpp-pthread config.status v1.7.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -7,20 +7,18 @@ AC_LANG(C++)
 
 AC_CONFIG_AUX_DIR([/usr/bin . bin])
 
-AC_ARG_ENABLE([build], AS_HELP_STRING([--enable-build],[build name.]), BUILD=$enable_build)
-AC_ARG_ENABLE([release], AS_HELP_STRING([--enable-release],[build as release.]), BUILD=$PACKAGE_VERSION)
+AC_ARG_ENABLE([snapshot], AS_HELP_STRING([--enable-release],[build as release.]), [BUILD="SNAPSHOT"], [BUILD=$PACKAGE_VERSION])
 AC_ARG_ENABLE([repository], AS_HELP_STRING([--enable-repository],[use the given name to locate the remote repository]), AC_MSG_NOTICE([repository set to $enable_repository]) )
 
 if test ! -z "$enable_repository"
 then
   AC_SUBST(REPOSITORY,"$enable_repository/$PACKAGE_NAME")
 fi
 
-if test -z "$BUILD" 
-then
-  BUILD="SNAPSHOT"
-  AC_MSG_NOTICE([using default BUILD name $BUILD])
-fi
+AC_MSG_NOTICE([
+
+    Build $PACKAGE_NAME version $BUILD
+])
 AC_SUBST(BUILD,$BUILD)
 
 AC_CANONICAL_BUILD
@@ -35,7 +33,7 @@ AC_CHECK_PROG([RM],[rm],[rm -f])
 AC_CHECK_PROG([DOXYGEN],[doxygen],[doxygen],[echo \"please install doxygen and re-run ./configure, or run it manualy doxygen \"])
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
-AC_CHECK_PROG([DEPLOY],[basic_deploy.sh],[basic_deploy.sh],[echo \"please install basic_deploy.sh, make sure it\'s in your PATH and re-run ./configure\"])
+AC_CHECK_PROG([DEPLOY],[nexus-upload],[nexus-upload],[echo \"please install nexus-upload, make sure it\'s in your PATH and re-run ./configure\"])
 
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK" 

src/Makefile.in

@@ -4,6 +4,9 @@
 # Compile c++ source code
 .SUFFIXES:.cpp
 
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
 BASEDIR=../
 XREFDIR=${BASEDIR}/xref/
 UDATAOBJ=$(BASEDIR)/udataobj/
@@ -17,10 +20,13 @@ CC=@CC@
 CCC=@CXX@
 CXX=$CCC
 RANLIB=@RANLIB@
-RM=rm -f
 AR=@AR@ @ARFLAGS@
+
+INSTALL=@INSTALL@
+RM=@RM@
 MV=@MV@
 LN_S=@LN_S@
+MKDIR=@MKDIR_P@
 
 BITS=@BITS@
 OBJECT_MODE=$(BITS)
@@ -53,6 +59,15 @@ clean:
 cxref:
 	cxref *.c -xref -index-all -latex209 -O${XREFDIR} -I${INCDIR} -I${INCTUX}
 
+install:
+	$(MKDIR) @includedir@/pthread
+	$(INSTALL) ${INCDIR}/pthread/*.hpp ${INCDIR}/pthread/*.h @includedir@/pthread
+	$(INSTALL) ${LIBDIR}/lib@[email protected] @libdir@
+
+uninstall:
+	$(RM) -R  @includedir@/pthread
+	$(RM) @libdir@/lib@PACKAGE_NAME@*.a
+
 # cpp build rule
 .cpp.o:
 	$(CCC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) -c $<