prepared for build in a docker instance on jenkins
This commit is contained in:
Marc Wäckerlin
31
ChangeLog
31
ChangeLog
@@ -1,3 +1,34 @@
|
||||
2015-10-09 15:02 marc
|
||||
|
||||
* src/certman.hxx: typo
|
||||
|
||||
2015-10-08 16:37 marc
|
||||
|
||||
* doc/screenshots, doc/screenshots/openfromurl.png: added
|
||||
screenshot
|
||||
|
||||
2015-10-08 14:38 marc
|
||||
|
||||
* COPYING, ChangeLog, INSTALL, src/certificate.hxx,
|
||||
src/certificate.ui, src/certman.hxx, src/certman.ui,
|
||||
src/certman_de.ts, src/certman_en.ts, src/certman_fr.ts,
|
||||
src/certman_it.ts, src/makefile.am, src/openfromurl.hxx,
|
||||
src/openfromurl.ui: first version to show an save certificates
|
||||
from files or urls
|
||||
|
||||
2015-10-08 11:22 marc
|
||||
|
||||
* AUTHORS, NEWS, README, ax_check_qt.m4,
|
||||
ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh, build-resource-file.sh, certman.spec.in,
|
||||
configure.ac, debian, debian/changelog.in, debian/compat,
|
||||
debian/control.in, debian/docs, debian/rules, doc,
|
||||
doc/doxyfile.in, doc/makefile.am, mac-create-app-bundle.sh,
|
||||
makefile.am, resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh,
|
||||
src, src/certman.hxx, src/certman.ui, src/languages.qrc,
|
||||
src/main.cxx, src/makefile.am, src/version.cxx, src/version.hxx:
|
||||
bootstrapped qt project
|
||||
|
||||
2015-10-08 08:50 marc
|
||||
|
||||
* .: structure
|
||||
|
||||
@@ -103,7 +103,12 @@ AC_DEFUN([AX_CHECK_QT], [
|
||||
HAVE_$1=1
|
||||
AC_DEFINE([HAVE_$1])
|
||||
QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
|
||||
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
|
||||
qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core)
|
||||
if test -d "${qt_host_bins}"; then
|
||||
QT_PLUGIN_PATH=${qt_host_bins}/../plugins
|
||||
else
|
||||
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
|
||||
fi
|
||||
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
|
||||
[$1]_CPPFLAGS="${[$1]5_CFLAGS}"
|
||||
[$1]_CXXFLAGS="${[$1]5_CFLAGS}"
|
||||
@@ -145,7 +150,12 @@ AC_DEFUN([AX_CHECK_QT], [
|
||||
HAVE_$1=1
|
||||
AC_DEFINE([HAVE_$1])
|
||||
QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
|
||||
QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
|
||||
qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore)
|
||||
if test -d "${qt_host_bins}"; then
|
||||
QT_PLUGIN_PATH=${qt_host_bins}/../plugins
|
||||
else
|
||||
QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
|
||||
fi
|
||||
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
|
||||
[$1]_CPPFLAGS="${[$1]_CFLAGS}"
|
||||
[$1]_CXXFLAGS="${[$1]_CFLAGS}"
|
||||
@@ -188,6 +198,16 @@ AC_DEFUN([AX_CHECK_QT], [
|
||||
if test -n "${MINGW}"; then
|
||||
AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
|
||||
fi
|
||||
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],
|
||||
[AS_HELP_STRING([--with-qt-plugin-path=PATH],
|
||||
[define a different qt plugin path, current @<:@default=check@:>@])],
|
||||
[QT_PLUGIN_PATH=$with_qt_plugin_path],
|
||||
[])
|
||||
AC_MSG_NOTICE([Qt Plugins are installed to ${QT_PLUGIN_PATH}])
|
||||
AC_SUBST(QTDIR)
|
||||
AC_SUBST(QT_PLUGIN_PATH)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
|
||||
@@ -207,13 +207,16 @@ 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
|
||||
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}
|
||||
-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz
|
||||
distclean-standard-project-targets:
|
||||
-rm -r autom4te.cache
|
||||
-rm aclocal.m4 config.guess config.sub configure depcomp compile install-sh ltmain.sh makefile missing mkinstalldirs
|
||||
-rm aclocal.m4 config.guess config.sub configure depcomp compile install-sh ltmain.sh makefile missing mkinstalldirs test-driver
|
||||
maintainer-clean-standard-project-targets:
|
||||
-rm makefile.in
|
||||
#### End: $0
|
||||
@@ -693,3 +696,15 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_MSG_RESULT([$newflag in $LDFLAGS])
|
||||
])
|
||||
|
||||
# Check if a package exists in the current distribution, if yes, require it
|
||||
# in debian/control.in append @DEB_DEPEND_IFEXISTS@ to Build-Depends
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
|
||||
pkg=$1
|
||||
if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
|
||||
DEB_DEPEND_IFEXISTS+=", ${pkg}"
|
||||
fi
|
||||
AC_SUBST(DEB_DEPEND_IFEXISTS)
|
||||
])
|
||||
|
||||
@@ -462,7 +462,7 @@ if ! testtag "AX_CHECK_QT" configure.ac && \
|
||||
! testtag "AX_REQUIRE_QT" configure.ac; then
|
||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \
|
||||
to --condition AX_USE_CXX src/makefile.am
|
||||
else
|
||||
elif ! test -e src/makefile.am; then
|
||||
to --condition AX_USE_CXX src/makefile.am <<EOF
|
||||
${HEADER}bin_PROGRAMS = ${PACKAGE_NAME}
|
||||
|
||||
@@ -776,7 +776,7 @@ if testtag AX_USE_DOXYGEN; then
|
||||
doxyreplace INLINE_SOURCES YES
|
||||
doxyreplace GENERATE_TESTLIST YES
|
||||
doxyreplace GENERATE_TREEVIEW NO
|
||||
doxyreplace SEARCHENGINE YES
|
||||
doxyreplace SEARCHENGINE NO
|
||||
doxyreplace GENERATE_HTML YES
|
||||
doxyreplace GENERATE_LATEX NO
|
||||
doxyreplace LATEX_BATCHMODE YES
|
||||
|
||||
@@ -12,33 +12,62 @@
|
||||
|
||||
SCHROOTNAME="$1"
|
||||
|
||||
sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control
|
||||
function install() {
|
||||
if test -n "${SCHROOTNAME}"; then
|
||||
if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then
|
||||
return 0
|
||||
fi
|
||||
else
|
||||
if apt-get -y install $*; then
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
TO_INSTALL=
|
||||
|
||||
if test -e debian/control.in -a ! -e debian/control; then
|
||||
for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
|
||||
if test -n "$(apt-cache policy -q ${f})" && ! dpkg -l "${f}"; then
|
||||
TO_INSTALL+=" ${f}"
|
||||
fi
|
||||
done
|
||||
trap "rm debian/control" INT TERM EXIT
|
||||
sed 's,@DEB_DEPEND_IFEXISTS@,,g' debian/control.in | \
|
||||
sed 's,@[^@]*@, dummytext,g' > debian/control
|
||||
fi
|
||||
|
||||
if test -n "${SCHROOTNAME}"; then
|
||||
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev
|
||||
DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
|
||||
else
|
||||
apt-get -y install dpkg-dev
|
||||
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
|
||||
if test ${pa//|/} = ${pa}; then
|
||||
TO_INSTALL+=" ${pa}"
|
||||
continue;
|
||||
fi
|
||||
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
|
||||
for p in ${pa//|/ }; do
|
||||
if install ${TO_INSTALL} ${p}; then
|
||||
TO_INSTALL+=" ${p}"
|
||||
success=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test ${success} -eq 0; then
|
||||
echo "**** Error: Installation Failed: ${pa}"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then
|
||||
echo "**** Error: Installation Failed: ${TO_INSTALL}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "**** Success: All Dependencies Resolved"
|
||||
|
||||
Reference in New Issue
Block a user