development
/
bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix severe bug in build dependencies that slowes down build time - all projects should be updated; fix more bugs in rependency resolving

Browse Source
master
Marc Wäckerlin 6 years ago
parent 3a84d00def
commit bc5c604841
9 changed files with 219 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      ax_check_qt.m4
  2. 77
      ax_init_standard_project.m4
  3. 24
      bootstrap.sh
  4. 94
      build-in-docker.sh
  5. 27
      mac-create-app-bundle.sh
  6. 6
      resolve-rpmbuilddeps.sh
  7. 31
      scripts/ax_init_standard_project.m4
  8. 61
      scripts/build-in-docker.sh
  9. 6
      scripts/resolve-rpmbuilddeps.sh

26
ax_check_qt.m4
Unescape View File

@ -130,14 +130,6 @@ AC_DEFUN([AX_CHECK_QT], [
QT_PLUGIN_PATH="${QTDIR}/plugins" QT_PLUGIN_PATH="${QTDIR}/plugins"
elif test -d "${QTDIR}/share/qt5/plugins; then elif test -d "${QTDIR}/share/qt5/plugins; then
QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins" QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
else
AC_MSG_ERROR([QT_PLUGIN_PATH not found
- not in: ${qt_libdir}/plugins
- not in: ${qt_libdir}/qt5/plugins
- not in: ${qt_host_bins}/../plugins
- not in: ${QTDIR}/plugins
- not in: ${QTDIR}/share/qt5/plugins
])
fi fi
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
[$1]_CPPFLAGS="${[$1]5_CFLAGS}" [$1]_CPPFLAGS="${[$1]5_CFLAGS}"
@ -181,10 +173,17 @@ AC_DEFUN([AX_CHECK_QT], [
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore) QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore)
if test -d "${qt_host_bins}"; then qt_libdir=$(${PKG_CONFIG} --variable=libdir QtCore)
QT_PLUGIN_PATH=${qt_host_bins}/../plugins if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
else QT_PLUGIN_PATH="${qt_libdir}/plugins"
QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
elif test -d "${QTDIR}/plugins; then
QT_PLUGIN_PATH="${QTDIR}/plugins"
elif test -d "${QTDIR}/share/qt5/plugins; then
QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
fi fi
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
[$1]_CPPFLAGS="${[$1]_CFLAGS}" [$1]_CPPFLAGS="${[$1]_CFLAGS}"
@ -229,9 +228,6 @@ AC_DEFUN([AX_CHECK_QT], [
AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
fi fi
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then
QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr}
fi
AC_ARG_WITH([qt-plugin-path], AC_ARG_WITH([qt-plugin-path],
[AS_HELP_STRING([--with-qt-plugin-path=PATH], [AS_HELP_STRING([--with-qt-plugin-path=PATH],
[define a different qt plugin path, current @<:@default=check@:>@])], [define a different qt plugin path, current @<:@default=check@:>@])],

77
ax_init_standard_project.m4
Unescape View File

@ -218,8 +218,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
AX_SUBST(AUTHOR_URL) AX_SUBST(AUTHOR_URL)
AX_SUBST(AUTHOR_MAIL) AX_SUBST(AUTHOR_MAIL)
AX_SUBST(PACKAGER) AX_SUBST(PACKAGER)
PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}" PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}" 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(PROJECT_URL)
AX_SUBST(SOURCE_DOWNLOAD) AX_SUBST(SOURCE_DOWNLOAD)
VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_') VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
@ -248,22 +257,18 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop" PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop"
fi fi
AX_SUBST(PACKAGE_DESKTOP) AX_SUBST(PACKAGE_DESKTOP)
if test -z "$PACKAGE_LOGO" -a -f "${PACKAGE_NAME}-logo.png"; then if test -f "${PACKAGE_NAME}-logo.png"; then
PACKAGE_LOGO="${PACKAGE_NAME}-logo.png" PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
fi fi
AX_SUBST(PACKAGE_LOGO) AX_SUBST(PACKAGE_LOGO)
if test -z "$PACKAGE_ICON"; then if test -f "${PACKAGE_NAME}-icon.svg"; then
if test -f "${PACKAGE_NAME}-icon.svg"; then PACKAGE_ICON="${PACKAGE_NAME}-icon.svg"
PACKAGE_ICON="${PACKAGE_NAME}-icon.svg" elif test -f "${PACKAGE_NAME}-icon.png"; then
elif test -f "${PACKAGE_NAME}-icon.png"; then PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
PACKAGE_ICON="${PACKAGE_NAME}-icon.png" elif test -f "${PACKAGE_NAME}.svg"; then
elif test -f "${PACKAGE_NAME}.svg"; then PACKAGE_ICON="${PACKAGE_NAME}.svg"
PACKAGE_ICON="${PACKAGE_NAME}.svg" elif test -f "${PACKAGE_NAME}.png"; then
elif test -f "${PACKAGE_NAME}.png"; then PACKAGE_ICON="${PACKAGE_NAME}.png"
PACKAGE_ICON="${PACKAGE_NAME}.png"
elif test -f "icon.png"; then
PACKAGE_ICON="icon.png"
fi
fi fi
AX_SUBST(PACKAGE_ICON) AX_SUBST(PACKAGE_ICON)
@ -324,9 +329,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in])
test -f makefile.in && cat >> makefile.in <<EOF test -f makefile.in && cat >> makefile.in <<EOF
#### Begin: Appended by $0 #### Begin: Appended by $0
#EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \ 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 \ ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \
# build-resource-file.sh mac-create-app-bundle.sh build-resource-file.sh mac-create-app-bundle.sh
clean-standard-project-targets: clean-standard-project-targets:
-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION} -rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
@ -369,12 +374,13 @@ AC_DEFUN([AX_USE_CXX], [
#### Begin: Appended by $0 #### Begin: Appended by $0
%.app: % %.app: %
-rm -r [\$][@] -rm -r [\$][@]
\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install \$(MAKE) DESTDIR=[\$][\$](pwd)/tmp install
QTDIR="\${QTDIR}" \ QTDIR="\${QTDIR}" \
QT_PLUGINS="\${QT_PLUGINS}" \ QT_PLUGINS="\${QT_PLUGINS}" \
QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \ QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \
\${top_builddir}/mac-create-app-bundle.sh \ \${top_builddir}/mac-create-app-bundle.sh \
[\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix} [\$][@] [\$][<] [\$][\$](pwd)/tmp[\$]{prefix}
-rm -rf tmp
maintainer-clean-cxx-targets: maintainer-clean-cxx-targets:
-rm makefile.in -rm makefile.in
@ -861,7 +867,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
DEV_DIST_PKG= DEV_DIST_PKG=
pkg=m4_default([$2], [$1]) pkg=m4_default([$2], [$1])
$6 $6
dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev} deb_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel} rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
if test -n "$4"; then if test -n "$4"; then
for f in $pkg $4; do for f in $pkg $4; do
@ -1086,24 +1092,21 @@ AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_DEB_BUILD_DEPEND], [ AC_DEFUN([AX_DEB_BUILD_DEPEND], [
pkg="$1" DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, $1"
DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
]) ])
# require package in debian/control.in append @DEB_DEPEND@ to Depends # require package in debian/control.in append @DEB_DEPEND@ to Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_DEB_DEPEND], [ AC_DEFUN([AX_DEB_DEPEND], [
pkg="$1" DEB_DEPEND="${DEB_DEPEND}, $1"
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
]) ])
# require package in debian/control.in append @DEB_DEPEND@ to Depends # require package in debian/control.in append @DEB_DEPEND@ to Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_DEB_SECTION], [ AC_DEFUN([AX_DEB_SECTION], [
pkg="$1" DEB_SECTION="$1"
DEB_SECTION="${pkg}"
]) ])
# call after setting debian dependencies # call after setting debian dependencies
@ -1135,19 +1138,17 @@ AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_RPM_BUILD_DEPEND], [ AC_DEFUN([AX_RPM_BUILD_DEPEND], [
pkg="$1" RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, $1"
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
]) ])
# require package in .spec.in append @RPM_DEPEND@ to Depends # require package in .spec.in append @RPM_DEPEND@ to Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_RPM_DEPEND], [ AC_DEFUN([AX_RPM_DEPEND], [
pkg="$1"
if test -z "${RPM_DEPEND}"; then if test -z "${RPM_DEPEND}"; then
RPM_DEPEND="${pkg}" RPM_DEPEND="$1"
else else
RPM_DEPEND="${RPM_DEPEND}, ${pkg}" RPM_DEPEND="${RPM_DEPEND}, $1"
fi fi
]) ])
@ -1155,8 +1156,7 @@ AC_DEFUN([AX_RPM_DEPEND], [
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_RPM_GROUP], [ AC_DEFUN([AX_RPM_GROUP], [
pkg="$1" RPM_GROUP="$1"
RPM_GROUP="${pkg}"
]) ])
# call after setting rpmian dependencies # call after setting rpmian dependencies
@ -1197,6 +1197,15 @@ AC_DEFUN([AX_ALL_BUILD_DEPEND], [
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}" RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
]) ])
# require package in .spec.in and control.in, append to runtime depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_ALL_DEPEND], [
pkg="$1"
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
])
# require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name

