libraries/libxml-cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update of build system

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-12-21 15:18:35 +00:00
parent 3675b4a9b5
commit 93c24439e4
6 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@@ -1,3 +1,30 @@
2017-12-07 10:43
* [r108] INSTALL, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh, build-in-docker.sh, dependency-graph.sh[ADD],
resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh,
template.sh[ADD]:
fixed build on mac
2017-06-02 11:56
* [r107] INSTALL, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.conf, build-in-docker.sh, configure.ac,
debian/control.in, examples/makefile.am, libxml-cxx.spec.in,
resolve-rpmbuilddeps.sh:
fixed rpm build
2017-05-17 11:07
* [r106] ChangeLog, INSTALL, ax_check_qt.m4,
ax_init_standard_project.m4, bootstrap.sh, build-in-docker.sh,
debian, debian/changelog.in[ADD], debian/compat[ADD],
debian/control.in[ADD], debian/docs[ADD],
debian/libxml-cxx-dev.install[ADD],
debian/libxml-cxx.install[ADD], debian/rules[ADD],
resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, rpmsign.exp:
build updated
2017-03-19 23:44 2017-03-19 23:44
* [r105] ax_init_standard_project.m4, bootstrap.sh, * [r105] ax_init_standard_project.m4, bootstrap.sh,

2
INSTALL
View File

@@ -1 +1 @@
/usr/local/Cellar/automake/1.15.1/share/automake-1.15/INSTALL /usr/share/automake-1.15/INSTALL

1
ax_init_standard_project.m4
View File

@@ -943,7 +943,6 @@ AC_DEFUN([AX_PKG_CHECK], [
(test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then (test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then
AX_RPM_BUILD_DEPEND([$rpm_pkg]) AX_RPM_BUILD_DEPEND([$rpm_pkg])
fi fi
)
]) ])
# make sure, a specific header exists # make sure, a specific header exists

2
bootstrap.sh
View File

@@ -1101,7 +1101,7 @@ to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
} }
} }
EOF EOF
PACKAGE_NAME_UPPER=$(echo ${PACKAGE_NAME} | tr '+[:lower:]' 'X[:upper:]' | tr -cd '[[:alnum:]]_-.') PACKAGE_NAME_UPPER=$(echo ${PACKAGE_NAME} | tr '+[:lower:]' 'X[:upper:]' | tr -cd '[[:alnum:]]._-')
to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
#EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}" #EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
#${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log" #${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"

1
mac-create-app-bundle.sh
View File

@@ -38,6 +38,7 @@ executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1)
! test -d ${3}/share || rmdir ${3}/share ! test -d ${3}/share || rmdir ${3}/share
! test -d ${3} || \ ! test -d ${3} || \
find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
! test -d ${3}/include || rm -r ${3}/include
! test -d ${3} || rmdir ${3} ! test -d ${3} || rmdir ${3}
! test -d ${1}/tmp || rm -r ${1}/tmp ! test -d ${1}/tmp || rm -r ${1}/tmp

1
template.sh
View File

@@ -105,6 +105,7 @@ function traperror() {
local linecallfunc="$3" local linecallfunc="$3"
local command="$4" local command="$4"
local funcstack="$5" local funcstack="$5"
IFS=" "
for e in ${err[@]}; do for e in ${err[@]}; do
if test -n "$e" -a "$e" != "0"; then if test -n "$e" -a "$e" != "0"; then
error "line $line - command '$command' exited with status: $e (${err[@]})" error "line $line - command '$command' exited with status: $e (${err[@]})"