Merge branch 'iss-71' into develop

Author: Herbert Koelman

Makefile.in

@@ -12,20 +12,28 @@ LOCALEDIR=@localedir@
 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@
 LN_S=@LN_S@
+DEPLOY=@DEPLOY@
+REPOSITORY=@REPOSITORY@
 
 PTHREADLIB=libcpp-pthread.a
 
 all: 
 	cd src && $(MAKE)
 
-pkg: 
+pkg: clean all
 	$(MKDIR) distrib
-	tar cf - `git ls-files`  | gzip -c > distrib/$(PACKAGE)
+	tar cf - include lib  | gzip -c > distrib/$(PACKAGE_DEVELOP)
+
+# 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"
 
 globber:clean
 	-$(RM) -R Makefile autom4te.cache config.log config.status doxyfile sonar-project.properties

configure

@@ -589,6 +589,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 HEADERS
 subdirs
+DEPLOY
 LN_S
 MKDIR_P
 DOXYGEN
@@ -602,6 +603,7 @@ build_vendor
 build_cpu
 build
 BUILD
+REPOSITORY
 target_alias
 host_alias
 build_alias
@@ -645,6 +647,7 @@ ac_user_opts='
 enable_option_checking
 enable_build
 enable_release
+enable_repository
 enable_codecheck
 '
       ac_precious_vars='build_alias
@@ -1265,6 +1268,7 @@ Optional Features:
   --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
 \
     --enable-codecheck=PATH set CODECHECK to run a specific program
 
@@ -1750,6 +1754,18 @@ if test "${enable_release+set}" = set; then :
   enableval=$enable_release; BUILD=$PACKAGE_VERSION
 fi
 
+# Check whether --enable-repository was given.
+if test "${enable_repository+set}" = set; then :
+  enableval=$enable_repository; { $as_echo "$as_me:${as_lineno-$LINENO}: repository set to $enable_repository" >&5
+$as_echo "$as_me: repository set to $enable_repository" >&6;}
+fi
+
+
+if test ! -z "$enable_repository"
+then
+  REPOSITORY="$enable_repository/$PACKAGE_NAME"
+
+fi
 
 if test -z "$BUILD"
 then
@@ -2028,6 +2044,44 @@ 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
+{ $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 :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DEPLOY"; then
+  ac_cv_prog_DEPLOY="$DEPLOY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  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"
+    $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\""
+fi
+fi
+DEPLOY=$ac_cv_prog_DEPLOY
+if test -n "$DEPLOY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEPLOY" >&5
+$as_echo "$DEPLOY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK"

configure.ac

@@ -9,6 +9,12 @@ 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([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
@@ -29,6 +35,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\"])
 
 # Okay, no cppcheck found, maybe we have sonar
 if test -z "$CODECHECK"