diff --git a/ChangeLog b/ChangeLog index 9d4e796..c6721f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,107 +1,139 @@ +2016-09-02 08:44 + + * [r21] configure.ac: + fixed project url + +2016-08-28 07:58 + + * [r20] COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4, + bootstrap.sh: + documentation fixed + 2016-08-26 14:10 - * COPYING, INSTALL, ax_init_standard_project.m4, bootstrap.sh, - doc/doxyfile.in: updated documentation build + * [r19] COPYING, INSTALL, ax_init_standard_project.m4, + bootstrap.sh, doc/doxyfile.in: + updated documentation build 2016-08-25 19:53 - * configure.ac, debian/control.in, src/matrix.hxx, test/basic.cxx, - test/makefile.am, test/matricxx.cxx: documentation updated + * [r18] configure.ac, debian/control.in, src/matrix.hxx, + test/basic.cxx[DEL], test/makefile.am, test/matricxx.cxx[CPY]: + documentation updated 2016-08-25 18:56 - * README, ax_init_standard_project.m4, bootstrap.sh, configure.ac, - doc/header.html.in, doc/style.css: documentation anhanced + * [r17] README, ax_init_standard_project.m4, bootstrap.sh, + configure.ac, doc/header.html.in, doc/style.css: + documentation anhanced 2016-08-25 18:02 - * COPYING, ChangeLog, INSTALL, README, ax_init_standard_project.m4, - doc/doxyfile.in, doc/footer.html.in, doc/header.html.in, - doc/style.css, test/matricxx.cxx: documentation anhanced + * [r16] COPYING, ChangeLog, INSTALL, README, + ax_init_standard_project.m4, doc/doxyfile.in, + doc/footer.html.in[ADD], doc/header.html.in[ADD], + doc/style.css[ADD], test/matricxx.cxx[ADD]: + documentation anhanced 2016-08-25 15:00 - * README, ax_init_standard_project.m4, bootstrap.sh, - doc/doxyfile.in, src/matrix.hxx: improved doxygen + * [r15] README, ax_init_standard_project.m4, bootstrap.sh, + doc/doxyfile.in, src/matrix.hxx: + improved doxygen 2016-08-24 09:42 - * src/libmatricxx.pc.in: PKG_REQUIREMENTS is undefined + * [r14] src/libmatricxx.pc.in: + PKG_REQUIREMENTS is undefined 2016-08-23 13:58 - * debian/control.in, src/makefile.am, src/matrix.hxx, - test/basic.cxx, test/makefile.am: stream any size of matrix + * [r13] debian/control.in, src/makefile.am, src/matrix.hxx, + test/basic.cxx, test/makefile.am: + stream any size of matrix 2016-08-23 13:09 - * configure.ac, src/matrix.hxx, test/basic.cxx: works perfectly, - fully tested + * [r12] configure.ac, src/matrix.hxx, test/basic.cxx: + works perfectly, fully tested 2016-08-22 15:04 - * COPYING, INSTALL, src/matrix.hxx, test/basic.cxx: inverse tested + * [r11] COPYING, INSTALL, src/matrix.hxx, test/basic.cxx: + inverse tested 2016-08-22 07:07 - * ChangeLog, src/matrix.hxx, test/basic.cxx: inverse does not work - yet + * [r10] ChangeLog, src/matrix.hxx, test/basic.cxx: + inverse does not work yet 2016-08-19 16:07 - * COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, makefile_test.inc.am: fix C++11 - detection + * [r9] COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4, + ax_init_standard_project.m4, makefile_test.inc.am: + fix C++11 detection 2016-08-19 14:52 - * COPYING, INSTALL, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, makefile_test.inc.am, - src/matrix.hxx, test/basic.cxx: more operators more tests + * [r8] COPYING, INSTALL, ax_cxx_compile_stdcxx_11.m4, + ax_init_standard_project.m4, bootstrap.sh, + makefile_test.inc.am[ADD], src/matrix.hxx, test/basic.cxx: + more operators more tests 2016-08-18 22:03 - * COPYING, ChangeLog, INSTALL, src/matrix.hxx: more operators + * [r7] COPYING, ChangeLog, INSTALL, src/matrix.hxx: + more operators 2016-08-17 07:26 - * configure.ac: only requires c++11 + * [r6] configure.ac: + only requires c++11 2016-08-16 14:41 - * COPYING, INSTALL, ax_init_standard_project.m4, configure.ac, - src/matrix.hxx, test/basic.cxx: remove redundancy, collect common - functionality in base class + * [r5] COPYING, INSTALL, ax_init_standard_project.m4, configure.ac, + src/matrix.hxx, test/basic.cxx: + remove redundancy, collect common functionality in base class 2016-08-08 20:03 - * src/matrix.hxx, test/basic.cxx: more operator, more checks passed + * [r4] src/matrix.hxx, test/basic.cxx: + more operator, more checks passed 2016-08-03 18:43 - * configure.ac, test/makefile.am: all tests passed + * [r3] configure.ac, test/makefile.am: + all tests passed 2016-08-03 18:39 - * COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, configure.ac, examples/makefile.am, - examples/matrix-sample.cxx, src/makefile.am, src/matrix.hxx, - test/basic.cxx, test/makefile.am: first approach including first - tests + * [r2] COPYING[ADD], ChangeLog, INSTALL[ADD], + ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4, + configure.ac, examples/makefile.am, + examples/matrix-sample.cxx[ADD], src/makefile.am, + src/matrix.hxx[ADD], test/basic.cxx[ADD], test/makefile.am: + first approach including first tests 2016-07-30 08:50 - * ., AUTHORS, ChangeLog, NEWS, README, autogen.sh, ax_check_qt.m4, - ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4, - bootstrap.sh, build-in-docker.conf, build-in-docker.sh, - build-resource-file.sh, configure.ac, debian, - debian/changelog.in, debian/compat, debian/control.in, - debian/docs, debian/libmatricxx-dev.install, - debian/libmatricxx.install, debian/rules, doc, doc/doxyfile.in, - doc/makefile.am, examples, examples/makefile.am, - libmatricxx.desktop.in, libmatricxx.spec.in, - mac-create-app-bundle.sh, makefile.am, resolve-debbuilddeps.sh, - resolve-rpmbuilddeps.sh, sql-to-dot.sed, src, - src/libmatricxx.pc.in, src/makefile.am, src/version.cxx, - src/version.hxx, test, test/makefile.am: initial project + * [r1] .[ADD], AUTHORS[ADD], ChangeLog[ADD], NEWS[ADD], + README[ADD], autogen.sh[ADD], ax_check_qt.m4[ADD], + ax_cxx_compile_stdcxx_11.m4[ADD], + ax_init_standard_project.m4[ADD], bootstrap.sh[ADD], + build-in-docker.conf[ADD], build-in-docker.sh[ADD], + build-resource-file.sh[ADD], configure.ac[ADD], debian[ADD], + debian/changelog.in[ADD], debian/compat[ADD], + debian/control.in[ADD], debian/docs[ADD], + debian/libmatricxx-dev.install[ADD], + debian/libmatricxx.install[ADD], debian/rules[ADD], doc[ADD], + doc/doxyfile.in[ADD], doc/makefile.am[ADD], examples[ADD], + examples/makefile.am[ADD], libmatricxx.desktop.in[ADD], + libmatricxx.spec.in[ADD], mac-create-app-bundle.sh[ADD], + makefile.am[ADD], resolve-debbuilddeps.sh[ADD], + resolve-rpmbuilddeps.sh[ADD], sql-to-dot.sed[ADD], src[ADD], + src/libmatricxx.pc.in[ADD], src/makefile.am[ADD], + src/version.cxx[ADD], src/version.hxx[ADD], test[ADD], + test/makefile.am[ADD]: + initial project diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 7c6a416..9b78951 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -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 MacOSX +# 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]))]) @@ -171,12 +168,13 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(NUMBERS) AX_SUBST(HOME) if test -f README.md; then - README=$() + README=$(tail -n +3 README.md) DESCRIPTION=$(head -1 README.md) else README=$(tail -n +3 README) DESCRIPTION=$(head -1 README) fi + README_ESCAPED=$(echo "$README" | sed ':a;N;$!ba;s/\n/\\n/g;s,",\\",g') if which pandoc 2>&1 > /dev/null; then README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\\(.\),\\\\\1,g;s/\n/\\n/g;s,",\\",g;s, ,\ \ ,g') else @@ -184,23 +182,46 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ fi AX_SUBST(README) _AM_SUBST_NOTMAKE([README]) + AX_SUBST(README_ESCAPED) + _AM_SUBST_NOTMAKE([README_ESCAPED]) AX_SUBST(README_HTML) _AM_SUBST_NOTMAKE([README_HTML]) AX_SUBST(DESCRIPTION) _AM_SUBST_NOTMAKE([DESCRIPTION]) + LICENSE=$(echo $(head -1 COPYING)) + AX_SUBST(LICENSE) + COPYING=$(.*,\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)) @@ -403,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! @@ -424,6 +445,47 @@ maintainer-clean-example-targets: EOF ]) +# 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 <> cordova/makefile.in <> doc/makefile.in <> doc/makefile.in <Perl Documentation