24
bootstrap.sh
Unescape View File

@ -1352,7 +1352,7 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
LDADD = -l${PACKAGE_NAME#lib} LDADD = -l${PACKAGE_NAME#lib}
exampledir = ${docdir}/examples exampledir = \${docdir}/examples
example_DATA = example_DATA =
MAINTAINERCLEANFILES = makefile.in MAINTAINERCLEANFILES = makefile.in
@ -1605,8 +1605,8 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
-- @PACKAGER@ @BUILD_DATE@ -- @PACKAGER@ @BUILD_DATE@
EOF EOF
RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)" RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; 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)" 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 to debian/control.in <<EOF
Source: @PACKAGE_NAME@ Source: @PACKAGE_NAME@
Priority: extra Priority: extra
@ -1646,6 +1646,9 @@ usr/lib/lib*.so
usr/lib/pkgconfig/* usr/lib/pkgconfig/*
usr/lib/*.la usr/lib/*.la
usr/share/doc/${PACKAGE_NAME}/html usr/share/doc/${PACKAGE_NAME}/html
$(if testtag AX_BUILD_EXAMPLES; then
echo usr/share/doc/${PACKAGE_NAME}/examples
fi)
EOF EOF
to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF
${HEADER}%: ${HEADER}%:
@ -1773,7 +1776,7 @@ $(if testtag AX_USE_ETC; then
cat <<EOF2 cat <<EOF2
%config %config
/etc/* /etc
EOF2 EOF2
fi) fi)
@ -1871,17 +1874,18 @@ desktop_DATA = @PACKAGE_DESKTOP@
dist_pkgdata_DATA = @PACKAGE_ICON@ dist_pkgdata_DATA = @PACKAGE_ICON@
dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \\ dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \\
resolve-rpmbuilddeps.sh autogen.sh \\ resolve-rpmbuilddeps.sh autogen.sh \\
ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh \\ ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh \\
build-resource-file.sh \\ build-resource-file.sh \\
ax_init_standard_project.m4 \\ ax_init_standard_project.m4 \\
mac-create-app-bundle.sh resolve-debbuilddeps.sh \\ mac-create-app-bundle.sh resolve-debbuilddeps.sh \\
dependency-graph.sh template.sh \\ dependency-graph.sh template.sh \\
sql-to-dot.sed sql-to-dot.sed
dist_doc_DATA = AUTHORS NEWS $README COPYING INSTALL ChangeLog dist_doc_DATA = AUTHORS NEWS $README COPYING INSTALL ChangeLog
$(if test -e README.md -a ! -e README; then $(if test -e README.md -a ! -e README; then
cat <<EOF2 cat <<EOF2
README: README.md README: README.md
cp README.md README
CLEANFILES = README CLEANFILES = README
EOF2 EOF2

94
build-in-docker.sh
Unescape View File

@ -6,7 +6,7 @@ myarch=$(dpkg --print-architecture)
if test "${arch}" = "amd64"; then if test "${arch}" = "amd64"; then
myarch="amd64|i386" myarch="amd64|i386"
fi fi
mode="deb" mode=
img="mwaeckerlin/ubuntu:latest" img="mwaeckerlin/ubuntu:latest"
repos=() repos=()
keys=() keys=()
@ -200,11 +200,25 @@ function ifthenelse() {
arg="$1" arg="$1"
shift shift
cmd="$*" cmd="$*"
DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,' | tr [:upper:] [:lower:]) DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,;s,.*,\L&,g')
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs) CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs)
ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64) ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64)
case "$DISTRIBUTOR" in
(opensuse) # code name may be not available, then set leap or tumbleweed
if test "$CODENAME" = "n/a"; then
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -ds | sed "s,\($(docker exec ${DOCKER_ID} lsb_release -si | sed 's, ,\\|,g')\) *,,"';s, .*,,g;s,",,g;s,.*,\L&,g')
fi
;;
(fedora|mageia) # numeric code name
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs)
;;
(centos) # only look at major number in centos
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs | sed 's,\..*,,')
;;
esac
if test "${arg/:::/}" = "${arg}"; then if test "${arg/:::/}" = "${arg}"; then
docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}" cmd_tmp="${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
else else
os="${arg%%:::*}" os="${arg%%:::*}"
thenpart="${arg#*:::}" thenpart="${arg#*:::}"
@ -215,11 +229,13 @@ function ifthenelse() {
fi fi
if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then
if test -n "${thenpart}"; then if test -n "${thenpart}"; then
docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" cmd_tmp="${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
fi fi
else else
if test -n "${elsepart}"; then if test -n "${elsepart}"; then
docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" cmd_tmp="${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
fi fi
fi fi
fi fi
@ -241,38 +257,52 @@ 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) docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
fi fi
docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}" 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) (deb|apt|win)
if [[ "${img}" =~ "ubuntu" ]]; then
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' 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' 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-get update ${OPTIONS}
docker exec ${DOCKER_ID} apt-mark hold ${PREVENT} docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} 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// /- }- 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// /- }- 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; 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 if [[ "${img}" =~ "ubuntu" ]]; then
wget -O- "$key" \ docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- locales
| docker exec -i ${DOCKER_ID} apt-key add - docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
fi
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 done
if test -n "${keys[@]}"; then # fix dependency bug in cosmic and stretch
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- gnupg
for key in "${keys[@]}"; do
wget -O- "$key" \
| docker exec -i ${DOCKER_ID} apt-key add -
done
fi
for repo in "${repos[@]}"; do for repo in "${repos[@]}"; do
ifthenelse "${repo}" "apt-add-repository 'ARG'" ifthenelse "${repo}" "apt-add-repository 'ARG'"
done done
docker exec ${DOCKER_ID} apt-get update ${OPTIONS} docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
for package in "${packages[@]}"; do for package in "${packages[@]}"; do
ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT} ARG" ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT// /- }- ARG"
done done
for command in "${commands[@]}"; do for command in "${commands[@]}"; do
ifthenelse "${command}" "ARG" ifthenelse "${command}" "ARG"
@ -281,7 +311,7 @@ case $mode in
;; ;;
(rpm|yum|dnf|zypper|urpmi) (rpm|yum|dnf|zypper|urpmi)
if [[ "$img" =~ "centos" ]]; then 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 docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
[WandiscoSVN] [WandiscoSVN]
name=Wandisco SVN Repo name=Wandisco SVN Repo
@ -293,7 +323,7 @@ gpgcheck=0
EOF EOF
fi fi
INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto)) INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
if test "$INSTALL_TOOL" = "urpmi --auto"; then if test "$INSTALL_TOOL" = "urpmi --auto" -o "$INSTALL_TOOL" = "zypper install -y"; then
LSB_RELEASE=lsb-release LSB_RELEASE=lsb-release
else else
LSB_RELEASE=/usr/bin/lsb_release LSB_RELEASE=/usr/bin/lsb_release
@ -309,8 +339,8 @@ EOF
docker exec -i ${DOCKER_ID} rm rpm-key docker exec -i ${DOCKER_ID} rm rpm-key
done done
for repo in "${repos[@]}"; do for repo in "${repos[@]}"; do
INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false)) INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum-config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'" ifthenelse "${repo}" "${INSTALL_REPO} ARG"
((++i)) ((++i))
done done
for package in "${packages[@]}"; do for package in "${packages[@]}"; do
@ -328,3 +358,17 @@ for f in "${flags[@]}"; do
done done
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}" docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
# last check: try to install built deb or rpm files (if not already cleaned up)
# not supported in trusty and jessie
if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT// /- }- /workdir/*.deb"
fi
fi
if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
if ls *.rpm > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm"
fi
fi
echo "done."

27
mac-create-app-bundle.sh
Unescape View File

@ -17,14 +17,12 @@ if test "$(uname -s)" != "Darwin"; then
exit 1 exit 1
fi fi
cd ${0%/*}
project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)} project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)}
apptarget=${1:-${project}.app} apptarget=${1:-${project}.app}
sources=${3:-$(pwd)/usr} sources=${3:-$(pwd)/tmp}
! test -e "$apptarget" || rm -rf "$apptarget"
test -n "$project" test -n "$project"
test -d "$sources" test -d "$sources"
! test -e "$apptarget" || rm -rf "$apptarget"
target="$(pwd)/${apptarget}/Contents/MacOS" target="$(pwd)/${apptarget}/Contents/MacOS"
echo "Creating $apptarget for $project from $sources" echo "Creating $apptarget for $project from $sources"
@ -32,7 +30,9 @@ echo "Creating $apptarget for $project from $sources"
# Step 1: create and fill app directory structure # Step 1: create and fill app directory structure
mkdir -p ${apptarget}/Contents/{Resources,MacOS} mkdir -p ${apptarget}/Contents/{Resources,MacOS}
! test -d ${sources}/bin || \ ! test -d ${sources}/bin || \
find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
! test -d ${sources}/scripts || \
find ${sources}/scripts -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
executablefile=${apptarget}/Contents/MacOS/${project} executablefile=${apptarget}/Contents/MacOS/${project}
test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1) test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1)
! test -d ${sources}/lib || \ ! test -d ${sources}/lib || \
@ -40,9 +40,9 @@ test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ |
! test -d ${sources}/share/${project} || \ ! test -d ${sources}/share/${project} || \
find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
! test -d ${sources}/share || \ ! test -d ${sources}/share || \
find ${sources}/share -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; find ${sources}/share -mindepth 1 -maxdepth 1 -name ${project} -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \;
! test -d ${sources} || \ ! test -d ${sources} || \
find ${sources} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; find ${sources} -mindepth 1 -maxdepth 1 -name share -o -name bin -o -name lib -o -name scripts -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \;
# Step 2: copy qt plugins, if necessary # Step 2: copy qt plugins, if necessary
for f in ${QT_PLUGINS}; do for f in ${QT_PLUGINS}; do
@ -59,7 +59,7 @@ while [ $found -ne 0 ]; do
cd "${target}" cd "${target}"
for file in $(find . -type f); do for file in $(find . -type f); do
for lib in $(otool -L ${file} | tail -n +2 \ for lib in $(otool -L ${file} | tail -n +2 \
| egrep '/opt/local/|'"${HOME}" \ | egrep '/usr/local/|/opt/local/|'"${HOME}" \
| grep -v $file | awk '{print $1}'); do | grep -v $file | awk '{print $1}'); do
found=1 found=1
test -f ${lib##*/} \ test -f ${lib##*/} \
@ -86,20 +86,19 @@ if test -n "${QTDIR}"; then
fi fi
fi fi
# Step 5: copy or create info.plist # Step 5: copy local or create new info.plist
infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist) if test -f Info.plist; then
if test -f "${infoplist}"; then cp -a Info.plist ${apptarget}/Contents/Info.plist
cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
else else
cat > ${apptarget}/Contents/Info.plist <<EOF cat > ${apptarget}/Contents/Info.plist <<EOF
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <qdict>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>${project}</string> <string>${project}</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${executablefile##/}</string> <string>${executablefile##*/}</string>
</dict> </dict>
</plist> </plist>
EOF EOF

6
resolve-rpmbuilddeps.sh
Unescape View File

@ -97,12 +97,12 @@ fi
if test -n "${SCHROOTNAME}"; then if test -n "${SCHROOTNAME}"; then
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
if test -n "${FILES}${DEPS}"; then if test -n "${FILES// /}${DEPS// /}"; then
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS} schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS}
fi fi
else else
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
if test -n "${FILES}${DEPS}"; then if test -n "${FILES// /}${DEPS// /}"; then
${INSTALL_TOOL} ${FILES} ${DEPS} ${INSTALL_TOOL} ${FILES} ${DEPS}
fi fi
fi fi
@ -112,7 +112,7 @@ if test -n "${SCHROOTNAME}"; then
else else
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
fi fi
if test -n "${FILES}"; then if test -n "${FILES// /}"; then
echo "**** ERROR: Cannot install: " $FILES echo "**** ERROR: Cannot install: " $FILES
exit 1 exit 1
fi fi

