update of build system

master
Marc Wäckerlin 7 years ago
parent 05ff5fa6bc
commit 1f7fac1dbc
  1. 2
      COPYING
  2. 53
      ChangeLog
  3. 2
      INSTALL
  4. 1
      ax_init_standard_project.m4
  5. 2
      bootstrap.sh
  6. 1
      mac-create-app-bundle.sh
  7. 1
      template.sh

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

@ -1,3 +1,56 @@
2017-12-07 10:19
* [r404] COPYING, INSTALL, ax_check_qt.m4,
ax_init_standard_project.m4, bootstrap.sh,
dependency-graph.sh[ADD], template.sh[ADD]:
fixed build on mac
2017-06-15 06:54
* [r403] COPYING, INSTALL, ax_init_standard_project.m4,
bootstrap.sh, build-in-docker.conf, build-in-docker.sh,
libpcscxx.spec.in:
fix fedora / centos build
2017-06-14 13:59
* [r402] libpcscxx.spec.in:
removed qt4 dependency
2017-06-13 11:31
* [r401] ax_init_standard_project.m4, bootstrap.sh,
libpcscxx.spec.in, resolve-debbuilddeps.sh,
resolve-rpmbuilddeps.sh:
fixed build for ubuntu, fedora, opensuse
2017-06-09 14:56
* [r400] COPYING, INSTALL, ax_init_standard_project.m4,
configure.ac:
about to rpm-ify it
2017-06-09 11:50
* [r399] COPYING, INSTALL, ax_check_qt.m4,
ax_init_standard_project.m4, bootstrap.sh, build-in-docker.conf,
build-in-docker.sh, configure.ac, debian/control.in,
debian/libpcscxx-dev.install, examples/makefile.am,
libpcscxx.spec.in, resolve-debbuilddeps.sh,
resolve-rpmbuilddeps.sh, rpmsign.exp[ADD]:
build fixed for deb and rpm
2017-05-03 08:31
* [r398] configure.ac:
fix build with download enabled
2017-04-11 10:25
* [r397] COPYING, ChangeLog, INSTALL, ax_check_qt.m4, configure.ac,
src/suisseid.hxx:
build fixed for windows
2017-04-07 14:15 2017-04-07 14:15
* [r396] COPYING, ChangeLog, INSTALL, configure.ac, * [r396] COPYING, ChangeLog, INSTALL, configure.ac,

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

@ -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

@ -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"

@ -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

@ -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[@]})"

Loading…
Cancel
Save