From b2460097e6be91936b15112e5a72e59507353634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Sat, 19 Sep 2015 08:42:48 +0000 Subject: [PATCH] basic android abb works, distcheck fails; refs #24 --- ax_check_qt.m4 | 30 ++--- ax_init_standard_project.m4 | 103 +++++++++++++++++- bootstrap.sh | 60 +++++++--- build-resource-file.sh | 31 ++++++ cordova/logo.png | Bin 0 -> 3339 bytes cordova/makefile.am | 6 +- .../android/res/drawable-hdpi/icon.png | Bin 6080 -> 0 bytes .../android/res/drawable-ldpi/icon.png | Bin 3096 -> 0 bytes .../android/res/drawable-mdpi/icon.png | Bin 4090 -> 0 bytes .../android/res/drawable-xhdpi/icon.png | Bin 7685 -> 0 bytes .../platforms/android/res/drawable/icon.png | Bin 7685 -> 3339 bytes resolve-debbuilddeps.sh | 44 ++++++++ resolve-rpmbuilddeps.sh | 34 ++++++ 13 files changed, 261 insertions(+), 47 deletions(-) create mode 100755 build-resource-file.sh create mode 100644 cordova/logo.png delete mode 100644 cordova/platforms/android/res/drawable-hdpi/icon.png delete mode 100644 cordova/platforms/android/res/drawable-ldpi/icon.png delete mode 100644 cordova/platforms/android/res/drawable-mdpi/icon.png delete mode 100644 cordova/platforms/android/res/drawable-xhdpi/icon.png create mode 100755 resolve-debbuilddeps.sh create mode 100755 resolve-rpmbuilddeps.sh diff --git a/ax_check_qt.m4 b/ax_check_qt.m4 index 91c0072..1a5dafb 100644 --- a/ax_check_qt.m4 +++ b/ax_check_qt.m4 @@ -38,6 +38,7 @@ AC_DEFUN([AX_CXX_QT_TOOL], [ + PKG_PROG_PKG_CONFIG if test -z "$HAVE_$1"; then HAVE_$1=1 AC_MSG_CHECKING([for $2]) @@ -61,7 +62,7 @@ AC_DEFUN([AX_CXX_QT_TOOL], [ fi fi AC_SUBST($1) - AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) + AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) if test $HAVE_$1 -eq 1; then AC_MSG_RESULT([$$1]) else @@ -79,24 +80,6 @@ AC_DEFUN([AX_CXX_QT_TOOLS], [ AX_CXX_QT_TOOL(LRELEASE, lrelease) ]) -AC_DEFUN([AX_CHECK_VALID_FLAG], [ - AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) - save_cppflags="$CPPFLAGS" - newflag="no" - for test_flag in $1; do - CPPFLAGS+=" ${test_flag}" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ - newflag="$test_flag" - CPPFLAGS="$save_cppflags" - CPPFLAGS+=" ${test_flag}" - break; - ]) - CPPFLAGS="$save_cppflags" - done - AC_SUBST(CPPFLAGS) - AC_MSG_RESULT([$newflag]) -]) - AC_DEFUN([AX_CHECK_QT], [ qt_modules="$2" qt_modules_optional="$3" @@ -148,8 +131,11 @@ AC_DEFUN([AX_CHECK_QT], [ fi ], [HAVE_$1=0]) ]) - AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) - AX_CHECK_VALID_FLAG([-fPIC -fPIE], [position independent code flag]) + AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) + AX_CHECK_VALID_CXX_FLAG([-fPIC -fPIE], [position independent code flag]) + if test "${MINGW}" != "no"; then + AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) + fi AC_SUBST(QTDIR) AC_SUBST(QT_PLUGIN_PATH) AC_SUBST(CPPFLAGS) @@ -176,7 +162,7 @@ qrc_%.cxx: %.qrc %.qm: %.ts ${LRELEASE} $< -qm [$][@] -#%.ts: ${LANGUAGE_FILES} +#%.ts: ${LANGUAGE_FILES:%=%} # ${LUPDATE} -no-obsolete \ # -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \ # -ts [$][@] $< diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 082640d..2ad3639 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -131,7 +131,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(DISTRO) BUILD_NUMBER=${BUILD_NUMBER:-1} AX_SUBST(BUILD_NUMBER) - BUILD_DATE=$(LANG= date +"%a, %d %B %Y %H:%M:%S %z") + BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z") AX_SUBST(BUILD_DATE) if test -f "${PROJECT_NAME}-logo.png"; then PROJECT_LOGO="${PROJECT_NAME}-logo.png" @@ -160,9 +160,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) + test -f makefile.in && sed -i '1iEXTRA_DIST = ' makefile.in test -f makefile.in && cat >> makefile.in < /dev/null); do if test -f "$f"; then $1_found=${tmp_package} $1_CFLAGS+=" -I${f%/*}" @@ -446,7 +447,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [ tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package) for x in ${tmp_includedir}; do AC_MSG_NOTICE([search for $3 in $x]) - for f in $(find ${x} -name "$3"); do + for f in $(find ${x} -name "$3" 2> /dev/null); do if test -f "$f"; then $1_found=${tmp_package} $1_CFLAGS+=" -I${f%/*}" @@ -501,7 +502,7 @@ AC_DEFUN([AX_PKG_CHECK], [ ], [ HAVE_$1=0 ]) - AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) + AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) AC_SUBST(HAVE_$1) AC_SUBST(CPPFLAGS) AC_SUBST(CXXFLAGS) @@ -532,3 +533,95 @@ AC_DEFUN([AX_REQUIRE_HEADER], [ ], []) ], []) ]) + +# Check within a list of CPP-Flags for the first that is usable and +# configure it +# - parameter: +# $1 = white-space separated list of alternative flags +# $2 = module name (optional, if different from id) +AC_DEFUN([AX_CHECK_VALID_CPP_FLAG], [ + AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) + save_cppflags="$CPPFLAGS" + newflag="no" + for test_flag in $1; do + CPPFLAGS+=" ${test_flag}" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + newflag="$test_flag" + CPPFLAGS="$save_cppflags" + CPPFLAGS+=" ${test_flag}" + break; + ]) + CPPFLAGS="$save_cppflags" + done + AC_SUBST(CPPFLAGS) + AC_MSG_RESULT([$newflag in $CPPFLAGS]) +]) + +# Check within a list of CXX-Flags for the first that is usable and +# configure it +# - parameter: +# $1 = white-space separated list of alternative flags +# $2 = module name (optional, if different from id) +AC_DEFUN([AX_CHECK_VALID_CXX_FLAG], [ + AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) + save_cxxflags="$CXXFLAGS" + newflag="no" + for test_flag in $1; do + CXXFLAGS+=" ${test_flag}" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + newflag="$test_flag" + CXXFLAGS="$save_cxxflags" + CXXFLAGS+=" ${test_flag}" + break; + ]) + CXXFLAGS="$save_cxxflags" + done + AC_SUBST(CXXFLAGS) + AC_MSG_RESULT([$newflag in $CXXFLAGS]) +]) + +# Check within a list of C-Flags for the first that is usable and +# configure it +# - parameter: +# $1 = white-space separated list of alternative flags +# $2 = module name (optional, if different from id) +AC_DEFUN([AX_CHECK_VALID_C_FLAG], [ + AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) + save_cflags="$CFLAGS" + newflag="no" + for test_flag in $1; do + CFLAGS+=" ${test_flag}" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + newflag="$test_flag" + CFLAGS="$save_cflags" + CFLAGS+=" ${test_flag}" + break; + ]) + CFLAGS="$save_cflags" + done + AC_SUBST(CFLAGS) + AC_MSG_RESULT([$newflag in $CFLAGS]) +]) + +# Check within a list of LD-Flags for the first that is usable and +# configure it +# - parameter: +# $1 = white-space separated list of alternative flags +# $2 = module name (optional, if different from id) +AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [ + AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])]) + save_ldflags="$LDFLAGS" + newflag="no" + for test_flag in $1; do + LDFLAGS+=" ${test_flag}" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + newflag="$test_flag" + LDFLAGS="$save_ldflags" + LDFLAGS+=" ${test_flag}" + break; + ]) + LDFLAGS="$save_ldflags" + done + AC_SUBST(LDFLAGS) + AC_MSG_RESULT([$newflag in $LDFLAGS]) +]) diff --git a/bootstrap.sh b/bootstrap.sh index 68ee66b..3154dba 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -19,13 +19,15 @@ PROJECT_PATH=$(pwd) DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/} configure=0 build=0 +buildtarget="distcheck" overwrite=0 rebuild=0 rebuildfiles=() while test $# -gt 0; do case "$1" in (--configure|-c) configure=1;; - (--build|-b) configure=1; build=1;; + (--build|-b) configure=1; build=1;; + (--target|-t) shift; configure=1; build=1; buildtarget="$1";; (--overwrite|-o) overwrite=1;; (--rebuild|-r) rebuild=1;; (--rebuild-file|-f) shift; rebuildfiles+=("$1");; @@ -40,7 +42,8 @@ SYNOPSIS OPTIONS --configure, -c call ./configure after initialization - --build, -b build, also call ./configure && make + --build, -b build, also call ./configure && make distcheck + --target, -t same as -b, but specify target instead of distcheck --overwrite, -o overwrite all basic files (bootstrap.sh, m4-macros) --rebuild, -r force rebuild of generated files, even if modified --rebuild-file, -f rebild specific file (can be added multiple times) @@ -100,6 +103,9 @@ GENERATED FILES * ax_init_standard_project.m4 - auxiliary macro definition file * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file * ax_check_qt.m4 - auxiliary macro definition file + * resolve-debbuilddeps.sh - script to install debian package dependencies + * resolve-rpmbuilddeps.sh - script to install RPM package dependencies + * build-resource-file.sh - build resource.qrc file from a resource directory * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle * AUTHORS - replace your name in AUTHORS before first run * NEWS - empty file add your project's news @@ -165,13 +171,13 @@ FILE DEPENDENCIES * html/makefile.am depends on AX_BUILD_HTML * doc/doxyfile.in depends on AX_BUILD_EXAMPLES * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT, - AX_CXX_QT, AX_CXX_CHECK_QT, AX_USE_LIBTOOL + AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}.install depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}-dev.dirs depends on AX_USE_LIBTOOL - * ${DEFAULT_PROJECT_NAME}.spec.in dependson AX_USE_RPM_PACKAGING, - AX_USE_LIBTOOL, AX_CXX_CHECK_QT, AX_CXX_QT, AX_USE_CPPUNIT + * ${DEFAULT_PROJECT_NAME}.spec.in depends on AX_USE_RPM_PACKAGING, + AX_USE_LIBTOOL, AX_CHECK_QT, AX_REQUIRE_QT, AX_CXX_QT, AX_USE_CPPUNIT FILES @@ -204,7 +210,7 @@ FILES * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4) * Require a QT module: AX_REQUIRE_QT (see ax_check_qt.m4) - * Optionally use a QT module: AX_CHECK_QT (see ax_check_qt.m4) + * Optionally use a QT module: AX_CHECK_QT (see ax_check_qt.m4) * Require a module: AX_PKG_REQUIRE (see ax_init_standard_project.m4) * Check for an optional module: AX_PKG_CHECK (see ax_init_standard_project.m4) @@ -276,7 +282,8 @@ run() { } testtag() { - egrep -q '^ *'"$1" configure.ac + local IFS="|" + egrep -q '^ *'"($*)" configure.ac } contains() { @@ -381,6 +388,9 @@ copy ${MY_NAME} copy ax_init_standard_project.m4 copy ax_cxx_compile_stdcxx_11.m4 copy ax_check_qt.m4 +copy resolve-debbuilddeps.sh +copy resolve-rpmbuilddeps.sh +copy build-resource-file.sh copy mac-create-app-bundle.sh AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1) if test -z "${AUTHOR}"; then @@ -420,6 +430,7 @@ AX_INIT_STANDARD_PROJECT # qt features, uncomment, what you need: #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) +#AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) #AX_QT_NO_KEYWORDS # create output @@ -691,7 +702,7 @@ EOF Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi) +Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default | 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) Package: @PACKAGE_NAME@ Section: $(if testtag AX_USE_LIBTOOL; then echo "libs"; fi) @@ -724,6 +735,7 @@ usr/lib/lib*.a usr/lib/lib*.so usr/lib/pkgconfig/* usr/lib/*.la +usr/share/${PACKAGE_NAME} usr/share/doc/${PACKAGE_NAME}/html EOF to --mode "u=rwx,g=rwx,o=rx" debian/rules <.qrc (default: resources.qrc) +## +## Call: +## +## cd src +## ../build-resource-file.sh + +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +RESOURCES=${1:-resources} +TARGET=${RESOURCES}.qrc + +test -d ${RESOURCES} + +echo "" > ${TARGET} +for d in $(find resources -mindepth 1 -type d); do + echo " " >> ${TARGET} + for f in $(find $d -mindepth 1 -maxdepth 1 -type f); do + echo " $f" >> ${TARGET} + done + echo " " >> ${TARGET} +done +echo "" >> ${TARGET} diff --git a/cordova/logo.png b/cordova/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5a7481fbed25ab13f2d5e13faec3ee17cc1f669a GIT binary patch literal 3339 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 V2SeJ=<^KNDp!Ci3>UCTb{s!pj3nc&m literal 0 HcmV?d00001 diff --git a/cordova/makefile.am b/cordova/makefile.am index 97f7cdd..00828a5 100644 --- a/cordova/makefile.am +++ b/cordova/makefile.am @@ -5,18 +5,20 @@ EXTRA_DIST = config.xml.in hooks platforms plugins www ANDROID = safechat.apk -ANDROID_SRC = platforms/android/build/outputs/apk/android-release-unsigned.apk +#ANDROID_SRC = platforms/android/build/outputs/apk/android-release-unsigned.apk +ANDROID_SRC = platforms/android/build/outputs/apk/android-debug.apk wwwdir = ${pkgdatadir}/html www_DATA = ${ANDROID} ${ANDROID_SRC}: ${EXTRA_DIST} - cordova build --release + cordova build --debug ${ANDROID}: ${ANDROID_SRC} mv $< $@ clean-local: platforms/android/cordova/clean + -rm -r platforms/android/.gradle CLEANFILES = ${ANDROID} ${ANDROID_SRC} MAINTAINERCLEANFILES = makefile.in diff --git a/cordova/platforms/android/res/drawable-hdpi/icon.png b/cordova/platforms/android/res/drawable-hdpi/icon.png deleted file mode 100644 index 4d27634485b3a20d8a0188107e84812f4f71084b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6080 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 diff --git a/cordova/platforms/android/res/drawable-ldpi/icon.png b/cordova/platforms/android/res/drawable-ldpi/icon.png deleted file mode 100644 index cd5032a4f2e0b734d4bdece13564c4b55de963a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3096 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 diff --git a/cordova/platforms/android/res/drawable-mdpi/icon.png b/cordova/platforms/android/res/drawable-mdpi/icon.png deleted file mode 100644 index e79c6062c1dcd9e98f092dbd7e51b5b76dd897d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4090 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 diff --git a/cordova/platforms/android/res/drawable-xhdpi/icon.png b/cordova/platforms/android/res/drawable-xhdpi/icon.png deleted file mode 100644 index ec7ffbfbdafc58df28e6e89041ee21acd0f6177e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7685 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 diff --git a/cordova/platforms/android/res/drawable/icon.png b/cordova/platforms/android/res/drawable/icon.png index ec7ffbfbdafc58df28e6e89041ee21acd0f6177e..5a7481fbed25ab13f2d5e13faec3ee17cc1f669a 100644 GIT binary patch literal 3339 zcmai%cQhN07RMtY)E2XL+XOL#qDbu(1hGnO8oNZPJz}&TRUWl>Llv#{BT6Z;Rc%TU z1V!^ht2JBNK5zW--Z}5QchC9W&pG$panAkg-V_TnLl#DUMgRc7f-=&xykPBxh8e&Y zKHNBR<^o`M6GOcVUf6ftj<^e4!Wr2IUsTNhT{JopMd24g`VbUapMLcc8$?MZZq0KM z0AS8X>1kVsFYc8@{FP_ma&noIvShg1Wuv!a?plZ`OIl=NIKkUgTF$h^8d`4%gEY(m zA7deE1a}DGg?y$fvwNpSlRL7PpRPY~8ppt=eT{uCaVAlk>3fBjjNJ!pWYxBMocVie z`1={fnbqdynVIFlM0Op9D@p&;-80rN(2R?t2>V!^TIYN}_#*sPlCjvBJN~cLI!4x4 zFc1EXEyg*iqRJvPJJ!tFRJ=e)W;IRw-0i6D)GLC6`6(ni-yaWF{-c1v_>Tqz(`umq zWz9I1j216`kJy}{s5;`DEZhszFth3>ZI+%MEssWbvqNkcQY4|Z|H)MTvVoW8H-WX8ev7jL`3W~HgKzNM znB!{(SJQoNnX9*GaN&}ST0f4lb5Cn;jyXFHG`7YJ?*bj|t*mCmc{>J-tU14XBjqf%Xx=w*n(3Fj|FHczzgM5lM=(r$M zBt1eo@ueo6Gq?)$8_45f&$!#&r>J5%*)mBQ2GlN&oPMXRVq$NlWFb6)=8Nlg+kcmv?$`V`CdqNc{4!P>!Z)oR8i zKg*0pmNk2M6>rtJo4C1XG~H;I>(MUoPPAMEA#5iix~)Ny8q5zgp6z`SqJRq>@mF3G zdnlNImB@V_d<@9_Zf79>P#y1pw}A(f>BBE}no;3f)PI;84*uQSvQ? z3Nh9cZqMV_>{etxB)5$IMa_95UMfD7wp|c(z1CnXqp~EPp3@dk6u;EOEa8oM#S?0M zNW4N-Sx|;3X(DNNODLTzB&uD#6*(J0|#ud!Wd{rOL<71a&`sNfMOM^Wn$T8LNHHZ^2I)Ff6$6f>ZQXdJ3VwnB{uyxm=fhnsq=ts`nJy-OVqLCN?@B5$&b`l-6w`Quq!G}bP)g8=j}hjApWon zM88Gh=mwv|wKVboWvJQnwWa8Z{%=d!S;vEQH51%1^7+}sKP@Q+DTQT=Eh4z2A$U=c z$2#@ww7%*c?AG(~o_p$zT7<1q{)y7#CrhK1C!3rGfbFd{`|i@$9-F5HdSf@cga|H` zUF$cLHwaJqu^ud!cW+j2^RzN_ah(8$JQ z87@Xr!leVJrWrwf*U1)sf?#^dt|pS+`|9>J=)@r>&}rW5qt6|vkDn45LFtx1Sfb-} z_;apamE%;8z*Aa%WLL^O`QT5`F1O;5pmfmu^eQ!o_a`W4RTrXk<{9Tw-Y^7zny~WY zB{7bCZO`NKvaVk>b%LggQ&WeI`Jf<$EADX)mZMQEG0Jf3s%x9ac+>sh`N zx^L7mtoUU>e&#;2UAmm{tpC>t^A}9v%cpKrKa;&T>cbXgCQ1(3aRv$2(=i5!q-E2FxZ>kyDU|W4L?09ojG3J|1 zfoDO8&tvRL=yNUKt0tDW;;(M{P~zP!c)^b>3`Gc?N&y8EP;w z>sEB8kk+f9;TC)FmG5iqXj5egj)VF-@3g2FqBp5fJMy&heVYtZM_x}xqk-^e_J(16 zj%xOy2=*$RbUT8tHBA!cBlhx1vYUS0h~4x!Rsx=Mo^AE|H2R)j^@zoERoHX@_Vn7W zEL+&Hu!f8^_FsNbwZlh^uxbHNU#J)c9Xp}bwsaHorASMZ2 zmIGd5i|RHs(7nR-k`Ne9hr@_*UwBgM9Ke3|cEFapmKln{8l$4t2qUnC$9FH|xB~9! z$WH>Ci?jq~cpV_g8~cw=|0q{@Q0WwuxoG@GY&q)zM2SHcIV1i8^QszkB9mAcViG;4 zW#a+KF;~TP8ZLe()z;Exg`yWaG@BUwrp2nFsx)oP0%mr@z#9892gc^8lgE)KKEBft z`i`T46qTEMz=C!b&3=z-*9rS54MJ$j3aTU54ZW!6aX7-62a?~FQ+c&6n9)*%&x_W- znSMu`!4^2g6M=pWn?cUFKvlYZkJ$zT*=iR^&sWfK11IL#$8-r>90aAU7hy3T;31qY8`(8FQFqxyRE>#hl z6Hs1Mu_B<)&R^51%+xBl*MmBvfe$H-u=rArIWaFo?o?S!pPNPbI+miMy(md+Bb=`gpmj)3Pi7?UIQ z8o9eciqVl!?{(IpNc5yc?#Z;~#^7Ph2f^>w^V2S2(}f|`P&!9Zvizm-o#{?5hpSmD z#afm)0hd|g9B0h9VxIx|SAOv3C)>@_>$rOf!CpZu-ClveEH3i0DWgYPniS1C?nZ__ zXOaW7$f=c)#`FIW~wlUDE(I2dBpBNe8@yrS&C{}StV_Z*gr1fQ!K`1UJ}4_K*>Q4gsq3A zBqn&|kjz(E*}+~DQi%UMkx`G~2w=eK^B&UEB$lGzFq~|xLyO5Qa_UN?oVsM6UvyfL zXp5-YoW9|V?e-o{`(aq$82S_auEZ2??=a$Lg|IE#8Sssy`kToe{4vj$%wK=Aq9W$dAue6O(n&x_3P*FD$6yFZM!fu=xBh?o1X4?XgK`yZ V2SeJ=<^KNDp!Ci3>UCTb{s!pj3nc&m literal 7685 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 diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh new file mode 100755 index 0000000..9da3c80 --- /dev/null +++ b/resolve-debbuilddeps.sh @@ -0,0 +1,44 @@ +#! /bin/bash -ex + +## @id $Id$ + +## Resolve Debian Build Dependencies +## Installs all the required packages +## Call: ./resolve-debbuilddeps 'name of build schroot' +## e.g. call: ./resolve-debbuilddeps trusty_amd64 + +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +SCHROOTNAME="$1" + +sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control + +if test -n "${SCHROOTNAME}"; then + DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) +else + DEPS=$(dpkg-checkbuilddeps 2>&1 || true) +fi +DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') + +for pa in ${DEPS}; do + success=0 + for p in $(echo "${pa}" | sed 's,|, ,g'); do + if test -n "${SCHROOTNAME}"; then + if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install ${p}; then + success=1 + break; + fi + else + if sudo apt-get -y install ${p}; then + success=1 + break; + fi + fi + done + if test ${success} -eq 0; then + echo "**** Error: Installation Failed: ${pa}" + fi +done + +echo "**** Success: All Dependencies Resolved" diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh new file mode 100755 index 0000000..efa546f --- /dev/null +++ b/resolve-rpmbuilddeps.sh @@ -0,0 +1,34 @@ +#! /bin/bash -ex + +## @id $Id$ + +## Resolve RPM Build Dependencies +## Installs all the required packages +## Call: ./resolve-rpmbuilddeps 'name of build schroot' +## e.g. call: ./resolve-rpmbuilddeps opensuse-13.2_x86_64 + +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +SCHROOTNAME="$1" +PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac) + +sed 's,@[^@]*@,dummytext,g' ${PACKAGE_NAME}.spec.in > ${PACKAGE_NAME}.spec + +if test -n "${SCHROOTNAME}"; then + FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') + if test -n "${FILES}"; then + schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \ + schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FILES} || \ + schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES} + fi +else + FILES=$(LANG= rpmbuild -bb --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') + if test -n "${FILES}"; then + yum install -y ${FILES} || \ + zypper install -y ${FILES} || \ + dnf install -y ${FILES} + fi +fi + +echo "**** Success: All Dependencies Resolved"