seems to work for rpm, execpt signing problem
This commit is contained in:
Marc Wäckerlin
417
ChangeLog
417
ChangeLog
@@ -1,445 +1,536 @@
|
||||
2016-10-05 11:37
|
||||
|
||||
* [r99] debian/control.in:
|
||||
fixed build on wily
|
||||
|
||||
2016-09-29 16:37
|
||||
|
||||
* [r98] ChangeLog, INSTALL, autogen.sh[ADD],
|
||||
ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh, build-in-docker.sh, doc/footer.html.in[ADD],
|
||||
doc/header.html.in[ADD], doc/plantuml.jar[ADD],
|
||||
doc/style.css[ADD], mac-create-app-bundle.sh,
|
||||
makefile_test.inc.am[ADD], resolve-debbuilddeps.sh,
|
||||
resolve-rpmbuilddeps.sh, sql-to-dot.sed, test/xml-cxx.cxx[ADD]:
|
||||
update buildsystem
|
||||
|
||||
2015-12-26 11:37 marc
|
||||
|
||||
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
||||
build-in-docker.conf, build-in-docker.sh,
|
||||
resolve-debbuilddeps.sh: enable build-in-docker
|
||||
* [r97] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
||||
build-in-docker.conf[ADD], build-in-docker.sh,
|
||||
resolve-debbuilddeps.sh:
|
||||
enable build-in-docker
|
||||
|
||||
2015-11-18 09:25 marc
|
||||
|
||||
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
||||
libxml-cxx.desktop.in, libxml-cxx.spec.in,
|
||||
resolve-debbuilddeps.sh, sql-to-dot.sed, src/version.cxx,
|
||||
src/version.cxx.in: development packages are named devel in rpms,
|
||||
not dev
|
||||
* [r96] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
||||
libxml-cxx.desktop.in[ADD], libxml-cxx.spec.in,
|
||||
resolve-debbuilddeps.sh, sql-to-dot.sed[ADD], src/version.cxx,
|
||||
src/version.cxx.in[DEL]:
|
||||
development packages are named devel in rpms, not dev
|
||||
|
||||
2015-11-16 12:38 marc
|
||||
|
||||
* doc/doxyfile.in: SVG must not be interactive for embedding in
|
||||
redmine
|
||||
* [r95] doc/doxyfile.in:
|
||||
SVG must not be interactive for embedding in redmine
|
||||
|
||||
2015-11-07 10:47 marc
|
||||
|
||||
* bootstrap.sh: there is no qt4-default
|
||||
* [r94] bootstrap.sh:
|
||||
there is no qt4-default
|
||||
|
||||
2015-11-07 09:23 marc
|
||||
|
||||
* bootstrap.sh: there is no qt4-default
|
||||
* [r93] bootstrap.sh:
|
||||
there is no qt4-default
|
||||
|
||||
2015-11-05 09:54 marc
|
||||
|
||||
* ax_init_standard_project.m4, bootstrap.sh, build-in-docker.sh,
|
||||
resolve-debbuilddeps.sh: updated build system
|
||||
* [r92] ax_init_standard_project.m4, bootstrap.sh,
|
||||
build-in-docker.sh[ADD], resolve-debbuilddeps.sh:
|
||||
updated build system
|
||||
|
||||
2015-11-03 22:54 marc
|
||||
|
||||
* debian/control.in, libxml-cxx.spec.in: update dependencies
|
||||
* [r91] debian/control.in, libxml-cxx.spec.in:
|
||||
update dependencies
|
||||
|
||||
2015-11-03 21:51 marc
|
||||
|
||||
* debian/control.in: updated dependencies
|
||||
* [r90] debian/control.in:
|
||||
updated dependencies
|
||||
|
||||
2015-11-03 14:27 marc
|
||||
|
||||
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh, resolve-debbuilddeps.sh: prepared for build in a
|
||||
docker instance on jenkins
|
||||
* [r89] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh, resolve-debbuilddeps.sh:
|
||||
prepared for build in a docker instance on jenkins
|
||||
|
||||
2015-11-02 00:18 marc
|
||||
|
||||
* build-resource-file.sh, resolve-debbuilddeps.sh,
|
||||
resolve-rpmbuilddeps.sh: new author url
|
||||
* [r88] build-resource-file.sh[ADD], resolve-debbuilddeps.sh[ADD],
|
||||
resolve-rpmbuilddeps.sh[ADD]:
|
||||
new author url
|
||||
|
||||
2015-11-02 00:15 marc
|
||||
|
||||
* ChangeLog: new author url
|
||||
* [r87] ChangeLog:
|
||||
new author url
|
||||
|
||||
2015-11-01 23:56 marc
|
||||
|
||||
* AUTHORS, ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh: new author url
|
||||
* [r86] AUTHORS, ChangeLog, ax_check_qt.m4,
|
||||
ax_init_standard_project.m4, bootstrap.sh:
|
||||
new author url
|
||||
|
||||
2015-08-17 14:03 marc
|
||||
|
||||
* ax_init_standard_project.m4, bootstrap.sh: Debian sid is more
|
||||
restrictive in time format
|
||||
* [r85] ax_init_standard_project.m4, bootstrap.sh:
|
||||
Debian sid is more restrictive in time format
|
||||
|
||||
2015-07-31 11:47 marc
|
||||
|
||||
* libxml-cxx.spec.in: graphviz must not be used in fedora-20,
|
||||
otherise it never terminates
|
||||
* [r84] libxml-cxx.spec.in:
|
||||
graphviz must not be used in fedora-20, otherise it never
|
||||
terminates
|
||||
|
||||
2015-07-31 10:46 marc
|
||||
|
||||
* ax_init_standard_project.m4, bootstrap.sh: fixed version number
|
||||
* [r83] ax_init_standard_project.m4, bootstrap.sh:
|
||||
fixed version number
|
||||
|
||||
2015-07-31 07:05 marc
|
||||
|
||||
* bootstrap.sh, libxml-cxx.spec.in: repair rpm build
|
||||
* [r82] bootstrap.sh, libxml-cxx.spec.in:
|
||||
repair rpm build
|
||||
|
||||
2015-07-31 07:00 marc
|
||||
|
||||
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
|
||||
libxml-cxx.spec.in, mac-create-app-bundle.sh, makefile.am: repair
|
||||
rpm build
|
||||
* [r81] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
|
||||
libxml-cxx.spec.in, mac-create-app-bundle.sh[ADD], makefile.am:
|
||||
repair rpm build
|
||||
|
||||
2015-07-13 13:55 marc
|
||||
|
||||
* src/xml.cxx: need another move for squeeze
|
||||
* [r80] src/xml.cxx:
|
||||
need another move for squeeze
|
||||
|
||||
2015-07-13 13:11 marc
|
||||
|
||||
* configure.ac: typo
|
||||
* [r79] configure.ac:
|
||||
typo
|
||||
|
||||
2015-07-13 12:37 marc
|
||||
|
||||
* README, configure.ac: typo
|
||||
* [r78] README, configure.ac:
|
||||
typo
|
||||
|
||||
2015-07-13 12:23 marc
|
||||
|
||||
* bootstrap.sh, doc/doxyfile.in, doc/makefile.am: fix builds
|
||||
* [r77] bootstrap.sh, doc/doxyfile.in, doc/makefile.am:
|
||||
fix builds
|
||||
|
||||
2015-07-13 12:00 marc
|
||||
|
||||
* src/libxml-cxx.pc.in: link-fix
|
||||
* [r76] src/libxml-cxx.pc.in:
|
||||
link-fix
|
||||
|
||||
2015-07-13 11:55 marc
|
||||
|
||||
* examples/address.cxx, examples/node_macros.cxx,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx: replaced
|
||||
std::auto_ptr by new std::unique_ptr
|
||||
* [r75] examples/address.cxx, examples/node_macros.cxx,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx:
|
||||
replaced std::auto_ptr by new std::unique_ptr
|
||||
|
||||
2015-07-13 11:27 marc
|
||||
|
||||
* AUTHORS, ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh, configure.ac, debian, debian/changelog.in,
|
||||
debian/compat, debian/control.in, debian/docs,
|
||||
debian/libxml-cxx-dev.install, debian/libxml-cxx.install,
|
||||
debian/rules, doc/examples, doc/makefile.am, examples,
|
||||
* [r74] AUTHORS, ChangeLog, ax_check_qt.m4[ADD],
|
||||
ax_init_standard_project.m4[ADD], bootstrap.sh, configure.ac,
|
||||
debian, debian/changelog.in[ADD], debian/compat[ADD],
|
||||
debian/control.in[ADD], debian/docs[ADD],
|
||||
debian/libxml-cxx-dev.install[ADD],
|
||||
debian/libxml-cxx.install[ADD], debian/rules[ADD],
|
||||
doc/examples[DEL], doc/makefile.am, examples[CPY],
|
||||
examples/makefile.am, makefile.am, src/libxml-cxx.pc.in,
|
||||
src/makefile.am, src/version.cxx, src/version.hxx, src/xml.cxx,
|
||||
test/makefile.am: update to new build system
|
||||
src/makefile.am, src/version.cxx[ADD], src/version.hxx[ADD],
|
||||
src/xml.cxx, test/makefile.am:
|
||||
update to new build system
|
||||
|
||||
2015-05-08 22:00 marc
|
||||
|
||||
* ChangeLog, src/xml-cxx/xml.hxx, src/xml.cxx: added Node::first()
|
||||
and Node::last() to get the first or last child
|
||||
* [r73] ChangeLog, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
added Node::first() and Node::last() to get the first or last
|
||||
child
|
||||
|
||||
2015-03-24 08:03 marc
|
||||
|
||||
* README: typo
|
||||
* [r72] README:
|
||||
typo
|
||||
|
||||
2015-03-03 10:22 marc
|
||||
|
||||
* configure.ac: a=\\PACKAGEPACKAGE_VERSION\; b=\\PACKAGE_VERSION\;
|
||||
for f in $(grep --exclude-dir=.svn --exclude=\\*~\ -lr "$a"); do
|
||||
sed -i "s,$a,$b,g" "$f"; done
|
||||
* [r71] configure.ac:
|
||||
a=\\PACKAGEPACKAGE_VERSION\; b=\\PACKAGE_VERSION\; for f in
|
||||
$(grep --exclude-dir=.svn --exclude=\\*~\ -lr "$a"); do sed -i
|
||||
"s,$a,$b,g" "$f"; done
|
||||
|
||||
2015-02-23 10:29 marc
|
||||
|
||||
* ChangeLog, src/xml-cxx/xml.hxx: make check fixed - now warnings
|
||||
deprecated std::auto_ptr → to be fixed later; refs #14
|
||||
* [r70] ChangeLog, src/xml-cxx/xml.hxx:
|
||||
make check fixed - now warnings deprecated std::auto_ptr → to be
|
||||
fixed later; refs #14
|
||||
|
||||
2015-02-19 08:45 marc
|
||||
|
||||
* AUTHORS, ChangeLog, INSTALL, README, ax_cxx_compile_stdcxx_11.m4,
|
||||
configure.ac, configure.in, debian/changelog.in, debian/control,
|
||||
debian/control.in, debian/rules, doc/doxyfile.in,
|
||||
* [r69] AUTHORS, ChangeLog, INSTALL, README,
|
||||
ax_cxx_compile_stdcxx_11.m4[ADD], configure.ac[CPY],
|
||||
configure.in[DEL], debian/changelog.in, debian/control[DEL],
|
||||
debian/control.in[CPY], debian/rules, doc/doxyfile.in,
|
||||
doc/makefile.am, libxml-cxx.spec.in, makefile.am,
|
||||
src/libxml-cxx.pc.in, src/version.cxx.in: new build rules, same
|
||||
changes as in ticket 12 of mrw-c++; refs #14
|
||||
src/libxml-cxx.pc.in, src/version.cxx.in:
|
||||
new build rules, same changes as in ticket 12 of mrw-c++; refs
|
||||
#14
|
||||
|
||||
2013-01-25 14:37 marc
|
||||
|
||||
* libxml-cxx.spec.in: fix fedora-18 bug; closes #13
|
||||
* [r65] libxml-cxx.spec.in:
|
||||
fix fedora-18 bug; closes #13
|
||||
|
||||
2012-09-18 12:37 marc
|
||||
|
||||
* libxml-cxx.spec.in: other dependency for fedora; refs #12
|
||||
* [r62] libxml-cxx.spec.in:
|
||||
other dependency for fedora; refs #12
|
||||
|
||||
2012-07-06 11:54 marc
|
||||
|
||||
* src/xml-cxx/xml.hxx: bugfix; refs #11
|
||||
* [r60] src/xml-cxx/xml.hxx:
|
||||
bugfix; refs #11
|
||||
|
||||
2011-12-18 11:08 marc
|
||||
|
||||
* libxml-cxx.spec.in: use %_lib in rpm spec; refs #10
|
||||
* [r56] libxml-cxx.spec.in:
|
||||
use %_lib in rpm spec; refs #10
|
||||
|
||||
2011-11-18 16:02 marc
|
||||
|
||||
* test/optional_serialization_test.cxx: add output for optional
|
||||
serialization test; closes #9
|
||||
* [r54] test/optional_serialization_test.cxx:
|
||||
add output for optional serialization test; closes #9
|
||||
|
||||
2011-11-10 10:27 marc
|
||||
|
||||
* configure.in, src/makefile.am: correct verion number; closes #5
|
||||
* [r53] configure.in, src/makefile.am:
|
||||
correct verion number; closes #5
|
||||
|
||||
2011-11-09 15:09 marc
|
||||
|
||||
* configure.in, doc/makefile.am, libxml-cxx.spec.in, makefile.am:
|
||||
* [r52] configure.in, doc/makefile.am, libxml-cxx.spec.in,
|
||||
makefile.am:
|
||||
some cleanups; closes #5
|
||||
|
||||
2011-11-09 13:31 marc
|
||||
|
||||
* doc/makefile.am, libxml-cxx.spec.in, makefile.am: supports build
|
||||
of RPM packages, tested on openSUSE; closes #5
|
||||
* [r51] doc/makefile.am, libxml-cxx.spec.in, makefile.am:
|
||||
supports build of RPM packages, tested on openSUSE; closes #5
|
||||
|
||||
2010-08-03 14:00 marc
|
||||
|
||||
* src/version.cxx.in: forgotten file, closes #6
|
||||
* [r50] src/version.cxx.in[ADD]:
|
||||
forgotten file, closes #6
|
||||
|
||||
2010-08-03 13:50 marc
|
||||
|
||||
* configure.in, src/makefile.am, src/xml-cxx/xml.hxx: closes #6
|
||||
* [r49] configure.in, src/makefile.am, src/xml-cxx/xml.hxx:
|
||||
closes #6
|
||||
|
||||
2010-06-01 13:37 marc
|
||||
|
||||
* install-32-bit-lin-win.sh: 32bit-build added, refs #5
|
||||
* [r48] install-32-bit-lin-win.sh[ADD]:
|
||||
32bit-build added, refs #5
|
||||
|
||||
2010-05-12 08:40 marc
|
||||
|
||||
* debian/changelog.in: SwissSign E-Mail, see #5
|
||||
* [r47] debian/changelog.in:
|
||||
SwissSign E-Mail, see #5
|
||||
|
||||
2010-05-12 08:30 marc
|
||||
|
||||
* debian/control: SwissSign E-Mail, see #5
|
||||
* [r46] debian/control:
|
||||
SwissSign E-Mail, see #5
|
||||
|
||||
2010-05-12 08:23 marc
|
||||
|
||||
* makefile.am: Back to chroot builds, see #5
|
||||
* [r45] makefile.am:
|
||||
Back to chroot builds, see #5
|
||||
|
||||
2010-04-26 06:37 marc
|
||||
|
||||
* configure.in, libxml-cxx.spec.in, makefile.am: started with spec
|
||||
file, refs #5
|
||||
* [r44] configure.in, libxml-cxx.spec.in[ADD], makefile.am:
|
||||
started with spec file, refs #5
|
||||
|
||||
2010-04-16 11:48 marc
|
||||
|
||||
* makefile.am: build debian for all architectures, see #5
|
||||
* [r43] makefile.am:
|
||||
build debian for all architectures, see #5
|
||||
|
||||
2010-04-15 13:51 marc
|
||||
|
||||
* debian/control: second debian package target was missing, see #5
|
||||
* [r42] debian/control:
|
||||
second debian package target was missing, see #5
|
||||
|
||||
2010-04-15 12:48 marc
|
||||
|
||||
* README, configure.in, debian, debian/changelog.in, debian/compat,
|
||||
debian/control, debian/copyright, debian/dirs, debian/docs,
|
||||
debian/libxml-cxx-dev.dirs, debian/libxml-cxx-dev.install,
|
||||
debian/libxml-cxx.dirs, debian/libxml-cxx.doc-base.EX,
|
||||
debian/libxml-cxx.install, debian/rules, debian/shlibs.local.ex,
|
||||
debian/watch.ex, makefile.am, src/libxml-cxx.pc.in,
|
||||
src/makefile.am: see #5 - done for debian
|
||||
* [r41] README, configure.in, debian[ADD],
|
||||
debian/changelog.in[ADD], debian/compat[ADD],
|
||||
debian/control[ADD], debian/copyright[ADD], debian/dirs[ADD],
|
||||
debian/docs[ADD], debian/libxml-cxx-dev.dirs[ADD],
|
||||
debian/libxml-cxx-dev.install[ADD], debian/libxml-cxx.dirs[ADD],
|
||||
debian/libxml-cxx.doc-base.EX[ADD],
|
||||
debian/libxml-cxx.install[ADD], debian/rules[ADD],
|
||||
debian/shlibs.local.ex[ADD], debian/watch.ex[ADD], makefile.am,
|
||||
src/libxml-cxx.pc.in[ADD], src/makefile.am:
|
||||
see #5 - done for debian
|
||||
|
||||
2010-03-31 15:13 marc
|
||||
|
||||
* INSTALL, doc/makefile.am, src/xml-cxx/xml.hxx, src/xml.cxx: new
|
||||
conversions
|
||||
* [r40] INSTALL, doc/makefile.am, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
new conversions
|
||||
|
||||
2009-05-06 07:22 admin
|
||||
|
||||
* doc/examples/optional_serialization.cxx, src/xml-cxx/xml.hxx:
|
||||
* [r39] doc/examples/optional_serialization.cxx,
|
||||
src/xml-cxx/xml.hxx:
|
||||
xml::Optional example added end extended
|
||||
|
||||
2009-05-06 07:13 admin
|
||||
|
||||
* doc/examples/contain_serialization.cxx, doc/examples/makefile.am,
|
||||
doc/examples/optional_serialization.cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx, test/makefile.am,
|
||||
test/optional_serialization_test.cxx: closes #1
|
||||
* [r38] doc/examples/contain_serialization.cxx,
|
||||
doc/examples/makefile.am,
|
||||
doc/examples/optional_serialization.cxx[ADD],
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx, test/makefile.am,
|
||||
test/optional_serialization_test.cxx[ADD]:
|
||||
closes #1
|
||||
|
||||
2009-05-04 14:56 admin
|
||||
|
||||
* test/container_serialization_test.cxx,
|
||||
test/serialization_test.cxx, test/xml_test.cxx: output cppunit to
|
||||
xml for bitten
|
||||
* [r37] test/container_serialization_test.cxx,
|
||||
test/serialization_test.cxx, test/xml_test.cxx:
|
||||
output cppunit to xml for bitten
|
||||
|
||||
2009-05-04 12:48
|
||||
|
||||
* COPYING: LGPL 3
|
||||
* [r36] COPYING[ADD]:
|
||||
LGPL 3
|
||||
|
||||
2009-05-04 12:47
|
||||
|
||||
* COPYING, README, doc/doxyfile.in, doc/examples/address.cxx,
|
||||
doc/examples/contain_serialization.cxx,
|
||||
* [r35] COPYING[DEL], README, doc/doxyfile.in,
|
||||
doc/examples/address.cxx, doc/examples/contain_serialization.cxx,
|
||||
doc/examples/inherit_serialization.cxx,
|
||||
doc/examples/list_serialization.cxx,
|
||||
doc/examples/node_macros.cxx, doc/examples/serialization.cxx,
|
||||
src/makefile.am, src/xml-cxx/any.hxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx, test/container_serialization_test.cxx,
|
||||
test/makefile.am: start of xml::Optional
|
||||
src/xml.cxx, test/container_serialization_test.cxx[ADD],
|
||||
test/makefile.am:
|
||||
start of xml::Optional
|
||||
|
||||
2009-04-30 15:10
|
||||
|
||||
* doc/examples/list_serialization.cxx, src/xml-cxx/any.hxx,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx: stmped
|
||||
* [r34] doc/examples/list_serialization.cxx,
|
||||
src/xml-cxx/any.hxx[ADD], src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
stmped
|
||||
|
||||
2009-04-30 08:28
|
||||
|
||||
* doc/examples/list_serialization.cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx: first approach to list - requires work -> are the
|
||||
items xml::Serialize?
|
||||
* [r33] doc/examples/list_serialization.cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx:
|
||||
first approach to list - requires work -> are the items
|
||||
xml::Serialize?
|
||||
|
||||
2009-04-29 11:58
|
||||
|
||||
* doc/examples/list_serialization.cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx: Metatemplateprogramming is really cool
|
||||
* [r32] doc/examples/list_serialization.cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx:
|
||||
Metatemplateprogramming is really cool
|
||||
|
||||
2009-04-28 07:36
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx, test/serialization_test.cxx:
|
||||
* [r31] src/xml-cxx/xml.hxx, src/xml.cxx,
|
||||
test/serialization_test.cxx:
|
||||
boost::any instead of macros - first pieces of meta template
|
||||
programming
|
||||
|
||||
2009-04-27 11:34
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx: using boost::any for storing
|
||||
member pointers to any type
|
||||
* [r30] src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
using boost::any for storing member pointers to any type
|
||||
|
||||
2009-04-27 10:59
|
||||
|
||||
* doc/examples/list_serialization.cxx: new file
|
||||
* [r29] doc/examples/list_serialization.cxx[ADD]:
|
||||
new file
|
||||
|
||||
2009-04-27 10:48
|
||||
|
||||
* doc/examples/contain_serialization.cxx,
|
||||
* [r28] doc/examples/contain_serialization.cxx,
|
||||
doc/examples/inherit_serialization.cxx, doc/examples/makefile.am,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx, test/serialization_test.cxx:
|
||||
serialization works for containment and inheritance
|
||||
|
||||
2009-04-24 15:12
|
||||
|
||||
* doc/examples/contain_serialization.cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx: containment can be serialized
|
||||
* [r27] doc/examples/contain_serialization.cxx,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
containment can be serialized
|
||||
|
||||
2009-04-24 07:13
|
||||
|
||||
* doc/examples/contain_serialization.cxx,
|
||||
* [r26] doc/examples/contain_serialization.cxx[ADD],
|
||||
doc/examples/inherit_serialization.cxx, doc/examples/makefile.am,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx, test/serialization_test.cxx:
|
||||
serialization nearly ready for containment
|
||||
|
||||
2009-04-23 15:10
|
||||
|
||||
* doc/examples/inherit_serialization.cxx,
|
||||
* [r25] doc/examples/inherit_serialization.cxx[ADD],
|
||||
doc/examples/serialization.cxx, src/xml-cxx/xml.hxx, src/xml.cxx,
|
||||
test/serialization_test.cxx: better serialization, but test does
|
||||
not work actually
|
||||
test/serialization_test.cxx[ADD]:
|
||||
better serialization, but test does not work actually
|
||||
|
||||
2009-04-23 06:41
|
||||
|
||||
* doc/examples/address.cxx, doc/examples/node_macros.cxx,
|
||||
doc/examples/serialization.cxx, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
* [r24] doc/examples/address.cxx,
|
||||
doc/examples/node_macros.cxx[ADD],
|
||||
doc/examples/serialization.cxx[ADD], src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx:
|
||||
node macros added (usefule but unfinished)
|
||||
|
||||
2009-04-22 16:10
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx, test/makefile.am,
|
||||
test/xml_test.cxx: serialization; more docu
|
||||
* [r23] src/xml-cxx/xml.hxx, src/xml.cxx, test/makefile.am,
|
||||
test/xml_test.cxx:
|
||||
serialization; more docu
|
||||
|
||||
2009-04-22 08:25
|
||||
|
||||
* AUTHORS, README, configure.in, doc/doxyfile.in, doc/examples,
|
||||
doc/examples/address.cxx, doc/examples/makefile.am,
|
||||
doc/makefile.am, src/makefile.am, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx: more docu
|
||||
* [r22] AUTHORS, README, configure.in, doc/doxyfile.in,
|
||||
doc/examples[ADD], doc/examples/address.cxx[ADD],
|
||||
doc/examples/makefile.am[ADD], doc/makefile.am, src/makefile.am,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
more docu
|
||||
|
||||
2009-04-21 07:12
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx: more docu
|
||||
* [r21] src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
more docu
|
||||
|
||||
2009-04-20 06:42
|
||||
|
||||
* doc/doxyfile.in, src/xml-cxx/xml.hxx, src/xml.cxx: more docu;
|
||||
other behaviour for parent
|
||||
* [r20] doc/doxyfile.in, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
more docu; other behaviour for parent
|
||||
|
||||
2009-04-09 14:11
|
||||
|
||||
* src/xml.cxx: pretty print
|
||||
* [r19] src/xml.cxx:
|
||||
pretty print
|
||||
|
||||
2009-04-09 13:32
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx: pretty print for templates
|
||||
* [r18] src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
pretty print for templates
|
||||
|
||||
2009-04-09 10:53
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx: check node
|
||||
number limits
|
||||
* [r17] src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx:
|
||||
check node number limits
|
||||
|
||||
2009-04-09 07:01
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx: new tests,
|
||||
cleanup, prepared for node-limits
|
||||
* [r16] src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx:
|
||||
new tests, cleanup, prepared for node-limits
|
||||
|
||||
2009-04-08 15:01
|
||||
|
||||
* install-64-and-32-bit-linux.sh, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
* [r15] install-64-and-32-bit-linux.sh, src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx:
|
||||
extendions and corrections
|
||||
|
||||
2009-04-08 06:44
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx: much more
|
||||
tests; all exceptions in readin tested
|
||||
* [r14] src/xml-cxx/xml.hxx, src/xml.cxx, test/xml_test.cxx:
|
||||
much more tests; all exceptions in readin tested
|
||||
|
||||
2009-04-07 14:58
|
||||
|
||||
* src/xml.cxx: fixed empty attribute reading bug
|
||||
* [r13] src/xml.cxx:
|
||||
fixed empty attribute reading bug
|
||||
|
||||
2009-04-07 14:31
|
||||
|
||||
* configure.in, doc/makefile.am, install-64-and-32-bit-linux.sh,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx: some bugfixes
|
||||
* [r12] configure.in, doc/makefile.am,
|
||||
install-64-and-32-bit-linux.sh, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
some bugfixes
|
||||
|
||||
2009-04-07 06:59
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx: documentation
|
||||
* [r11] src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
documentation
|
||||
|
||||
2009-04-06 14:57
|
||||
|
||||
* install-64-and-32-bit-linux.sh, src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
* [r10] install-64-and-32-bit-linux.sh[ADD], src/xml-cxx/xml.hxx,
|
||||
src/xml.cxx:
|
||||
get list of child nodes
|
||||
|
||||
2009-04-06 07:08
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx: some documentation and new
|
||||
feartures for attributes
|
||||
* [r9] src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
some documentation and new feartures for attributes
|
||||
|
||||
2009-04-03 14:02
|
||||
|
||||
* src/xml-cxx/xml.hxx, src/xml.cxx: UnsingedInteger
|
||||
* [r8] src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
UnsingedInteger
|
||||
|
||||
2009-04-03 07:07
|
||||
|
||||
* doc/doxyfile.in, doc/makefile.am, makefile.am,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx: Accept but ignore special tags:
|
||||
<!, <?; Start of class UnsingedInteger; success: make distcheck
|
||||
* [r7] doc/doxyfile.in, doc/makefile.am, makefile.am,
|
||||
src/xml-cxx/xml.hxx, src/xml.cxx:
|
||||
Accept but ignore special tags: <!, <?; Start of class
|
||||
UnsingedInteger; success: make distcheck
|
||||
|
||||
2009-04-02 14:54
|
||||
|
||||
* doc/makefile.am: rebuild possible after clean
|
||||
* [r6] doc/makefile.am:
|
||||
rebuild possible after clean
|
||||
|
||||
2009-04-02 14:47
|
||||
|
||||
* doc/makefile.am, src/makefile.am, src/xml.cxx, test/xml_test.cxx:
|
||||
* [r5] doc/makefile.am, src/makefile.am, src/xml.cxx,
|
||||
test/xml_test.cxx:
|
||||
nearly distclean
|
||||
|
||||
2009-04-02 14:36
|
||||
|
||||
* configure.in, doc/makefile.am, src/xml-cxx, src/xml-cxx/xml.hxx,
|
||||
src/xml.hxx: Zwischenstand
|
||||
* [r4] configure.in, doc/makefile.am, src/xml-cxx[ADD],
|
||||
src/xml-cxx/xml.hxx[CPY], src/xml.hxx[DEL]:
|
||||
Zwischenstand
|
||||
|
||||
2009-04-02 14:01
|
||||
|
||||
* COPYING, INSTALL, configure.in, doc/makefile.am, src/makefile.am,
|
||||
test/makefile.am: first working and tested release
|
||||
* [r3] COPYING[ADD], INSTALL[ADD], configure.in, doc/makefile.am,
|
||||
src/makefile.am, test/makefile.am[ADD]:
|
||||
first working and tested release
|
||||
|
||||
2009-04-02 13:24
|
||||
|
||||
* AUTHORS, ChangeLog, NEWS, README, bootstrap.sh, configure.in,
|
||||
doc, doc/doxyfile.in, doc/makefile.am, makefile.am, src,
|
||||
src/makefile.am, src/xml.cxx, src/xml.hxx, test,
|
||||
test/xml_test.cxx: import
|
||||
* [r2] AUTHORS[ADD], ChangeLog[ADD], NEWS[ADD], README[ADD],
|
||||
bootstrap.sh[ADD], configure.in[ADD], doc[ADD],
|
||||
doc/doxyfile.in[ADD], doc/makefile.am[ADD], makefile.am[ADD],
|
||||
src[ADD], src/makefile.am[ADD], src/xml.cxx[ADD],
|
||||
src/xml.hxx[ADD], test[ADD], test/xml_test.cxx[ADD]:
|
||||
import
|
||||
|
||||
2009-04-02 11:50
|
||||
|
||||
* .: start
|
||||
* [r1] .[ADD]:
|
||||
start
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
|
||||
|
||||
# define least version number from subversion's revision number:
|
||||
# it is taken modulo 256 due to a bug on Apple's SX
|
||||
# it is taken modulo 256 due to a bug on Apple's MaxOSX
|
||||
m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
|
||||
m4_ifdef([x_least_diff],
|
||||
mrw_esyscmd_s([
|
||||
@@ -36,10 +36,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
|
||||
fi
|
||||
done
|
||||
# Mac does not support LEAST > 255
|
||||
echo $ECHO_N $(($VCS_REVISION%256))
|
||||
])
|
||||
)
|
||||
))
|
||||
echo $ECHO_N $(($VCS_REVISION%256))]))))
|
||||
|
||||
# define version number from subversion's revision number:
|
||||
# it is taken modulo 256 due to a bug on Apple's MacOSX
|
||||
@@ -57,8 +54,8 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
|
||||
fi;
|
||||
done
|
||||
# Mac does not support LEAST > 255
|
||||
echo $ECHO_N $(($VCS_REVISION/256))
|
||||
])))
|
||||
echo $ECHO_N $(($VCS_REVISION/256))])))
|
||||
|
||||
# setup version number
|
||||
m4_define(x_version, [x_major.m4_ifdef([x_least_diff], x_minor, m4_eval(x_minor+x_minor_diff)).m4_eval(m4_ifdef([x_least_diff], [x_least-x_least_diff], [x_least]))])
|
||||
|
||||
@@ -196,19 +193,35 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
COPYING=$(<COPYING)
|
||||
AX_SUBST(COPYING)
|
||||
_AM_SUBST_NOTMAKE([COPYING])
|
||||
CHANGELOG=$(<ChangeLog)
|
||||
AC_SUBST(CHANGELOG)
|
||||
_AM_SUBST_NOTMAKE([CHANGELOG])
|
||||
DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t, ,g;/^ \* /{s,,,;H;g;s,^, * ,;s,\n\([[^ ]]*\) *, \1\n ,}' ChangeLog)
|
||||
if test -z "$DEB_CHANGELOG"; then
|
||||
DEB_CHANGELOG=" * see file ChangeLog and project management web site"
|
||||
fi
|
||||
AC_SUBST(DEB_CHANGELOG)
|
||||
_AM_SUBST_NOTMAKE([DEB_CHANGELOG])
|
||||
AUTHOR=$(head -1 AUTHORS)
|
||||
AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
|
||||
AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
|
||||
AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
|
||||
PACKAGER=$(gpg -K --display-charset utf-8 --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
|
||||
if test -z "${PACKAGER}"; then
|
||||
PACKAGER="$AUTHOR"
|
||||
fi
|
||||
AX_SUBST(AUTHOR)
|
||||
_AM_SUBST_NOTMAKE([AUTHOR])
|
||||
AX_SUBST(AUTHOR_NAME)
|
||||
AX_SUBST(AUTHOR_URL)
|
||||
AX_SUBST(AUTHOR_MAIL)
|
||||
AX_SUBST(PACKAGER)
|
||||
PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
|
||||
SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
|
||||
AX_SUBST(PROJECT_URL)
|
||||
AX_SUBST(SOURCE_DOWNLOAD)
|
||||
VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
|
||||
AX_SUBST(VENDOR)
|
||||
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
|
||||
AX_SUBST(DISTRO)
|
||||
ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
|
||||
@@ -411,7 +424,7 @@ EOF
|
||||
|
||||
# use this in configure.ac to support CppUnit for C++ unit tests
|
||||
AC_DEFUN([AX_USE_CPPUNIT], [
|
||||
AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
|
||||
PKG_CHECK_MODULES(CPPUNIT, cppunit, [have_cppunit="yes"], [have_cppunit="no"])
|
||||
# infos and warnings
|
||||
if test "$have_cppunit" = "no"; then
|
||||
AC_MSG_WARN([Missing cppunit development library!
|
||||
@@ -432,8 +445,23 @@ maintainer-clean-example-targets:
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support C++ examples
|
||||
# use this in configure.ac to support NodeJS
|
||||
AC_DEFUN([AX_USE_NODEJS], [
|
||||
AC_PATH_PROG(ANDROID, [android], [0],
|
||||
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
|
||||
AC_CONFIG_FILES([nodejs/package.json])
|
||||
AC_CONFIG_FILES([nodejs/makefile])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
|
||||
test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
maintainer-clean-nodejs-targets:
|
||||
-rm makefile.in
|
||||
#### End: $0
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support Cordova
|
||||
AC_DEFUN([AX_USE_CORDOVA], [
|
||||
AC_PATH_PROG(ANDROID, [android], [0],
|
||||
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
|
||||
AC_PATH_PROG(CORDOVA, [cordova], [0],
|
||||
@@ -446,14 +474,13 @@ AC_DEFUN([AX_USE_NODEJS], [
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
|
||||
AX_SUBST(CORDOVA)
|
||||
AC_CONFIG_FILES([nodejs/package.json])
|
||||
AC_CONFIG_FILES([nodejs/makefile])
|
||||
AC_CONFIG_FILES([cordova/makefile])
|
||||
AC_CONFIG_FILES([cordova/config.xml])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [examples/makefile.in])
|
||||
test -f examples/makefile.in && cat >> examples/makefile.in <<EOF
|
||||
EOF
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cordova-targets], [cordova/makefile.in])
|
||||
test -f cordova/makefile.in && cat >> cordova/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
maintainer-clean-example-targets:
|
||||
maintainer-clean-cordova-targets:
|
||||
-rm makefile.in
|
||||
#### End: $0
|
||||
EOF
|
||||
@@ -535,6 +562,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
|
||||
EXTRA_DIST += \${PACKAGE_NAME}.spec.in
|
||||
rpm: dist
|
||||
rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
|
||||
rpmsign --define "_gpg_name \${PACKAGER}" --addsign RPMS/*/*.rpm SRPMS/*.rpm
|
||||
clean-rpm-targets:
|
||||
-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
|
||||
distclean-rpm-targets:
|
||||
@@ -599,7 +627,7 @@ doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
|
||||
|
||||
clean-documentation:
|
||||
-rm doxygen.errors @PDF_DOC@
|
||||
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images doxygen_sqlite3.db
|
||||
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
|
||||
distclean-documentation:
|
||||
-rm -r html
|
||||
-rm @PACKAGE_NAME@.doxytag
|
||||
@@ -621,7 +649,7 @@ AC_DEFUN([AX_USE_PERLDOC], [
|
||||
PERL_SOURCES="m4_default([$1], [perl])"
|
||||
AX_SUBST(PERL_SOURCES)
|
||||
if test -z "$PERL_SOURCES"; then
|
||||
AC_MSG_ERROR([You must specify the path to per files
|
||||
AC_MSG_ERROR([You must specify the path to perl files
|
||||
- use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
|
||||
AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
|
||||
if test "$have_doxygen" = "no"; then
|
||||
|
||||
418
bootstrap.sh
418
bootstrap.sh
@@ -149,6 +149,22 @@ GENERATED FILES
|
||||
* src/version.cxx - if you enabled AX_USE_CXX
|
||||
* html/makefile.am - if you enabled AX_BUILD_HTML
|
||||
* scripts/makefile.am - if you enabled AX_USE_SCRIPTS
|
||||
* nodejs/makefile.am - if you add AX_USE_NODEJS
|
||||
* nodejs/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
|
||||
* nodejs/package.json.in - if you add AX_USE_NODEJS
|
||||
* nodejs/etc/${DEFAULT_PROJECT_NAME}.json - if you add AX_USE_NODEJS
|
||||
* nodejs/etc/default/${DEFAULT_PROJECT_NAME} - if you add AX_USE_NODEJS
|
||||
* nodejs/etc/init/${DEFAULT_PROJECT_NAME}.conf - if you add AX_USE_NODEJS
|
||||
* nodejs/etc/systemd/system/${DEFAULT_PROJECT_NAME}.service - if you add AX_USE_NODEJS
|
||||
* nodejs/public - if you add AX_USE_NODEJS
|
||||
* nodejs/public/images - if you add AX_USE_NODEJS
|
||||
* nodejs/public/javascripts/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
|
||||
* nodejs/public/stylesheets/style.styl - if you add AX_USE_NODEJS
|
||||
* nodejs/routes/index.js - if you add AX_USE_NODEJS
|
||||
* nodejs/sockets/index.js - if you add AX_USE_NODEJS
|
||||
* nodejs/views/index.ejs - if you add AX_USE_NODEJS
|
||||
* nodejs/views/layout.ejs - if you add AX_USE_NODEJS
|
||||
* nodejs/node_modules - if you add AX_USE_NODEJS
|
||||
* doc/makefile.am - if you enabled AX_USE_DOXYGEN or AX_USE_PERLDOC
|
||||
* doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
|
||||
* doc/header.html.in - if you enabled AX_USE_DOXYGEN
|
||||
@@ -242,6 +258,7 @@ FILES
|
||||
* Enable C++: AX_USE_CXX
|
||||
* Enable LibTool library creation: AX_USE_LIBTOOL
|
||||
* Enable Scripts: AX_USE_SCRIPTS
|
||||
* Enable NodeJS project: AX_USE_NODEJS
|
||||
* Enable Doxygen documentation generation: AX_USE_DOXYGEN
|
||||
* Enable Perldoc documentation generation: AX_USE_PERLDOC
|
||||
* Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
|
||||
@@ -284,11 +301,13 @@ VCS=""
|
||||
VCSDEPENDS=""
|
||||
if test -d .svn; then
|
||||
VCS="svn"
|
||||
VCSDEPENDS="subversion,"
|
||||
VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
|
||||
VCSDEPENDS_RPM="subversion, subversion-tools,"
|
||||
echo -e " \e[32msuccess\e[0m detected ${VCS}"
|
||||
elif test -d .git; then
|
||||
VCS="git"
|
||||
VCSDEPENDS="git,"
|
||||
VCSDEPENDS_DEB="git2cl, git,"
|
||||
VCSDEPENDS_RPM="git,"
|
||||
echo -e " \e[32msuccess\e[0m detected ${VCS}"
|
||||
else
|
||||
echo -e " \e[33mignored\e[0m"
|
||||
@@ -487,6 +506,8 @@ vcs2cl() {
|
||||
if test -x $(which ${VCS}2cl); then
|
||||
if test "${VCS}" = "git"; then
|
||||
${VCS}2cl > ChangeLog
|
||||
elif test "${VCS}" = "svn"; then
|
||||
${VCS}2cl --break-before-msg -a -i
|
||||
elif test -n "${VCS}"; then
|
||||
${VCS}2cl
|
||||
fi
|
||||
@@ -518,7 +539,7 @@ copy build-in-docker.sh
|
||||
copy build-resource-file.sh
|
||||
copy sql-to-dot.sed
|
||||
copy mac-create-app-bundle.sh
|
||||
AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1)
|
||||
AUTHOR=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1)
|
||||
if test -z "${AUTHOR}"; then
|
||||
AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
|
||||
fi
|
||||
@@ -550,6 +571,7 @@ AX_INIT_STANDARD_PROJECT
|
||||
#AX_USE_CXX
|
||||
#AX_USE_LIBTOOL
|
||||
#AX_USE_SCRIPTS
|
||||
#AX_USE_NODEJS
|
||||
#AX_USE_DOXYGEN
|
||||
#AX_USE_PERLDOC
|
||||
#AX_USE_DEBIAN_PACKAGING
|
||||
@@ -837,6 +859,349 @@ ${HEADER}dist_bin_SCRIPTS =
|
||||
|
||||
MAINTAINERCLEANFILES = makefile.in
|
||||
EOF
|
||||
if testtag AX_USE_NODEJS; then
|
||||
checkdir nodejs
|
||||
checkdir nodejs/public
|
||||
checkdir nodejs/public/images
|
||||
checkdir nodejs/etc
|
||||
checkdir nodejs/etc/systemd
|
||||
fi
|
||||
to --condition AX_USE_NODEJS nodejs/makefile.am <<EOF
|
||||
${HEADER}EXTRA_DIST = @PACKAGE_NAME@.js package.json.in public routes sockets views
|
||||
|
||||
nodejsdir = \${pkgdatadir}/nodejs
|
||||
|
||||
sysconfdefaultdir = \${sysconfdir}/default
|
||||
sysconfinitdir = \${sysconfdir}/init
|
||||
dist_sysconf_DATA = etc/@PACKAGE_NAME@.json
|
||||
dist_sysconfdefault_DATA = etc/default/@PACKAGE_NAME@
|
||||
dist_sysconfinit_DATA = etc/init/@PACKAGE_NAME@.conf
|
||||
|
||||
all: node_modules
|
||||
|
||||
node_modules: package.json.in
|
||||
HOME=. npm install
|
||||
|
||||
clean-local:
|
||||
-rm -r node_modules .npm
|
||||
|
||||
install-data-hook:
|
||||
test -d \$(DESTDIR)\${nodejsdir} || mkdir -p \$(DESTDIR)\${nodejsdir}
|
||||
chmod -R u+w \$(DESTDIR)\${nodejsdir}
|
||||
cp -r . \$(DESTDIR)\${nodejsdir}
|
||||
|
||||
uninstall-local:
|
||||
-chmod -R u+w \$(DESTDIR)\${nodejsdir}
|
||||
-rm -rf \$(DESTDIR)\${nodejsdir}
|
||||
|
||||
MAINTAINERCLEANFILES = makefile.in
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/${PACKAGE_NAME}.js <<EOF
|
||||
${CHEADER}try {
|
||||
|
||||
process.on('uncaughtException', function(e) {
|
||||
console.log("**** UNCAUGHT EXCEPTION ****");
|
||||
console.log(e);
|
||||
console.log(e.stack);
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var express = require('express')
|
||||
, routes = require(__dirname+'/routes');
|
||||
|
||||
var app = module.exports = express.createServer();
|
||||
var io = require('socket.io').listen(app);
|
||||
var package = require(__dirname+'/package.json');
|
||||
var config = require(package.path.config);
|
||||
var authentication = require(__dirname+'/authentication')(config.restrict);
|
||||
var sockets = require(__dirname+'/sockets')(io, authentication);
|
||||
|
||||
// Configuration
|
||||
process.argv.forEach(function(val, index) {
|
||||
if (index<2) {return}
|
||||
if (index!=2 || isNaN(val)) {
|
||||
console.log("**** ERROR: Unexpected Argument - allowed is only a port number");
|
||||
process.exit(1);
|
||||
}
|
||||
config.port = parseInt(val);
|
||||
});
|
||||
if (typeof config.port != 'number') {
|
||||
console.log("**** WARNING: no valid port given, defaults to 8888");
|
||||
config.port = 8888;
|
||||
}
|
||||
|
||||
app.configure(function(){
|
||||
app.set('views', __dirname + '/views');
|
||||
app.set('view engine', 'ejs');
|
||||
app.use(express.bodyParser());
|
||||
app.use(express.methodOverride());
|
||||
app.use(require('stylus').middleware({ src: __dirname + '/public' }));
|
||||
app.use(app.router);
|
||||
app.use(express.static(__dirname + '/public'));
|
||||
});
|
||||
|
||||
app.configure('development', function(){
|
||||
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
|
||||
});
|
||||
|
||||
app.configure('production', function(){
|
||||
app.use(express.errorHandler());
|
||||
});
|
||||
|
||||
// Routes
|
||||
app.get('/', routes.index);
|
||||
|
||||
app.listen(config.port, function() {
|
||||
console.log("Express server listening on port %d in %s mode",
|
||||
app.address().port, app.settings.env);
|
||||
});
|
||||
} catch (e) {
|
||||
console.log("**** EXCEPTION ****");
|
||||
console.log(e);
|
||||
console.log(e.stack);
|
||||
process.exit(1);
|
||||
}
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/package.json.in <<EOF
|
||||
{
|
||||
"name": "@PACKAGE_NAME@",
|
||||
"version": "@PACKAGE_VERSION@",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"express": "~2.5.8",
|
||||
"stylus": "~0.53.0",
|
||||
"ejs": ">= 0.0.1",
|
||||
"socket.io": "~1.4.4",
|
||||
"socketio-auth": "0.0.5",
|
||||
"ldapauth": "git+https://github.com/DimensionSoftware/node-ldapauth.git"
|
||||
},
|
||||
"description": "@DESCRIPTION@",
|
||||
"main": "@PACKAGE_NAME@.js",
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"author": "@AUTHOR@",
|
||||
"license": "@LICENSE@",
|
||||
"path": {
|
||||
"prefix": "@PREFIX@",
|
||||
"sysconf": "@SYSCONFDIR@",
|
||||
"pkgdata": "@PKGDATADIR@",
|
||||
"localstate": "@LOCALSTATEDIR@",
|
||||
"log": "@LOCALSTATEDIR@/log/@PACKAGE_NAME@.log",
|
||||
"config": "@SYSCONFDIR@/@PACKAGE_NAME@.json",
|
||||
"nodejs": "@PKGDATADIR@/nodejs"
|
||||
}
|
||||
}
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
|
||||
{
|
||||
"port": 8888,
|
||||
"restrict": {
|
||||
"passwords": {
|
||||
"foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
|
||||
},
|
||||
"ldap": {
|
||||
"url": "ldap://dev.marc.waeckerlin.org",
|
||||
"adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
|
||||
"adminPassword": "secret",
|
||||
"searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
|
||||
"searchFilter": "(uid={{username}})"
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
|
||||
#EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
|
||||
#${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME^^}.log"
|
||||
#${PACKAGE_NAME^^}="${PACKAGE_NAME}"
|
||||
#${PACKAGE_NAME^^}_PORT="8888"
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/etc/init/${PACKAGE_NAME}.conf <<EOF
|
||||
#!upstart
|
||||
description "$(head -1 README)"
|
||||
author "$(head -1 AUTHORS)"
|
||||
|
||||
start on (local-filesystems and net-device-up)
|
||||
stop on runlevel [!2345]
|
||||
|
||||
respawn
|
||||
|
||||
script
|
||||
echo \$\$ > /var/run/${PACKAGE_NAME}.pid
|
||||
# there are some useful defaults
|
||||
# do not edit this file, overwrite values in /etc/default/${PACKAGE_NAME}
|
||||
EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
|
||||
${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
|
||||
${PACKAGE_NAME^^}_USER="${PACKAGE_NAME}"
|
||||
${PACKAGE_NAME^^}_PORT=""
|
||||
[ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
|
||||
if test -n "\${${PACKAGE_NAME^^}_USER}"; then
|
||||
exec sudo -u "\${${PACKAGE_NAME^^}_USER}" \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
|
||||
else
|
||||
exec \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
|
||||
fi
|
||||
end script
|
||||
|
||||
pre-start script
|
||||
${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
|
||||
[ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
|
||||
# Date format same as (new Date()).toISOString() for consistency
|
||||
echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME^^}_LOG}
|
||||
end script
|
||||
|
||||
pre-stop script
|
||||
${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
|
||||
[ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
|
||||
rm /var/run/${PACKAGE_NAME}.pid
|
||||
echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME^^}_LOG}
|
||||
end script
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/etc/systemd/system/${PACKAGE_NAME}.service <<EOF
|
||||
[Unit]
|
||||
Description=$(head -1 README)
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME} > /var/log/${PACKAGE_NAME}.log
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/public/javascripts/${PACKAGE_NAME}.js <<EOF
|
||||
${CHEADER}var socket = null;
|
||||
function init() {
|
||||
socket = io.connect();
|
||||
/*
|
||||
socket
|
||||
.io
|
||||
.on("connect", connect)
|
||||
.on("reconnect", connect)
|
||||
.on("disconnect", disconnected)
|
||||
.on("error", disconnected);
|
||||
socket
|
||||
.on("authenticated", authenticated)
|
||||
.on("unauthorized", unauthorized)
|
||||
.on("fail", error);
|
||||
*/
|
||||
}
|
||||
|
||||
/// On Load, Call @ref start
|
||||
/*
|
||||
\$(window.onbeforeunload = function() {
|
||||
return "Are you sure you want to navigate away?";
|
||||
});
|
||||
*/
|
||||
\$(init);
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/public/stylesheets/style.styl <<EOF
|
||||
body
|
||||
padding: 50px
|
||||
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif
|
||||
a
|
||||
color: #00B7FF
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/routes/index.js <<EOF
|
||||
${CHEADER}var package = require(__dirname+"/../package.json");
|
||||
|
||||
exports.index = function(req, res) {
|
||||
res.render('index', {
|
||||
packagename: package.name,
|
||||
packageversion: package.version
|
||||
});
|
||||
};
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/sockets/index.js <<EOF
|
||||
module.exports = function(io, authentication) {
|
||||
|
||||
var module={};
|
||||
|
||||
function broadcast(signal, data) {
|
||||
console.log("<= signal: "+signal);
|
||||
io.sockets.emit(signal, data);
|
||||
}
|
||||
|
||||
function fail(txt, data) {
|
||||
console.log("** "+txt, data);
|
||||
}
|
||||
|
||||
function connection(socket, userdata) {
|
||||
|
||||
console.log("=> new connection from "+userdata.username);
|
||||
|
||||
function emit(signal, data, info) {
|
||||
if (typeof data == 'string' && !data.match("\n")) {
|
||||
console.log("<- signal: "+signal+"("+data+")");
|
||||
} else {
|
||||
console.log("<- signal: "+signal);
|
||||
}
|
||||
if (info) console.log(info);
|
||||
socket.emit(signal, data);
|
||||
}
|
||||
|
||||
function fail(txt, data) {
|
||||
console.log("** "+txt, data);
|
||||
emit("fail", txt);
|
||||
}
|
||||
|
||||
/*
|
||||
socket
|
||||
.on("xxx", xxx)
|
||||
.on("yyy", yyy;
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
// Handle Connection
|
||||
require('socketio-auth')(io, {
|
||||
authenticate: function (socket, data, callback) {
|
||||
console.log("=> authenticate: ", data.username);
|
||||
//get credentials sent by the client
|
||||
var username = data.username;
|
||||
var password = data.password;
|
||||
authentication(data.username, data.password,
|
||||
function() {
|
||||
console.log("####LOGIN-SUCESS####");
|
||||
callback(null, true)
|
||||
},
|
||||
function() {
|
||||
console.log("####LOGIN-FAIL####");
|
||||
callback(new Error("wrong credentials"))
|
||||
});
|
||||
},
|
||||
postAuthenticate: connection,
|
||||
timeout: "none"
|
||||
});
|
||||
|
||||
return module;
|
||||
}
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/views/index.ejs <<EOF
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width initial-scale=1" />
|
||||
<link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
|
||||
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
|
||||
<script type="text/javascript" src="javascripts/${PACKAGE_NAME}.js"></script>
|
||||
<title>$(head -1 README)</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>$(head -1 README)</h1>
|
||||
<p>generated by bootstrap, please edit</p>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
EOF
|
||||
to --condition AX_USE_NODEJS nodejs/views/layout.ejs <<EOF
|
||||
<%- body %>
|
||||
EOF
|
||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition 'AX_USE_DOXYGEN|AX_USE_PERLDOC' doc/makefile.am
|
||||
if testtag AX_BUILD_TEST; then
|
||||
to test/runtests.sh < ${0%/*}/test/runtests.sh
|
||||
@@ -1096,15 +1461,15 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
|
||||
to debian/changelog.in <<EOF
|
||||
@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
|
||||
|
||||
* Please see ChangeLog of @PACKAGE@
|
||||
@DEB_CHANGELOG@
|
||||
|
||||
-- @AUTHOR@ @BUILD_DATE@
|
||||
-- @PACKAGER@ @BUILD_DATE@
|
||||
EOF
|
||||
BUILD_DEPENDS="debhelper, ${VCSDEPENDS} 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)"
|
||||
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)"
|
||||
to debian/control.in <<EOF
|
||||
Source: @PACKAGE_NAME@
|
||||
Priority: extra
|
||||
Maintainer: @AUTHOR@
|
||||
Maintainer: @PACKAGER@
|
||||
Build-Depends: ${BUILD_DEPENDS}
|
||||
|
||||
Package: @PACKAGE_NAME@
|
||||
@@ -1171,9 +1536,15 @@ else
|
||||
fi)
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
|
||||
BuildRequires: gnupg, ${VCSDEPENDS_RPM} make, automake, autoconf, rpm-build$(
|
||||
if testtag AX_USE_CXX; then
|
||||
echo -n ", binutils-devel, gcc-c++"
|
||||
fi
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libtool";
|
||||
fi
|
||||
if testtag AX_USE_DOXYGEN; then
|
||||
echo -n ", doxygen, default-jre-headless";
|
||||
echo -n ", doxygen, java-openjdk";
|
||||
fi
|
||||
if testtag AX_USE_PERLDOC; then
|
||||
echo -n ", libpod-tree-perl";
|
||||
@@ -1182,11 +1553,28 @@ BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
|
||||
%if 0%{?fedora} != 20
|
||||
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
||||
BuildRequires: pkgconfig, redhat-lsb$(
|
||||
if testtag AX_USE_CPPUNIT; then
|
||||
echo -n ", cppunit-devel";
|
||||
fi)
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
|
||||
BuildRequires: which, pkgconfig$(
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", cppunit-devel"
|
||||
fi
|
||||
)
|
||||
%if 0%{?rhel} > 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia}
|
||||
BuildRequires: rpm-sign
|
||||
%endif
|
||||
%if 0%{?mageia}
|
||||
BuildRequires: gnupg, lsb-release$(
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libltdl-devel"
|
||||
fi
|
||||
)
|
||||
%else
|
||||
BuildRequires: gpg, redhat-lsb$(
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libtool-ltdl-devel"
|
||||
fi
|
||||
)
|
||||
%endif
|
||||
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
|
||||
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
|
||||
@@ -1305,7 +1693,7 @@ for d in src test scripts doc examples html; do
|
||||
done
|
||||
to --mode "u=rwx,g=rwx,o=rx" autogen.sh <<EOF
|
||||
#!/bin/bash -e
|
||||
if test -n "$VCS" -a -d .$VCS -a -e -x $(which ${VCS}2cl); then
|
||||
if test -n "$VCS" -a -d ".$VCS" -a -e -x "\$(which ${VCS}2cl)"; then
|
||||
$(case "$VCS" in
|
||||
(svn) echo " ${VCS}2cl";;
|
||||
(git) echo " ${VCS}2cl > ChangeLog";;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
repos+=("Debian|Ubuntu-precise::::::universe")
|
||||
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
|
||||
repos+=("https://dev.marc.waeckerlin.org/repository")
|
||||
repos+=("Ubuntu:::universe")
|
||||
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")
|
||||
envs+=("-e 'HOME=${HOME}'")
|
||||
dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
|
||||
packages+=("Debian-sid:::mrw-c\\+\\+")
|
||||
|
||||
@@ -2,15 +2,20 @@
|
||||
set -o errtrace
|
||||
|
||||
# build and test everything in a fresh docker installation
|
||||
mode="apt"
|
||||
myarch=$(dpkg --print-architecture)
|
||||
if test "${arch}" = "amd64"; then
|
||||
myarch="amd64|i386"
|
||||
fi
|
||||
mode="deb"
|
||||
img="ubuntu:latest"
|
||||
repos=()
|
||||
keys=()
|
||||
envs=("-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
|
||||
dirs=("-v $(pwd):/workdir")
|
||||
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")
|
||||
packages=()
|
||||
targets="all check distcheck"
|
||||
commands=()
|
||||
arch=$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)
|
||||
wait=0
|
||||
if test -e ./build-in-docker.conf; then
|
||||
# you can preconfigure the variables in file build-in-docker.conf
|
||||
@@ -25,8 +30,9 @@ while test $# -gt 0; do
|
||||
echo "OPTIONS:"
|
||||
echo
|
||||
echo " -h, --help show this help"
|
||||
echo " -m, --mode <type> mode: apt or yum, default: ${mode}"
|
||||
echo " -m, --mode <type> mode: deb, rpm, default: ${mode}"
|
||||
echo " -i, --image <image> use given docker image instead of ${img}"
|
||||
echo " -a, --arch <arch> build for given hardware architecture"
|
||||
echo " -t, --targets targets specify build targets, default: ${targets}"
|
||||
echo " -r, --repo <url> add given apt repository"
|
||||
echo " -k, --key <url> add public key from url"
|
||||
@@ -37,6 +43,8 @@ while test $# -gt 0; do
|
||||
echo " -w, --wait on error keep docker container and wait for enter"
|
||||
echo
|
||||
echo " The option -i must be after -m, because mode sets a new default image"
|
||||
echo " The option -m must be after -t, because mode may be auto detected from targets"
|
||||
echo " If target is either deb or rpm, mode is set to the same value"
|
||||
echo
|
||||
echo " The options -r -k -e -d -p -c can be repeated several times."
|
||||
echo
|
||||
@@ -67,8 +75,10 @@ while test $# -gt 0; do
|
||||
(-m|--mode) shift;
|
||||
mode="$1"
|
||||
case "$mode" in
|
||||
(apt) img="ubuntu:latest";;
|
||||
(deb|apt) img="ubuntu:latest";;
|
||||
(rpm|zypper) img="opensuse:latest";;
|
||||
(yum) img="centos:latest";;
|
||||
(dnf) img="fedora:latest";;
|
||||
(*)
|
||||
echo "**** ERROR: unknown mode '$1', try --help" 1>&2
|
||||
exit 1
|
||||
@@ -78,8 +88,16 @@ while test $# -gt 0; do
|
||||
(-i|--image) shift;
|
||||
img="$1"
|
||||
;;
|
||||
(-t|--targets) shift;
|
||||
(-a|--arch) shift;
|
||||
arch="$1"
|
||||
;;
|
||||
(-t|--targets) shift
|
||||
targets="$1"
|
||||
if test "$1" = "deb" -o "$1" = "rpm"; then
|
||||
# set mode to same value
|
||||
set -- "-m" $@
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
(-r|--repo) shift;
|
||||
repos+=("$1")
|
||||
@@ -140,7 +158,8 @@ function traperror() {
|
||||
read
|
||||
fi
|
||||
echo -n " ... cleanup docker: "
|
||||
docker rm -f "${DOCKER_ID}"
|
||||
docker stop "${DOCKER_ID}" || true
|
||||
docker rm "${DOCKER_ID}"
|
||||
echo "returning status: $e"
|
||||
echo "--->"
|
||||
exit $e
|
||||
@@ -167,14 +186,14 @@ function ifthenelse() {
|
||||
os="${arg%%:::*}"
|
||||
thenpart="${arg#*:::}"
|
||||
if test "${thenpart/:::/}" = "${thenpart}"; then
|
||||
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
|
||||
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
|
||||
else
|
||||
elsepart="${thenpart##*:::}"
|
||||
thenpart="${thenpart%:::*}"
|
||||
if test -n "${thenpart}"; then
|
||||
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
|
||||
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
|
||||
else
|
||||
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
|
||||
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -183,10 +202,24 @@ function ifthenelse() {
|
||||
set -x
|
||||
|
||||
docker pull $img
|
||||
DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
|
||||
DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
|
||||
trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
|
||||
if ! [[ $arch =~ $myarch ]]; then
|
||||
docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
|
||||
fi
|
||||
docker start "${DOCKER_ID}"
|
||||
if ! docker exec ${DOCKER_ID} getent group $(id -g) > /dev/null 2>&1; then
|
||||
docker exec ${DOCKER_ID} groupadd -g $(id -g) $(id -gn)
|
||||
fi
|
||||
if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
|
||||
docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
|
||||
fi
|
||||
case $mode in
|
||||
(apt)
|
||||
(deb|apt)
|
||||
if [[ "${img}" =~ "ubuntu" ]]; then
|
||||
docker exec ${DOCKER_ID} locale-gen ${LANG}
|
||||
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
|
||||
fi
|
||||
OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
|
||||
for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
|
||||
docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
|
||||
@@ -214,8 +247,7 @@ case $mode in
|
||||
done
|
||||
docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
|
||||
;;
|
||||
(yum)
|
||||
./bootstrap.sh -t dist
|
||||
(rpm|yum|dnf|zypper|urpmi)
|
||||
if [[ "$img" =~ "centos" ]]; then
|
||||
docker exec ${DOCKER_ID} yum install -y redhat-lsb
|
||||
docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
|
||||
@@ -228,10 +260,23 @@ enabled=1
|
||||
gpgcheck=0
|
||||
EOF
|
||||
fi
|
||||
docker exec ${DOCKER_ID} yum install -y rpm-build
|
||||
docker exec ${DOCKER_ID} groupadd -g $(id -g) build
|
||||
docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
|
||||
docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
|
||||
INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
|
||||
docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget /usr/bin/lsb_release
|
||||
i=0
|
||||
for key in "${keys[@]}"; do
|
||||
wget -Orpm-key "$key"
|
||||
docker exec -i ${DOCKER_ID} rpm --import rpm-key
|
||||
rm rpm-key
|
||||
done
|
||||
for repo in "${repos[@]}"; do
|
||||
INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true))
|
||||
ifthenelse "${repo}" "${INSTALL_REPO} ARG"
|
||||
((++i))
|
||||
done
|
||||
TGZFILE=$(grep PACKAGE_STRING= configure | sed "s, ,-,g;s,PACKAGE_STRING=',,g;s,',.tar.gz,g")
|
||||
touch $TGZFILE
|
||||
docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
|
||||
rm $TGZFILE
|
||||
;;
|
||||
esac
|
||||
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}"
|
||||
|
||||
@@ -5,13 +5,21 @@ Release: @BUILD_NUMBER@%{?dist}
|
||||
License: LGPL
|
||||
Group: Development/Libraries/C++
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
BuildRequires: gnupg, subversion, automake, autoconf, doxygen, mrw-c++-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: gnupg, subversion, subversion-tools, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, libtool, doxygen, java-openjdk, mrw-c++-devel
|
||||
%if 0%{?fedora} != 20
|
||||
BuildRequires: graphviz
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
||||
BuildRequires: pkgconfig, redhat-lsb, cppunit-devel
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
|
||||
BuildRequires: which, pkgconfig, cppunit-devel
|
||||
%if 0%{?rhel} > 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia}
|
||||
BuildRequires: rpm-sign
|
||||
%endif
|
||||
%if 0%{?mageia}
|
||||
BuildRequires: gnupg, lsb-release, libltdl-devel
|
||||
%else
|
||||
BuildRequires: gpg, redhat-lsb, libtool-ltdl-devel
|
||||
%endif
|
||||
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||
BuildRequires: mscgen
|
||||
|
||||
@@ -36,6 +44,7 @@ This package contains only the shared libraries required at runtime.
|
||||
%prep
|
||||
%setup -q
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \
|
||||
--libdir=/usr/%_lib
|
||||
|
||||
@@ -75,7 +84,7 @@ This Package contains all files required for developement.
|
||||
/usr/%_lib/@PACKAGE_NAME@.a
|
||||
/usr/%_lib/@PACKAGE_NAME@.la
|
||||
/usr/%_lib/pkgconfig
|
||||
/usr/include/
|
||||
/usr/include/*
|
||||
%doc
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/html
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ 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 "$(${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} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then
|
||||
TO_INSTALL+=" ${f}"
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -10,35 +10,34 @@
|
||||
## 1 2 3 4 5 6 7 8
|
||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
|
||||
|
||||
INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install -y) || (test -x /usr/bin/dnf && echo dnf install -y) || (test -x /usr/bin/yum && echo yum install -y) || (test -x /usr/sbin/urpmi && echo urpmi --auto))}
|
||||
SCHROOTNAME="$1"
|
||||
PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
|
||||
PKGCONFIGS="${2:-epel-release}" # packages to configure yum
|
||||
|
||||
TRAP_CMD=
|
||||
if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then
|
||||
TRAP_CMD+="rm ${PACKAGE_NAME}.spec;"
|
||||
trap "${TRAP_CMD}" INT TERM EXIT
|
||||
sed 's,@RPM_DEPEND_IFEXISTS@,,g' ${PACKAGE_NAME}.spec.in | \
|
||||
sed 's,@[^@]*@, dummytext,g' > ${PACKAGE_NAME}.spec
|
||||
fi
|
||||
|
||||
TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec)
|
||||
if ! test -e $TGZFILE; then
|
||||
TRAP_CMD+="${TGZFILE};"
|
||||
trap "${TRAP_CMD}" INT TERM EXIT
|
||||
touch $TGZFILE
|
||||
fi
|
||||
|
||||
if test -n "${SCHROOTNAME}"; then
|
||||
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||
if test -n "${FILES}"; then
|
||||
FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
|
||||
if test -n "${FIRST}"; then
|
||||
schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FIRST} || \
|
||||
schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FIRST} || \
|
||||
schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FIRST}
|
||||
fi
|
||||
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}
|
||||
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES}
|
||||
fi
|
||||
else
|
||||
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||
if test -n "${FILES}"; then
|
||||
FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
|
||||
if test -n "${FIRST}"; then
|
||||
yum install -y ${FIRST} || \
|
||||
zypper install -y ${FIRST} || \
|
||||
dnf install -y ${FIRST}
|
||||
fi
|
||||
yum install -y ${FILES} || \
|
||||
zypper install -y ${FILES} || \
|
||||
dnf install -y ${FILES}
|
||||
${INSTALL_TOOL} ${FILES}
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user