From 2a49be4a99cdfe95b32c74490414f26f985f38f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 10 Sep 2018 07:28:10 +0000 Subject: [PATCH] fixed dependency to gpg --- ax_init_standard_project.m4 | 13 +++++++++++-- bootstrap.sh | 11 +++++++---- build-in-docker.sh | 35 ++++++++++++++++++++++++----------- debian/control.in | 2 +- mac-create-app-bundle.sh | 11 +++++------ 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 280dd4c..0b1766c 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -218,8 +218,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(AUTHOR_URL) AX_SUBST(AUTHOR_MAIL) AX_SUBST(PACKAGER) - #PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}" - SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}" + PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}" + for path in . .. ../.. ../../..; do + if test -d ${path}/.svn; then + PROJECT_URL="$(LANG= svn info | sed -n 's,^Repository Root: ,,p')" + break + elif test -d ${path}/.git; then + PROJECT_URL="$(git remote get-url origin)" + break + fi + done + SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${PROJECT_URL}}" AX_SUBST(PROJECT_URL) AX_SUBST(SOURCE_DOWNLOAD) VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_') diff --git a/bootstrap.sh b/bootstrap.sh index 7633c53..4ab5d27 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1352,7 +1352,7 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs LDADD = -l${PACKAGE_NAME#lib} -exampledir = ${docdir}/examples +exampledir = \${docdir}/examples example_DATA = MAINTAINERCLEANFILES = makefile.in @@ -1605,13 +1605,13 @@ if testtag AX_USE_DEBIAN_PACKAGING; then -- @PACKAGER@ @BUILD_DATE@ EOF - RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)" - BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)" + RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; fi)" + BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, libltdl-dev, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev | qt4-dev,"; fi)" to debian/control.in < /dev/null 2>&1; then docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un) fi docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}" -case $mode in +if test -z "$mode"; then + case "$targets" in + (*deb*) mode=deb;; + (*rpm*) mode=rpm;; + (*) case "$img" in + (*ubuntu*|*debian*|*mint*) mode=deb;; + (*fedora*|*centos*|*mageia*) mode=rpm;; + (*mingw*|*win*) mode=win;; + (*) mode=deb;; + esac;; + esac +fi +case "$mode" in (deb|apt|win) + OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' + PREVENT='libpam-systemd policykit.* colord dconf-service' + docker exec ${DOCKER_ID} apt-get update ${OPTIONS} + docker exec ${DOCKER_ID} apt-mark hold ${PREVENT} + docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget; if [[ "${img}" =~ "ubuntu" ]]; then + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales docker exec ${DOCKER_ID} locale-gen ${LANG} docker exec ${DOCKER_ID} update-locale LANG=${LANG} fi - OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' - PREVENT='libpam-systemd policykit.* colord dconf-service' for f in ${PREVENT}; do docker exec ${DOCKER_ID} bash -c "echo 'Package: ${f}' >> /etc/apt/preferences" docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" done - docker exec ${DOCKER_ID} apt-get update ${OPTIONS} - docker exec ${DOCKER_ID} apt-mark hold ${PREVENT} - docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} - docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ - docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ - docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget; for key in "${keys[@]}"; do wget -O- "$key" \ | docker exec -i ${DOCKER_ID} apt-key add - @@ -281,7 +294,7 @@ case $mode in ;; (rpm|yum|dnf|zypper|urpmi) if [[ "$img" =~ "centos" ]]; then - docker exec ${DOCKER_ID} yum install -y redhat-lsb + docker exec ${DOCKER_ID} yum install -y redhat-lsb epel-release docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' < ${apptarget}/Contents/Info.plist < - + CFBundleIdentifier ${project} CFBundleExecutable - ${executablefile##/} + ${executablefile##*/} EOF