31
scripts/ax_init_standard_project.m4
Unescape View File

@ -867,7 +867,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
DEV_DIST_PKG= DEV_DIST_PKG=
pkg=m4_default([$2], [$1]) pkg=m4_default([$2], [$1])
$6 $6
dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev} deb_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel} rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
if test -n "$4"; then if test -n "$4"; then
for f in $pkg $4; do for f in $pkg $4; do
@ -1092,24 +1092,21 @@ AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_DEB_BUILD_DEPEND], [ AC_DEFUN([AX_DEB_BUILD_DEPEND], [
pkg="$1" DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, $1"
DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
]) ])
# require package in debian/control.in append @DEB_DEPEND@ to Depends # require package in debian/control.in append @DEB_DEPEND@ to Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_DEB_DEPEND], [ AC_DEFUN([AX_DEB_DEPEND], [
pkg="$1" DEB_DEPEND="${DEB_DEPEND}, $1"
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
]) ])
# require package in debian/control.in append @DEB_DEPEND@ to Depends # require package in debian/control.in append @DEB_DEPEND@ to Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_DEB_SECTION], [ AC_DEFUN([AX_DEB_SECTION], [
pkg="$1" DEB_SECTION="$1"
DEB_SECTION="${pkg}"
]) ])
# call after setting debian dependencies # call after setting debian dependencies
@ -1141,19 +1138,17 @@ AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_RPM_BUILD_DEPEND], [ AC_DEFUN([AX_RPM_BUILD_DEPEND], [
pkg="$1" RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, $1"
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
]) ])
# require package in .spec.in append @RPM_DEPEND@ to Depends # require package in .spec.in append @RPM_DEPEND@ to Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_RPM_DEPEND], [ AC_DEFUN([AX_RPM_DEPEND], [
pkg="$1"
if test -z "${RPM_DEPEND}"; then if test -z "${RPM_DEPEND}"; then
RPM_DEPEND="${pkg}" RPM_DEPEND="$1"
else else
RPM_DEPEND="${RPM_DEPEND}, ${pkg}" RPM_DEPEND="${RPM_DEPEND}, $1"
fi fi
]) ])
@ -1161,8 +1156,7 @@ AC_DEFUN([AX_RPM_DEPEND], [
# - parameter: # - parameter:
# $1 = package name # $1 = package name
AC_DEFUN([AX_RPM_GROUP], [ AC_DEFUN([AX_RPM_GROUP], [
pkg="$1" RPM_GROUP="$1"
RPM_GROUP="${pkg}"
]) ])
# call after setting rpmian dependencies # call after setting rpmian dependencies
@ -1203,6 +1197,15 @@ AC_DEFUN([AX_ALL_BUILD_DEPEND], [
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}" RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
]) ])
# require package in .spec.in and control.in, append to runtime depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_ALL_DEPEND], [
pkg="$1"
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
])
# require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
# - parameter: # - parameter:
# $1 = package name # $1 = package name