Perl Documentation

    " > perldoc/index.html + for p in \${PERL_SOURCES:%=perldoc/%}; do \ + echo '
  • '"\$\${p#perldoc/}"'
    • ' >> perldoc/index.html; \ + done + echo "
" >> perldoc/index.html + +perldoc/%: + pods2html --notoc --empty --index index @top_srcdir@/\${@:perldoc/%=%} \$[@] + +distclean-perldoc: + -rm -r perldoc +maintainer-clean-perldoc: + -rm makefile.in +install-data-perldoc: + test -d \$(DESTDIR)\${docdir} || mkdir -p \$(DESTDIR)\${docdir} + chmod -R u+w \$(DESTDIR)\${docdir} + cp -r perldoc \$(DESTDIR)\${docdir}/ +uninstall-perldoc: + -chmod -R u+w \$(DESTDIR)\${docdir} + -rm -rf \$(DESTDIR)\${docdir}/perldoc +#### End: $0 +EOF +]) + # require a specific package, with fallback: test for a header # - parameter: # $1 = unique id (no special characters) diff --git a/bootstrap.sh b/bootstrap.sh index 8a7c967..1716803 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -149,11 +149,28 @@ 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 - * doc/makefile.am - if you enabled AX_USE_DOXYGEN + * 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 * doc/footer.html.in - if you enabled AX_USE_DOXYGEN * doc/style.css - if you enabled AX_USE_DOXYGEN + * doc/plantuml.jar - if you enable AX_USE_DOXYGEN * test/makefile.am - if you enabled AX_USE_CPPUNIT and AX_USE_CXX * test/${DEFAULT_PROJECT_NAME#lib}.cxx - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT * examples/makefile.am - if you enabled AX_BUILD_EXAMPLES @@ -207,8 +224,8 @@ FILE DEPENDENCIES * test/makefile.am depends on AX_USE_LIBTOOL * html/makefile.am depends on AX_BUILD_HTML * doc/doxyfile.in depends on AX_BUILD_EXAMPLES - * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT - AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL + * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_PERLDOC, + AX_USE_CPPUNIT AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}.install depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL @@ -241,7 +258,9 @@ 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 * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING * Enable C++ testing using CppUnit: AX_USE_CPPUNIT @@ -282,11 +301,13 @@ VCS="" VCSDEPENDS="" if test -d .svn; then VCS="svn" - VCSDEPENDS="subversion," + VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools," + VCSDEPENDS_RPM="subversion," 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" @@ -439,6 +460,9 @@ copy() { source="${0%/*}/$1" fi fi + if test "${1%/*}" != "$1"; then + test -d "${1%/*}" || svn mkdir "${1%/*}" + fi run cp "${source}" "$1" if test $exists -eq 0; then if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then @@ -482,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 @@ -513,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) " fi @@ -529,7 +555,11 @@ ${DEFAULT_PROJECT_NAME} add description for ${DEFAULT_PROJECT_NAME} EOF to configure.ac <= 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 < /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 < /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 < 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 < + + + + + + + + $(head -1 README) + + + +

$(head -1 README)

+

generated by bootstrap, please edit

+ + + +EOF +to --condition AX_USE_NODEJS nodejs/views/layout.ejs < +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 fi @@ -960,7 +1335,32 @@ to --condition AX_USE_DOXYGEN doc/style.css <@AUTHOR_NAME@"' + doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/doc/plantuml.jar"' doxyreplace ENABLE_PREPROCESSING YES doxyreplace MACRO_EXPANSION YES doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"' @@ -1016,6 +1417,11 @@ if testtag AX_USE_DOXYGEN; then if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then doxyadd INPUT "@top_srcdir@/test" fi + if testtag AX_USE_NODEJS; then + doxyadd INPUT "@top_srcdir@/nodejs" + doxyadd EXCLUDE "@top_srcdir@/nodejs/node_modules" + doxyadd EXCLUDE "@top_srcdir@/nodejs/public/javascripts/ext" + fi doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql' doxyreplace RECURSIVE YES doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_* version.[ch]xx" @@ -1023,7 +1429,7 @@ if testtag AX_USE_DOXYGEN; then doxyreplace HTML_FOOTER footer.html doxyreplace HTML_EXTRA_STYLESHEET style.css doxyreplace HTML_DYNAMIC_SECTIONS YES - doxyreplace DISABLE_INDEX YES + doxyreplace DISABLE_INDEX NO doxyreplace GENERATE_TREEVIEW YES if testtag AX_BUILD_EXAMPLES; then doxyreplace EXAMPLE_PATH @top_srcdir@/examples @@ -1055,15 +1461,15 @@ if testtag AX_USE_DEBIAN_PACKAGING; then to debian/changelog.in < 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) @@ -1167,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 \\ @@ -1192,6 +1627,7 @@ else echo '/usr/bin/*' echo '/usr/share/applications/*' fi) +/usr/share/@PACKAGE_NAME@ %doc $(if testtag AX_USE_LIBTOOL; then cat < ChangeLog";; @@ -1302,10 +1738,15 @@ Cflags: -I\${includedir} @CPPFLAGS@ Requires: @PKG_REQUIREMENTS@ EOF to build-in-docker.conf < /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64) +host= +flags=() wait=0 if test -e ./build-in-docker.conf; then # you can preconfigure the variables in file build-in-docker.conf # if you do so, add the file to EXTRA_DIST in makefile.am source ./build-in-docker.conf fi + while test $# -gt 0; do case "$1" in (-h|--help) @@ -25,9 +33,12 @@ while test $# -gt 0; do echo "OPTIONS:" echo echo " -h, --help show this help" - echo " -m, --mode mode: apt or yum, default: ${mode}" + echo " -m, --mode mode: deb, rpm, win, default: ${mode}" echo " -i, --image use given docker image instead of ${img}" + echo " -a, --arch build for given hardware architecture" echo " -t, --targets targets specify build targets, default: ${targets}" + echo " --host host for cross compiling, e.g. i686-w64-mingw32" + echo " -f, --flag add flag to ./bootstrap.sh or ./configure" echo " -r, --repo add given apt repository" echo " -k, --key add public key from url" echo " -e, --env = set environment variable in docker" @@ -37,6 +48,10 @@ 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 " The option -m must be after -h, because mode may set a host" + echo " If target is either deb or rpm, mode is set to the same value" + echo " If target is win, host is set to i686-w64-mingw32" echo echo " The options -r -k -e -d -p -c can be repeated several times." echo @@ -67,8 +82,11 @@ 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";; + (win) img="ubuntu:latest"; host="${host:---host=i686-w64-mingw32}";; (*) echo "**** ERROR: unknown mode '$1', try --help" 1>&2 exit 1 @@ -78,10 +96,25 @@ while test $# -gt 0; do (-i|--image) shift; img="$1" ;; + (-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 + ;; + (--host) shift; + host="--host=$1" + ;; + (-f|--flag) shift; + flags+=("$1") ;; (-r|--repo) shift; + echo "OPTION: $1" repos+=("$1") ;; (-k|--key) shift; @@ -140,7 +173,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 +201,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 +217,25 @@ 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 +docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}" 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" @@ -199,7 +248,7 @@ case $mode in docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \ docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release; for repo in "${repos[@]}"; do - ifthenelse "${repo}" "apt-add-repository ARG" + ifthenelse "${repo}" "apt-add-repository 'ARG'" done for key in "${keys[@]}"; do wget -O- "$key" \ @@ -214,8 +263,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' <&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 diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index 5ddd1b2..1ed2408 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -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+="rm ${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