libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

README.md build fixed

Browse Source
This commit is contained in:
Marc Wäckerlin
2018-11-23 14:34:41 +00:00
parent 182a840112
commit db3c9c803d
6 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ChangeLog
View File

@@ -1,3 +1,45 @@
2018-10-02 12:49
* [r223] COPYING, INSTALL, build-in-docker.conf,
build-in-docker.sh, resolve-rpmbuilddeps.sh:
fix distributor/codename
2018-09-17 13:13
* [r222] COPYING, INSTALL, build-in-docker.sh:
support opensuse tumbleweed
2018-09-11 10:21
* [r221] COPYING, INSTALL, build-in-docker.sh:
fix installation check after package build
2018-09-10 21:43
* [r220] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.sh, configure.ac, debian/control.in,
mac-create-app-bundle.sh:
add check whether built package can be installed; fixed typo in
debian development dependencie
2018-07-19 11:34
* [r219] build-in-docker.conf:
updated the repository
2018-07-09 09:05
* [r218] build-in-docker.sh:
fix build in debian buster
2018-07-05 13:48
* [r217] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.sh, configure.ac, mac-create-app-bundle.sh,
proxyface.spec.in, resolve-debbuilddeps.sh,
resolve-rpmbuilddeps.sh:
fix rpm build
2018-04-04 20:15
* [r216] ChangeLog, bootstrap.sh, build-in-docker.sh:

35
ax_init_standard_project.m4
View File

@@ -365,7 +365,7 @@ AC_DEFUN([AX_USE_CXX], [
CXXFLAGS="${CXXFLAGS//-g -O2/}"
CFLAGS="${CFLAGS//-g -O2/}"
# pass compile flags to make distcheck
# pass compile flags to make distcheck
AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
@@ -391,6 +391,20 @@ maintainer-clean-cxx-targets:
EOF
])
# require specific C++ version
AC_DEFUN([AX_USE_CXX_11], [
AX_USE_CXX
AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
])
AC_DEFUN([AX_USE_CXX_14], [
AX_USE_CXX
AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
])
AC_DEFUN([AX_USE_CXX_17], [
AX_USE_CXX
AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
])
# use this in configure.ac to support old school C
AC_DEFUN([AX_USE_C], [
AC_LANG(C)
@@ -637,7 +651,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [
AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
AC_CHECK_PROG(have_dot, dot, yes, no)
AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v 2>/dev/null) | sort -V | head -1))
PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
AC_SUBST(PDF_DOC)
if test "$have_doxygen" = "no"; then
@@ -662,28 +675,12 @@ AC_DEFUN([AX_USE_DOXYGEN], [
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
#### Begin: Appended by $0
doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\
@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\
@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\
@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"';
doc: doxyfile
doxygen doxyfile
@PEDANTIC_TRUE@ test \! -s doxygen.errors
@NEED_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
@NEED_PLANTUML_TRUE@
@NEED_PLANTUML_TRUE@gen-uml-images:
@NEED_PLANTUML_TRUE@ test -d gen-uml-images || mkdir gen-uml-images
@NEED_PLANTUML_TRUE@ eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
@NEED_PLANTUML_TRUE@ eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
@NEED_PLANTUML_TRUE@ SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
@NEED_PLANTUML_TRUE@ for src in \$\$INPUT; do \\
@NEED_PLANTUML_TRUE@ java -Djava.awt.headless=true -jar \${top_srcdir}/doc/plantuml.jar -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
@NEED_PLANTUML_TRUE@ done
clean-documentation:
-rm doxygen.errors @PDF_DOC@
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
distclean-documentation:
-rm -r html
-rm @PACKAGE_NAME@.doxytag

46
build-in-docker.sh
View File

@@ -7,7 +7,7 @@ if test "${arch}" = "amd64"; then
myarch="amd64|i386"
fi
mode=
img="mwaeckerlin/ubuntu:latest"
img=
repos=()
keys=()
dns=()
@@ -81,24 +81,27 @@ while test $# -gt 0; do
echo
exit 0
;;
(-m|--mode) shift;
(-m|--mode)
shift;
mode="$1"
case "$mode" in
(deb|apt) img="mwaeckerlin/ubuntu:latest";;
(rpm|zypper) img="opensuse:latest";;
(yum) img="centos:latest";;
(dnf) img="fedora:latest";;
(win)
img="mwaeckerlin/ubuntu:latest"; host="${host:---host=i686-w64-mingw32}"
targets="all install"
flags+=("--prefix=/workdir/usr")
packages+=("mingw-w64")
;;
(*)
echo "**** ERROR: unknown mode '$1', try --help" 1>&2
exit 1
;;
esac
if test -z "$img"; then
case "$mode" in
(deb|apt) img="mwaeckerlin/debbuildenv";;
(rpm|zypper) img="opensuse:latest";;
(yum) img="centos:latest";;
(dnf) img="fedora:latest";;
(win)
img="mwaeckerlin/debbuildenv"; host="${host:---host=i686-w64-mingw32}"
targets="all install"
flags+=("--prefix=/workdir/usr")
packages+=("mingw-w64")
;;
(*)
echo "**** ERROR: unknown mode '$1', try --help" 1>&2
exit 1
;;
esac
fi
;;
(-i|--image) shift;
img="$1"
@@ -243,6 +246,9 @@ function ifthenelse() {
set -x
if test -z "$img"; then
img="mwaeckerlin/debbuildenv"
fi
docker pull $img
DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
@@ -262,8 +268,8 @@ if test -z "$mode"; then
(*deb*) mode=deb;;
(*rpm*) mode=rpm;;
(*) case "$img" in
(*ubuntu*|*debian*|*mint*) mode=deb;;
(*fedora*|*centos*|*mageia*) mode=rpm;;
(*deb*|*ubuntu*|*debian*|*mint*) mode=deb;;
(*rpm*|*fedora*|*centos*|*mageia*) mode=rpm;;
(*mingw*|*win*) mode=win;;
(*) mode=deb;;
esac;;

2
doc/makefile.am
View File

@@ -2,7 +2,7 @@
##
## This file has been added:
## - by bootstrap.sh
## - on Thu, 22 November 2018 09:02:38 +0100
## - on Fri, 23 November 2018 15:32:44 +0100
## Feel free to change it or even remove and rebuild it, up to your needs
##
## 1 2 3 4 5 6 7 8

BIN
doc/plantuml.jar
View File

Binary file not shown.

6
makefile.am
View File

@@ -2,7 +2,7 @@
##
## This file has been added:
## - by bootstrap.sh
## - on Thu, 22 November 2018 09:02:38 +0100
## - on Fri, 23 November 2018 15:32:44 +0100
## Feel free to change it or even remove and rebuild it, up to your needs
##
## 1 2 3 4 5 6 7 8
@@ -23,4 +23,8 @@ dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \
sql-to-dot.sed
dist_doc_DATA = AUTHORS NEWS README.md COPYING INSTALL ChangeLog
README: README.md
cp README.md README
CLEANFILES = README
MAINTAINERCLEANFILES = makefile.in