build fixed
This commit is contained in:
Marc Wäckerlin
61
ChangeLog
61
ChangeLog
@@ -1,3 +1,64 @@
|
||||
2017-01-06 15:53
|
||||
|
||||
* [r89] COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4,
|
||||
ax_init_standard_project.m4, bootstrap.sh, build-in-docker.conf,
|
||||
build-in-docker.sh, debian/control.in, resolve-debbuilddeps.sh,
|
||||
resolve-rpmbuilddeps.sh, sql-to-dot.sed:
|
||||
improved build, tested on wily and xenial
|
||||
|
||||
2017-01-05 14:25
|
||||
|
||||
* [r88] src/commands.hxx:
|
||||
more improve expect load; better logging in case of exception
|
||||
|
||||
2017-01-04 15:54
|
||||
|
||||
* [r87] src/commands.hxx, src/testgui.hxx, src/testgui.ui:
|
||||
improve expect load; fix views menu; improve function call error
|
||||
display
|
||||
|
||||
2016-11-01 15:46
|
||||
|
||||
* [r86] ChangeLog, configure.ac, src/commands.hxx, src/testgui.hxx,
|
||||
src/testgui.ui:
|
||||
first version of a script run progress bar
|
||||
|
||||
2016-06-09 14:12
|
||||
|
||||
* [r85] src/commands.hxx:
|
||||
jenkins junit interprets dots as subclasses, so remove the dots
|
||||
in filenames
|
||||
|
||||
2016-06-09 12:41
|
||||
|
||||
* [r84] src/commands.hxx:
|
||||
jenkins junit plugin gojne crazy: classname must not be a file
|
||||
but either a directory or not exist - typo
|
||||
|
||||
2016-06-09 11:18
|
||||
|
||||
* [r83] src/commands.hxx:
|
||||
jenkins junit plugin gojne crazy: classname must not be a file
|
||||
but either a directory or not exist
|
||||
|
||||
2016-06-09 09:47
|
||||
|
||||
* [r82] configure.ac, src/commands.hxx:
|
||||
no special characters in classname and name attributes, otherwise
|
||||
jenkins cannot read the test output xml file
|
||||
|
||||
2016-06-09 08:17
|
||||
|
||||
* [r81] scripts/wt-mode.el, src/commands.hxx:
|
||||
filter special ascii commands from output, otherwise jenkins
|
||||
cannot read the test output xml file - keep new line
|
||||
|
||||
2016-06-09 08:09
|
||||
|
||||
* [r80] src/commands.hxx:
|
||||
filter special ascii commands from output, otherwise jenkins
|
||||
cannot read the test output xml file
|
||||
|
||||
2016-06-08 09:07
|
||||
|
||||
* [r79] ax_init_standard_project.m4, bootstrap.sh,
|
||||
|
||||
19
bootstrap.sh
19
bootstrap.sh
@@ -1465,7 +1465,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
|
||||
|
||||
-- @PACKAGER@ @BUILD_DATE@
|
||||
EOF
|
||||
BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(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="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)"
|
||||
to debian/control.in <<EOF
|
||||
Source: @PACKAGE_NAME@
|
||||
Priority: extra
|
||||
@@ -1600,7 +1600,9 @@ echo
|
||||
echo This package contains only the shared libraries required at runtime.
|
||||
fi)
|
||||
|
||||
|
||||
$(if ! testtag 'AX_USE_LIBTOOL|AX_USE_CXX'; then
|
||||
echo '%global debug_package %{nil}'
|
||||
fi)
|
||||
%prep
|
||||
%setup -q
|
||||
./configure --prefix=/usr \\
|
||||
@@ -1736,10 +1738,15 @@ Cflags: -I\${includedir} @CPPFLAGS@
|
||||
Requires: @PKG_REQUIREMENTS@
|
||||
EOF
|
||||
to build-in-docker.conf <<EOF
|
||||
repos+=("Debian|Ubuntu-precise::::::universe")
|
||||
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
|
||||
envs+=("-e 'HOME=\${HOME}'")
|
||||
dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
|
||||
${HEADER}# Use Ubuntu Universe Repository
|
||||
repos+=("Ubuntu:::universe")
|
||||
|
||||
# Use Marc Wäckselin's Repository, see https://dev.marc.waeckerlin.org
|
||||
repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
|
||||
repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
|
||||
repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
|
||||
repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
|
||||
keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
|
||||
EOF
|
||||
|
||||
#### Cleanup If Makefile Exists ####
|
||||
|
||||
@@ -10,8 +10,8 @@ mode="deb"
|
||||
img="ubuntu:latest"
|
||||
repos=()
|
||||
keys=()
|
||||
envs=("-e LANG=${LANG}" "-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
|
||||
dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
|
||||
envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
|
||||
dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
|
||||
packages=()
|
||||
targets="all check distcheck"
|
||||
commands=()
|
||||
|
||||
8
doc/footer.html.in
Normal file
8
doc/footer.html.in
Normal file
@@ -0,0 +1,8 @@
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
$navpath
|
||||
<li class="footer"><a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
33
doc/header.html.in
Normal file
33
doc/header.html.in
Normal file
@@ -0,0 +1,33 @@
|
||||
<!-- HTML header for doxygen 1.8.6-->
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
<meta name="generator" content="Doxygen $doxygenversion"/>
|
||||
<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
|
||||
<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
|
||||
<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="$relpath^jquery.js"></script>
|
||||
<script type="text/javascript" src="$relpath^dynsections.js"></script>
|
||||
$treeview
|
||||
$search
|
||||
$mathjax
|
||||
<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
|
||||
$extrastylesheet
|
||||
</head>
|
||||
<body>
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
|
||||
<div id="titlearea">
|
||||
<div id="projecthead">
|
||||
<div id="projectlogo"><img alt="" src="$relpath^$projectlogo"/></div>
|
||||
<div id="projectname">$projectname</span> <span id="projectnumber">$projectnumber</div>
|
||||
<div id="projectbrief">$projectbrief</div>
|
||||
</div>
|
||||
<nav>
|
||||
<a href="@PROJECT_URL@" target="_blank">Project Management</a>
|
||||
<a href="@SOURCE_DOWNLOAD@" target="_blank">Download</a>
|
||||
<div>$searchbox</div>
|
||||
</nav>
|
||||
</div>
|
||||
BIN
doc/plantuml.jar
Normal file
BIN
doc/plantuml.jar
Normal file
Binary file not shown.
38
doc/style.css
Normal file
38
doc/style.css
Normal file
@@ -0,0 +1,38 @@
|
||||
#titlearea {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-begin;
|
||||
}
|
||||
#titlearea nav {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
#titlearea nav a {
|
||||
background-color: lightgray;
|
||||
border: 1px solid gray;
|
||||
color: black;
|
||||
padding: 1ex;
|
||||
margin: 0;
|
||||
}
|
||||
img, object {
|
||||
max-width: 100% !important;
|
||||
}
|
||||
@media (max-width: 50em) {
|
||||
#navrow1, #navrow2 {
|
||||
display: block
|
||||
}
|
||||
#side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
|
||||
display: none;
|
||||
}
|
||||
#doc-content {
|
||||
margin-left: 0 !important;
|
||||
}
|
||||
}
|
||||
@media (min-width: 50em) {
|
||||
#navrow1, #navrow2 {
|
||||
display: none;
|
||||
}
|
||||
#side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
|
||||
display: block
|
||||
}
|
||||
}
|
||||
9
makefile_test.inc.am
Normal file
9
makefile_test.inc.am
Normal file
@@ -0,0 +1,9 @@
|
||||
## @id $Id$
|
||||
|
||||
## 1 2 3 4 5 6 7 8
|
||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
|
||||
|
||||
%.gcda: %
|
||||
gcov $<
|
||||
|
||||
CLEANFILES += ${CLEANFILES} ${TEST:%=%.gcno} ${TEST:%=%.gcda} *.gcov
|
||||
Reference in New Issue
Block a user