libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

after svn-server restore

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-04-03 16:18:31 +00:00
parent dc9c339b06
commit 6304cf2dca
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2015-12-08 13:14 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.conf, build-in-docker.sh, mrw-c++.desktop.in,
resolve-debbuilddeps.sh, sql-to-dot.sed, src/version.cxx,
src/version.cxx.in: build in docker for all debian based distros
2015-11-16 12:38 marc 2015-11-16 12:38 marc
* doc/doxyfile.in: SVG must not be interactive for embedding in * doc/doxyfile.in: SVG must not be interactive for embedding in

3
build-in-docker.sh
View File

@@ -113,6 +113,7 @@ function traperror() {
fi fi
echo echo
fi fi
echo "**** Entering docker container ${DOCKER_ID}, exit with Ctrl-D"
echo -n " ... cleanup docker: " echo -n " ... cleanup docker: "
docker rm -f "${DOCKER_ID}" docker rm -f "${DOCKER_ID}"
echo "returning status: $e" echo "returning status: $e"
@@ -162,7 +163,7 @@ for repo in "${repos[@]}"; do
ifthenelse "${repo}" "apt-add-repository ARG" ifthenelse "${repo}" "apt-add-repository ARG"
done done
for key in "${keys[@]}"; do for key in "${keys[@]}"; do
wget -O- \ wget -O- "$key" \
| docker exec -i ${DOCKER_ID} apt-key add - | docker exec -i ${DOCKER_ID} apt-key add -
done done
docker exec ${DOCKER_ID} apt-get update docker exec ${DOCKER_ID} apt-get update

4
resolve-debbuilddeps.sh
View File

@@ -35,7 +35,7 @@ TO_INSTALL=
if test -e debian/control.in -a ! -e debian/control; then 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 for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then
TO_INSTALL+=" ${f}" TO_INSTALL+=" ${f}"
fi fi
done done
@@ -45,7 +45,7 @@ if test -e debian/control.in -a ! -e debian/control; then
fi fi
install dpkg-dev install dpkg-dev
DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true) DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true)
DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
for pa in ${DEPS}; do for pa in ${DEPS}; do