improve logo-detection; improve docker buil target detection; fixed dependency-bug in ubuntu cosmic

6 years ago · 3a84d00def
parent ac8997f6d7
commit 3a84d00def
5 changed files with 53 additions and 37 deletions
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@ -248,18 +248,22 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
     PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop"
  fi
  AX_SUBST(PACKAGE_DESKTOP)
-  if test -f "${PACKAGE_NAME}-logo.png"; then
+  if test -z "$PACKAGE_LOGO" -a -f "${PACKAGE_NAME}-logo.png"; then
     PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
  fi
  AX_SUBST(PACKAGE_LOGO)
-  if test -f "${PACKAGE_NAME}-icon.svg"; then
-     PACKAGE_ICON="${PACKAGE_NAME}-icon.svg"
-  elif test -f "${PACKAGE_NAME}-icon.png"; then
-     PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
-  elif test -f "${PACKAGE_NAME}.svg"; then
-     PACKAGE_ICON="${PACKAGE_NAME}.svg"
-  elif test -f "${PACKAGE_NAME}.png"; then
-     PACKAGE_ICON="${PACKAGE_NAME}.png"
+  if test -z "$PACKAGE_ICON"; then
+     if test -f "${PACKAGE_NAME}-icon.svg"; then
+        PACKAGE_ICON="${PACKAGE_NAME}-icon.svg"
+     elif test -f "${PACKAGE_NAME}-icon.png"; then
+          PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
+     elif test -f "${PACKAGE_NAME}.svg"; then
+          PACKAGE_ICON="${PACKAGE_NAME}.svg"
+     elif test -f "${PACKAGE_NAME}.png"; then
+          PACKAGE_ICON="${PACKAGE_NAME}.png"
+     elif test -f "icon.png"; then
+          PACKAGE_ICON="icon.png"
+     fi
  fi
  AX_SUBST(PACKAGE_ICON)

@ -320,9 +324,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in])
  test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
-EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \
-              ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \
-              build-resource-file.sh mac-create-app-bundle.sh
+#EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \
+#              ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \
+#              build-resource-file.sh mac-create-app-bundle.sh

 clean-standard-project-targets:
 	-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -1606,7 +1606,7 @@ 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)"
+    BUILD_DEPENDS="gnupg, 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)"
    to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@ -1871,12 +1871,12 @@ desktop_DATA = @PACKAGE_DESKTOP@
 dist_pkgdata_DATA = @PACKAGE_ICON@
 dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\\
                   resolve-rpmbuilddeps.sh autogen.sh			\\
-                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
-                    build-resource-file.sh				\\
-                    ax_init_standard_project.m4				\\
-                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \\
-                    dependency-graph.sh template.sh                     \\
-                    sql-to-dot.sed
+                   ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
+                   build-resource-file.sh				\\
+                   ax_init_standard_project.m4				\\
+                   mac-create-app-bundle.sh resolve-debbuilddeps.sh     \\
+                   dependency-graph.sh template.sh                      \\
+                   sql-to-dot.sed
 dist_doc_DATA = AUTHORS NEWS $README COPYING INSTALL ChangeLog
 $(if test -e README.md -a ! -e README; then
 cat <<EOF2
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@ -1606,7 +1606,7 @@ 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 | qt4-dev,"; fi)"
+    BUILD_DEPENDS="gnupg, 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 <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
--- a/scripts/build-in-docker.sh
+++ b/scripts/build-in-docker.sh
@ -6,7 +6,7 @@ myarch=$(dpkg --print-architecture)
 if test "${arch}" = "amd64"; then
    myarch="amd64|i386"
 fi
-mode="deb"
+mode=
 img="mwaeckerlin/ubuntu:latest"
 repos=()
 keys=()
@ -241,25 +241,38 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /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 gnupg
            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' <<EOF
 [WandiscoSVN]
 name=Wandisco SVN Repo
--- a/scripts/mac-create-app-bundle.sh
+++ b/scripts/mac-create-app-bundle.sh
@ -86,20 +86,19 @@ if test -n "${QTDIR}"; then
    fi
 fi

-# Step 5: copy or create info.plist
-infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist)
-if test -f "${infoplist}"; then
-    cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
+# Step 5: copy local or create new info.plist
+if test -f Info.plist; then
+    cp -a Info.plist ${apptarget}/Contents/Info.plist
 else
    cat > ${apptarget}/Contents/Info.plist <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
+  <qdict>
    <key>CFBundleIdentifier</key>
    <string>${project}</string>
    <key>CFBundleExecutable</key>
-    <string>${executablefile##/}</string>
+    <string>${executablefile##*/}</string>
  </dict>
 </plist>
 EOF