build system updated
This commit is contained in:
+11
-9
@@ -1,7 +1,7 @@
|
||||
#! /bin/bash
|
||||
## @file
|
||||
##
|
||||
## $Id$
|
||||
## $Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $
|
||||
##
|
||||
## $Date: 2004/08/31 15:57:19 $
|
||||
## $Author: marc $
|
||||
@@ -41,7 +41,7 @@ while test $# -gt 0; do
|
||||
(--no-vcs|-n) novcs=1;;
|
||||
(--exclude-vcs|-x) shift; excludevcs+=("$1");;
|
||||
(--version|-v)
|
||||
echo "$Id$";
|
||||
echo "$Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $";
|
||||
exit;;
|
||||
(--help|-h) less <<EOF
|
||||
SYNOPSIS
|
||||
@@ -131,7 +131,6 @@ GENERATED FILES
|
||||
* ax_init_standard_project.m4 - auxiliary macro definition file
|
||||
* ax_cxx_compile_stdcxx.m4 - auxiliary macro definition file
|
||||
* ax_check_qt.m4 - auxiliary macro definition file
|
||||
* makefile_test.inc.am - makefile to be included in tests
|
||||
* resolve-debbuilddeps.sh - script to install debian package dependencies
|
||||
* resolve-rpmbuilddeps.sh - script to install RPM package dependencies
|
||||
* build-in-docker.sh - script to build the project encapsulated in a docker container
|
||||
@@ -450,7 +449,7 @@ checkdir() {
|
||||
if ! test -d "$1"; then # create path
|
||||
run mkdir -p "$1"
|
||||
if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
|
||||
run ${VCS} add "$1"
|
||||
run --no-check ${VCS} add "$1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -498,7 +497,7 @@ to() {
|
||||
run chmod $mode $1
|
||||
if test $exists -eq 0; then
|
||||
if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
|
||||
run ${VCS} add "$1"
|
||||
run --no-check ${VCS} add "$1"
|
||||
if test "${VCS}" = "svn"; then
|
||||
run svn propset svn:keywords "Id" "$1"
|
||||
fi
|
||||
@@ -523,10 +522,14 @@ copy() {
|
||||
if test "${1%/*}" != "$1"; then
|
||||
test -d "${1%/*}" || svn mkdir "${1%/*}"
|
||||
fi
|
||||
if ! test -e "${source}"; then
|
||||
ignored "$1" not found
|
||||
return
|
||||
fi
|
||||
run cp "${source}" "$1"
|
||||
if test $exists -eq 0; then
|
||||
if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
|
||||
run ${VCS} add "$1"
|
||||
run --no-check ${VCS} add "$1"
|
||||
if test "${VCS}" = "svn"; then
|
||||
run svn propset svn:keywords "Id" "$1"
|
||||
fi
|
||||
@@ -575,7 +578,7 @@ vcs2cl() {
|
||||
fi
|
||||
if test $exists -eq 0; then
|
||||
if test -n "${VCS}" -a $novcs -eq 0 && ! contains "ChangeLog" "${excludevcs[@]}"; then
|
||||
run ${VCS} add ChangeLog
|
||||
run --no-check ${VCS} add ChangeLog
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -593,7 +596,6 @@ copy ${MY_NAME}
|
||||
copy ax_init_standard_project.m4
|
||||
copy ax_cxx_compile_stdcxx.m4
|
||||
copy ax_check_qt.m4
|
||||
copy makefile_test.inc.am
|
||||
copy resolve-debbuilddeps.sh
|
||||
copy resolve-rpmbuilddeps.sh
|
||||
copy build-in-docker.sh
|
||||
@@ -1508,7 +1510,7 @@ if testtag AX_USE_DOXYGEN; then
|
||||
sed -i ':a;/\\$/{s///;N;s/ *\n */ /g;ba}' doc/doxyfile.in
|
||||
if test $exists -eq 0; then
|
||||
if test -n "${VCS}" -a $novcs -eq 0 && ! contains "doc/doxyfile" "${excludevcs[@]}"; then
|
||||
run ${VCS} add doc/doxyfile.in
|
||||
run --no-check ${VCS} add doc/doxyfile.in
|
||||
if test "${VCS}" = "svn"; then
|
||||
run svn propset svn:keywords "Id" doc/doxyfile.in
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user