61
scripts/build-in-docker.sh
Unescape View File

@ -200,11 +200,25 @@ function ifthenelse() {
arg="$1" arg="$1"
shift shift
cmd="$*" cmd="$*"
DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,' | tr [:upper:] [:lower:]) DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,;s,.*,\L&,g')
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs) CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs)
ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64) ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64)
case "$DISTRIBUTOR" in
(opensuse) # code name may be not available, then set leap or tumbleweed
if test "$CODENAME" = "n/a"; then
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -ds | sed "s,\($(docker exec ${DOCKER_ID} lsb_release -si | sed 's, ,\\|,g')\) *,,"';s, .*,,g;s,",,g;s,.*,\L&,g')
fi
;;
(fedora|mageia) # numeric code name
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs)
;;
(centos) # only look at major number in centos
CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs | sed 's,\..*,,')
;;
esac
if test "${arg/:::/}" = "${arg}"; then if test "${arg/:::/}" = "${arg}"; then
docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}" cmd_tmp="${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
else else
os="${arg%%:::*}" os="${arg%%:::*}"
thenpart="${arg#*:::}" thenpart="${arg#*:::}"
@ -215,11 +229,13 @@ function ifthenelse() {
fi fi
if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then
if test -n "${thenpart}"; then if test -n "${thenpart}"; then
docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" cmd_tmp="${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
fi fi
else else
if test -n "${elsepart}"; then if test -n "${elsepart}"; then
docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" cmd_tmp="${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
fi fi
fi fi
fi fi
@ -264,7 +280,7 @@ case "$mode" in
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// /- }- 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; docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
if [[ "${img}" =~ "ubuntu" ]]; then if [[ "${img}" =~ "ubuntu" ]]; then
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales gnupg docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- locales
docker exec ${DOCKER_ID} locale-gen ${LANG} docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG} docker exec ${DOCKER_ID} update-locale LANG=${LANG}
fi fi
@ -273,19 +289,20 @@ case "$mode" in
docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /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" docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
done done
for key in "${keys[@]}"; do if test -n "${keys[@]}"; then # fix dependency bug in cosmic and stretch
wget -O- "$key" \ docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- gnupg
| docker exec -i ${DOCKER_ID} apt-key add - for key in "${keys[@]}"; do
done wget -O- "$key" \
| docker exec -i ${DOCKER_ID} apt-key add -
done
fi
for repo in "${repos[@]}"; do for repo in "${repos[@]}"; do
ifthenelse "${repo}" "apt-add-repository 'ARG'" ifthenelse "${repo}" "apt-add-repository 'ARG'"
done done
docker exec ${DOCKER_ID} apt-get update ${OPTIONS} docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
for package in "${packages[@]}"; do for package in "${packages[@]}"; do
ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT} ARG" ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT// /- }- ARG"
done done
for command in "${commands[@]}"; do for command in "${commands[@]}"; do
ifthenelse "${command}" "ARG" ifthenelse "${command}" "ARG"
@ -306,7 +323,7 @@ gpgcheck=0
EOF EOF
fi fi
INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto)) INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
if test "$INSTALL_TOOL" = "urpmi --auto"; then if test "$INSTALL_TOOL" = "urpmi --auto" -o "$INSTALL_TOOL" = "zypper install -y"; then
LSB_RELEASE=lsb-release LSB_RELEASE=lsb-release
else else
LSB_RELEASE=/usr/bin/lsb_release LSB_RELEASE=/usr/bin/lsb_release
@ -322,8 +339,8 @@ EOF
docker exec -i ${DOCKER_ID} rm rpm-key docker exec -i ${DOCKER_ID} rm rpm-key
done done
for repo in "${repos[@]}"; do for repo in "${repos[@]}"; do
INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false)) INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum-config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'" ifthenelse "${repo}" "${INSTALL_REPO} ARG"
((++i)) ((++i))
done done
for package in "${packages[@]}"; do for package in "${packages[@]}"; do
@ -341,3 +358,17 @@ for f in "${flags[@]}"; do
done done
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}" docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
# last check: try to install built deb or rpm files (if not already cleaned up)
# not supported in trusty and jessie
if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT// /- }- /workdir/*.deb"
fi
fi
if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
if ls *.rpm > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm"
fi
fi
echo "done."

6
scripts/resolve-rpmbuilddeps.sh
Unescape View File

@ -97,12 +97,12 @@ fi
if test -n "${SCHROOTNAME}"; then if test -n "${SCHROOTNAME}"; then
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
if test -n "${FILES}${DEPS}"; then if test -n "${FILES// /}${DEPS// /}"; then
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS} schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS}
fi fi
else else
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
if test -n "${FILES}${DEPS}"; then if test -n "${FILES// /}${DEPS// /}"; then
${INSTALL_TOOL} ${FILES} ${DEPS} ${INSTALL_TOOL} ${FILES} ${DEPS}
fi fi
fi fi
@ -112,7 +112,7 @@ if test -n "${SCHROOTNAME}"; then
else else
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
fi fi
if test -n "${FILES}"; then if test -n "${FILES// /}"; then
echo "**** ERROR: Cannot install: " $FILES echo "**** ERROR: Cannot install: " $FILES
exit 1 exit 1
fi fi

Write Preview
Loading…
Cancel
Save