From 195a07bcbe45aae7f25c370d70aadfae4d04546a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 18 Jul 2018 14:25:18 +0200 Subject: [PATCH] migration to git, tested build for rpm and deb --- COPYING | 2 +- ChangeLog | 682 ------------------------------- INSTALL | 2 +- README => README.md | 3 +- ax_check_qt.m4 | 45 +- ax_init_standard_project.m4 | 9 +- bootstrap.sh | 7 +- configure.ac | 1 + {scripts => etc}/90wt-mode.el.in | 0 etc/makefile.am | 23 ++ {scripts => etc}/wt-mode.el | 0 mac-create-app-bundle.sh | 16 +- makefile.am | 16 +- scripts/makefile.am | 13 - webtester.spec.in | 9 +- 15 files changed, 97 insertions(+), 731 deletions(-) rename README => README.md (92%) rename {scripts => etc}/90wt-mode.el.in (100%) create mode 100644 etc/makefile.am rename {scripts => etc}/wt-mode.el (100%) diff --git a/COPYING b/COPYING index 88798ab..2fcb217 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.15/COPYING \ No newline at end of file +/usr/share/automake-1.13/COPYING \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index d10b652..e69de29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,682 +0,0 @@ -2018-04-04 21:03 - - * [r113] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - build-in-docker.sh, mac-create-app-bundle.sh, - test/test-commands.wt: - updated build system - -2017-07-28 09:29 - - * [r112] COPYING, INSTALL, ax_check_qt.m4, - ax_init_standard_project.m4, bootstrap.sh, - dependency-graph.sh[ADD], src/commands.hxx, template.sh[ADD]: - improved waiting for elements: defaults to timeout-1 if element - should be there, defaults to timeout/3 if element is optional - -2017-07-14 14:44 - - * [r111] icon.png[ADD], src/testgui.ui: - added icon - -2017-07-14 10:12 - - * [r110] COPYING, INSTALL, scripts/wt-mode.el, src/editor.hxx: - added missing «default» keyword - -2017-07-14 10:08 - - * [r109] webtester.spec.in: - fixed rpm build - -2017-06-30 08:56 - - * [r108] scripts/90wt-mode.el.in[CPY], scripts/90wt-mode.wt[DEL], - scripts/makefile.am, scripts/wt-mode.el, src/commands.hxx, - src/editor.hxx, src/exceptions.hxx: - new commands ignore and unignore to (un-) ignore signals - -2017-06-28 08:22 - - * [r107] scripts/wt-mode.el, src/commands.hxx, src/editor.hxx: - new command while, similar to if - -2017-06-20 14:12 - - * [r106] COPYING, INSTALL, configure.ac, src/commands.hxx: - fix timing problem - -2017-06-14 16:04 - - * [r105] COPYING, INSTALL, ax_init_standard_project.m4, - bootstrap.sh, build-in-docker.conf, build-in-docker.sh, - configure.ac, makefile.am, webtester.spec.in: - fix fedora / centos build - -2017-06-14 08:57 - - * [r104] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, build-in-docker.sh, resolve-debbuilddeps.sh, - resolve-rpmbuilddeps.sh, rpmsign.exp[ADD], src/testgui.hxx, - webtester.spec.in: - fixed url updates in gui - -2017-03-03 14:05 - - * [r103] COPYING, INSTALL, src/testgui.ui: - small gui changes - -2017-02-02 19:55 - - * [r102] ChangeLog, src/editor.hxx, src/scriptfile.hxx, - src/testgui.hxx: - open file by click on include line - -2017-02-02 17:54 - - * [r101] src/scriptfile.hxx[ADD], src/scriptfile.ui[ADD]: - added forgotte files - -2017-02-01 22:39 - - * [r100] src/editor.hxx, src/makefile.am, src/testgui.hxx, - src/testgui.ui: - automatically open include files in new tabs; show in syntax - highlighting, whether a file is readable - -2017-01-31 23:04 - - * [r99] scripts/wt-mode.el, src/editor.hxx: - simple syntax highlighting - -2017-01-31 19:54 - - * [r98] COPYING, ChangeLog, INSTALL, src/editor.hxx[ADD], - src/makefile.am, src/testgui.hxx, src/testgui.ui: - added CodeEditor with line numbering from Qt sample code - -2017-01-31 17:32 - - * [r97] src/commands.hxx, src/webrunner.cxx: - better progress indicator - -2017-01-30 15:09 - - * [r96] src/testgui.hxx, src/testgui.ui, src/webtester.cxx: - fixed window title and file modification dialog - -2017-01-27 15:57 - - * [r95] src/testgui.hxx, src/testgui.ui: - url as combobox with completion - -2017-01-24 14:17 - - * [r94] src/commands.hxx, src/testgui.hxx, src/testgui.ui: - show test result as check mark or cross - -2017-01-20 10:58 - - * [r93] doc/footer.html.in[ADD], doc/header.html.in[ADD], - doc/plantuml.jar[ADD], doc/style.css[ADD], - makefile_test.inc.am[ADD]: - packager fixed - fix - -2017-01-20 10:57 - - * [r92] ChangeLog, bootstrap.sh, build-in-docker.conf, - debian/changelog.in, doc/footer.html.in[DEL], - doc/header.html.in[DEL], doc/plantuml.jar[DEL], - doc/style.css[DEL], makefile_test.inc.am[DEL]: - packager fixed - -2017-01-20 08:30 - - * [r91] COPYING, INSTALL, README, configure.ac, src/commands.hxx, - src/networkaccessmanager.hxx, src/testgui.hxx, src/webrunner.cxx: - new option for timeout, longer timeout in shell, new untested - command auth to set basic authentication credentials - -2017-01-07 12:09 - - * [r90] ChangeLog, bootstrap.sh, build-in-docker.sh, - doc/footer.html.in[ADD], doc/header.html.in[ADD], - doc/plantuml.jar[ADD], doc/style.css[ADD], - makefile_test.inc.am[ADD]: - build fixed - -2017-01-06 15:53 - - * [r89] COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, build-in-docker.conf, - build-in-docker.sh, debian/control.in, resolve-debbuilddeps.sh, - resolve-rpmbuilddeps.sh, sql-to-dot.sed: - improved build, tested on wily and xenial - -2017-01-05 14:25 - - * [r88] src/commands.hxx: - more improve expect load; better logging in case of exception - -2017-01-04 15:54 - - * [r87] src/commands.hxx, src/testgui.hxx, src/testgui.ui: - improve expect load; fix views menu; improve function call error - display - -2016-11-01 15:46 - - * [r86] ChangeLog, configure.ac, src/commands.hxx, src/testgui.hxx, - src/testgui.ui: - first version of a script run progress bar - -2016-06-09 14:12 - - * [r85] src/commands.hxx: - jenkins junit interprets dots as subclasses, so remove the dots - in filenames - -2016-06-09 12:41 - - * [r84] src/commands.hxx: - jenkins junit plugin gojne crazy: classname must not be a file - but either a directory or not exist - typo - -2016-06-09 11:18 - - * [r83] src/commands.hxx: - jenkins junit plugin gojne crazy: classname must not be a file - but either a directory or not exist - -2016-06-09 09:47 - - * [r82] configure.ac, src/commands.hxx: - no special characters in classname and name attributes, otherwise - jenkins cannot read the test output xml file - -2016-06-09 08:17 - - * [r81] scripts/wt-mode.el, src/commands.hxx: - filter special ascii commands from output, otherwise jenkins - cannot read the test output xml file - keep new line - -2016-06-09 08:09 - - * [r80] src/commands.hxx: - filter special ascii commands from output, otherwise jenkins - cannot read the test output xml file - -2016-06-08 09:07 - - * [r79] ax_init_standard_project.m4, bootstrap.sh, - resolve-rpmbuilddeps.sh, scripts/90wt-mode.wt[ADD], - scripts/makefile.am, scripts/wt-mode.el[ADD], src/commands.hxx, - src/exceptions.hxx: - new commands: include, case and fail; new emacs wt-mode for - webtester files - -2016-05-13 15:02 - - * [r78] bootstrap.sh, src/commands.hxx: - if can have a variable test or a content check - -2016-05-11 09:07 - - * [r77] ChangeLog, src/testgui.hxx, src/webpage.hxx: - fix text-selection to exists feature; ignore javascript popups - -2016-05-05 09:58 - - * [r76] build-in-docker.sh: - fixed build - -2016-05-05 09:48 - - * [r75] build-in-docker.sh: - fixed build - -2016-05-05 09:23 - - * [r74] debian/control.in: - xvfb is not required - -2016-05-05 09:12 - - * [r73] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - build-in-docker.sh: - update build system - -2016-05-03 06:52 - - * [r72] src/commands.hxx: - some smaller fixes and improvements for joomla testing - -2016-05-02 15:25 - - * [r71] src/commands.hxx, src/testgui.hxx: - some smaller fixes and improvements for joomla testing - -2016-05-02 11:02 - - * [r70] COPYING, ChangeLog, INSTALL, autogen.sh[ADD], - ax_init_standard_project.m4, bootstrap.sh, build-in-docker.conf, - build-in-docker.sh, mac-create-app-bundle.sh, - resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, - src/commands.hxx, src/testgui.hxx, src/version.cxx, - src/version.hxx: - add new commane clear-cookies; select text on testgui sets an - expectation - -2016-04-03 16:19 - - * [r69] configure.ac, debian/control.in: - after svn-server restore - -2015-12-26 00:13 marc - - * [r68] COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4, - bootstrap.sh, build-in-docker.conf[ADD], build-in-docker.sh, - resolve-debbuilddeps.sh, src/version.cxx, src/version.hxx: - fixed build-in-docker - -2015-12-21 22:14 marc - - * [r67] sql-to-dot.sed[ADD], test/runtests.sh[ADD], - webtester.desktop.in[ADD]: - build in docker - -2015-12-21 21:27 marc - - * [r66] ChangeLog, src/commands.hxx: - new command to set offline-storage-path - -2015-11-16 12:37 marc - - * [r65] doc/doxyfile.in: - SVG must not be interactive for embedding in redmine - -2015-11-09 22:33 marc - - * [r64] ChangeLog, bootstrap.sh, src/commands.hxx, - src/exceptions.hxx, src/webpage.hxx: - allow local storage; prevent crash if line is missing - -2015-11-07 10:47 marc - - * [r63] bootstrap.sh, debian/control.in: - there is no qt4-default - -2015-11-07 09:23 marc - - * [r62] bootstrap.sh: - there is no qt4-default - -2015-11-04 11:59 marc - - * [r61] src/commands.hxx: - removed empty lines and comments from test results - -2015-11-04 10:34 marc - - * [r60] bootstrap.sh, build-in-docker.sh[ADD], configure.ac, - debian/control.in, examples[DEL], resolve-debbuilddeps.sh, - webtester.spec.in[ADD]: - build in docker tested - -2015-11-04 08:52 marc - - * [r59] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - configure.ac, examples, examples/makefile.am[ADD], makefile.am, - test[CPY], test/makefile.am: - examples is test - -2015-11-03 21:54 marc - - * [r58] debian/control.in: - updated dependencies - -2015-11-03 14:30 marc - - * [r57] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, resolve-debbuilddeps.sh, src/commands.hxx, - src/testgui.hxx, src/testgui.ui: - prepared for build in a docker instance on jenkins - -2015-11-02 08:00 marc - - * [r56] ChangeLog, debian/control.in: - test requires xvfb-run - -2015-11-02 00:01 marc - - * [r55] AUTHORS, ChangeLog, bootstrap.sh, resolve-debbuilddeps.sh: - new author url - -2015-10-11 19:45 marc - - * [r54] examples/test-commands.wt: - added test for multidimensional for loop - -2015-10-11 15:28 marc - - * [r53] bootstrap.sh, examples/test-commands.wt, src/commands.hxx: - added test for multidimensional for loop - -2015-10-10 18:05 marc - - * [r52] bootstrap.sh, doc/doxyfile.in: - no search index when embedded in redmine - -2015-10-10 15:27 marc - - * [r51] examples/makefile.am: - added xvfb-run to run on headless systems - -2015-10-10 15:00 marc - - * [r50] examples/SwissSign_Silver_CA_-_G2.pem[DEL], - examples/ca.pem[ADD], examples/client.key[ADD], - examples/client.pem[ADD], examples/makefile.am, - examples/test-commands.wt, src/commands.hxx: - new for loop successfull tested - -2015-10-10 14:09 marc - - * [r49] ax_init_standard_project.m4, configure.ac, examples[ADD], - examples/SwissSign_Silver_CA_-_G2.pem[ADD], - examples/makefile.am[ADD], examples/test-commands.wt[ADD], - makefile.am, src/commands.hxx, src/webrunner.cxx: - includes example and test; new command echo - -2015-10-10 10:48 marc - - * [r48] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, build-resource-file.sh[ADD], - mac-create-app-bundle.sh[ADD], resolve-debbuilddeps.sh[ADD], - resolve-rpmbuilddeps.sh[ADD], src/commands.hxx: - new feature: «for»-loop; updated buildsystem - -2015-10-09 15:01 marc - - * [r47] src/commands.hxx, src/networkaccessmanager.hxx: - unfinished: new feature: for loop - -2015-07-12 18:38 marc - - * [r46] debian/control.in: - requires qt5 - -2015-07-12 18:16 marc - - * [r45] debian/control.in: - requires qt5 - -2015-05-20 15:22 marc - - * [r44] src/commands.hxx: - some bugs fixed, logging is quite good now - -2015-05-20 14:35 marc - - * [r43] src/commands.hxx: - fixed stupid error in Do::execute; nicer logging - -2015-05-20 11:52 marc - - * [r42] src/commands.hxx, src/exceptions.hxx, src/testgui.hxx, - src/webrunner.cxx: - improved logging, bugfix in function handling - -2015-05-19 14:34 marc - - * [r41] src/commands.hxx, src/testgui.hxx: - click has an optional clicktype; do has an optional selector; - better detection and handling of moo-tool (joomla3) elements - -2015-05-11 12:13 marc - - * [r40] src/commands.hxx, src/exceptions.hxx: - new command check to compare two values or to compare a value to - the result of a command - command call now returns the value of - the last statement - -2015-05-11 09:54 marc - - * [r39] ChangeLog, doc/makefile.amto[DEL], src/commands.hxx: - now also supports optional else after command if - -2015-05-09 12:27 marc - - * [r38] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, doc/makefile.amto[ADD], src/commands.hxx, - src/testgui.hxx, src/webrunner.cxx: - new commands testsuite and testcase - -2015-05-08 15:34 marc - - * [r37] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - docker/Dockerfile, src/commands.hxx, src/exceptions.hxx, - src/testgui.hxx: - new feature: if tatement for conditions in functions - -2015-05-06 23:09 marc - - * [r36] ChangeLog, bootstrap.sh, doc/doxyfile.in, - scripts/doxygen-webtester.sed, scripts/example.wt[DEL], - scripts/makefile.am: - better doxygen support - -2015-05-06 16:56 marc - - * [r35] debian/control.in: - reprepo requires a section - -2015-05-06 14:51 marc - - * [r34] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - configure.ac, makefile.am, scripts[ADD], - scripts/doxygen-webtester.sed[ADD], scripts/example.wt[ADD], - scripts/makefile.am[ADD]: - added doxygen-webtester.sed do generate doxygen from webtester - files - -2015-05-06 07:56 marc - - * [r33] ChangeLog, debian/.dirs[DEL], debian/.install[DEL], - debian/webtester.dirs[DEL], debian/webtester.install[DEL]: - no need for install and dirs in debian - -2015-05-05 20:31 marc - - * [r32] ax_init_standard_project.m4, bootstrap.sh, configure.ac, - debian, debian/.dirs[ADD], debian/.install[ADD], - debian/changelog.in[ADD], debian/compat[ADD], - debian/control.in[ADD], debian/docs[ADD], debian/rules[ADD], - debian/webtester.dirs[ADD], debian/webtester.install[ADD]: - some build environment updates - -2015-05-05 15:06 marc - - * [r31] README, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, src/version.cxx, src/version.hxx, - src/webrunner.cxx: - massively improved build system - -2015-05-05 08:30 marc - - * [r30] ChangeLog, README, ax_check_qt.m4[ADD], - ax_cxx_compile_stdcxx_11.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/rules[ADD], - debian/webtester.dirs[ADD], debian/webtester.install[ADD], - doc[ADD], doc/doxyfile.in[ADD], doc/makefile.am[ADD], - docker/Dockerfile, makefile.am, src/makefile.am, src/testgui.hxx, - src/version.cxx[ADD], src/version.hxx[ADD], src/web.ui[DEL], - src/webrunner.cxx: - new build system - -2015-05-03 20:32 marc - - * [r29] src/commands.hxx, src/exceptions.hxx, src/testgui.hxx: - new feature: define and call functions using the two new commands - function and call - -2015-04-30 14:25 marc - - * [r28] configure.ac, docker[ADD], docker/Dockerfile[ADD], - docker/runtests.sh[ADD], src/commands.hxx, src/testgui.hxx, - src/testgui.ui, src/webrunner.cxx, src/webtester.cxx: - More features: have a seperate setup script, where global - variable replacements can be placed, new commandline parameters, - command window, better recording, chose click type, ... - -2015-04-24 14:39 marc - - * [r27] src/commands.hxx, src/exceptions.hxx, - src/networkaccessmanager.hxx, src/testgui.hxx, src/webtester.cxx: - some more improvements, new commands, new simpler ecpect load - command, certificate handling for self signed ca plus for client - authentication - -2015-04-02 14:28 marc - - * [r26] src/networkaccessmanager.hxx: - more information in cae of network error - -2015-04-02 09:42 marc - - * [r25] src/commands.hxx: - new command «certificate» to install CA certificate for SSL - - file needs to be open ... - -2015-04-02 09:07 marc - - * [r24] src/commands.hxx: - new command «certificate» to install CA certificate for SSL - - need to register the new class ... - -2015-04-02 08:25 marc - - * [r23] src/commands.hxx: - new command «certificate» to install CA certificate for SSL - -2015-04-02 08:25 marc - - * [r22] src/commands.hxx: - new command «certificate» to install CA certificate for SSL - -2015-04-02 07:45 marc - - * [r21] src/commands.hxx, src/exceptions.hxx, src/testgui.hxx: - new command «certificate» to install CA certificate for SSL - -2015-03-04 15:31 marc - - * [r20] src/commands.hxx, src/testgui.ui: - added date/time to attachment file names, so the images are - sorted correctly - -2015-02-27 15:39 marc - - * [r19] src/commands.hxx, src/testgui.hxx: - detect and handle Moo-Tools-Comboboxes - -2015-02-24 08:54 marc - - * [r18] debian/control.in: - precise: QCommandLineParser: No such file or directory - minimum - requirement ist Qt 5.2 - -2015-02-24 08:48 marc - - * [r17] debian/control.in: - precise: QCommandLineParser: No such file or directory - -2015-02-24 08:40 marc - - * [r16] debian/control.in: - Project ERROR: Unknown module(s) in QT: quick - -2015-02-24 08:04 marc - - * [r15] debian/control.in: - Project ERROR: Unknown module(s) in QT: quick - -2015-02-23 16:31 marc - - * [r14] debian/control.in: - qtchooser is sufficient - -2015-02-23 16:27 marc - - * [r13] debian/control.in: - svn2cl not available in old distributions - -2015-02-23 14:01 marc - - * [r12] configure.ac: - fix choosing qt - -2015-02-23 13:40 marc - - * [r11] configure.ac, src/webtester.pro: - fix choosing qt - -2015-02-23 13:00 marc - - * [r10] src/makefile.am: - makefile fixed - -2015-02-23 12:52 marc - - * [r9] README: - README filled - -2015-02-23 12:18 marc - - * [r8] configure.ac, debian/control.in, src/makefile.am: - qt detection - -2015-02-16 09:19 marc - - * [r7] debian/control.in: - better definition of deb-dependencies - -2015-02-06 15:50 marc - - * [r6] src/makefile.am: - make distcheck works - -2015-02-06 15:00 marc - - * [r5] AUTHORS[ADD], COPYING[ADD], ChangeLog[ADD], INSTALL[ADD], - NEWS[ADD], README[ADD], bootstrap.sh[ADD], configure.ac[ADD], - debian[ADD], debian/changelog.in[ADD], debian/compat[ADD], - debian/control.in[ADD], debian/docs[ADD], debian/rules[ADD], - makefile.am[ADD], src/makefile[DEL], src/makefile.am[CPY]: - ready to build debian packages - -2015-02-05 14:53 marc - - * [r4] src/makefile[ADD]: - 1st makefile - -2015-02-04 14:05 marc - - * [r3] src/webrunner.cxx: - successful build - -2015-02-04 14:01 marc - - * [r2] src[ADD], src/commands.hxx[ADD], src/exceptions.hxx[ADD], - src/networkaccessmanager.hxx[ADD], src/testgui.hxx[ADD], - src/testgui.ui[ADD], src/web.ui[ADD], src/webpage.hxx[ADD], - src/webrunner.cxx[ADD], src/webtester.cxx[ADD], - src/webtester.pro[ADD]: - initial sources - -2015-02-04 13:48 marc - - * [r1] .[ADD]: - initial - diff --git a/INSTALL b/INSTALL index ddcdb76..8b641e3 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.15/INSTALL \ No newline at end of file +/usr/share/automake-1.13/INSTALL \ No newline at end of file diff --git a/README b/README.md similarity index 92% rename from README rename to README.md index 9973499..aa31c89 100644 --- a/README +++ b/README.md @@ -1,4 +1,5 @@ -# Framework for Automated Web Application Testing +Framework for Automated Web Application Testing +=============================================== There is a test GUI including browser to record user input while he surfs on the web and a test runner to run (recorded) test scripts. The tests can be integrated e.g. in a jenkins build job. It has been tested on Wordpress, Dokuwiki and Joomla pages. Joomla is difficult due to Javascript-Moo-Tools pollution. There's some specific support, that may help a bit, but to test Joomla sites, you need a lot of experience. Concluson: Avoid Joomla. diff --git a/ax_check_qt.m4 b/ax_check_qt.m4 index e0eecf2..1781f62 100644 --- a/ax_check_qt.m4 +++ b/ax_check_qt.m4 @@ -119,10 +119,25 @@ AC_DEFUN([AX_CHECK_QT], [ AC_DEFINE([HAVE_$1]) QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core) - if test -d "${qt_host_bins}"; then - QT_PLUGIN_PATH=${qt_host_bins}/../plugins + qt_libdir=$(${PKG_CONFIG} --variable=libdir Qt5Core) + if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/plugins" + elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins" + elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then + QT_PLUGIN_PATH="${qt_host_bins}/../plugins" + elif test -d "${QTDIR}/plugins; then + QT_PLUGIN_PATH="${QTDIR}/plugins" + elif test -d "${QTDIR}/share/qt5/plugins; then + QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins" else - QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins + AC_MSG_ERROR([QT_PLUGIN_PATH not found + - not in: ${qt_libdir}/plugins + - not in: ${qt_libdir}/qt5/plugins + - not in: ${qt_host_bins}/../plugins + - not in: ${QTDIR}/plugins + - not in: ${QTDIR}/share/qt5/plugins +]) fi MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" [$1]_CPPFLAGS="${[$1]5_CFLAGS}" @@ -166,10 +181,25 @@ AC_DEFUN([AX_CHECK_QT], [ AC_DEFINE([HAVE_$1]) QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore) - if test -d "${qt_host_bins}"; then - QT_PLUGIN_PATH=${qt_host_bins}/../plugins + qt_libdir=$(${PKG_CONFIG} --variable=libdir QtCore) + if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/plugins" + elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins" + elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then + QT_PLUGIN_PATH="${qt_host_bins}/../plugins" + elif test -d "${QTDIR}/plugins; then + QT_PLUGIN_PATH="${QTDIR}/plugins" + elif test -d "${QTDIR}/share/qt5/plugins; then + QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins" else - QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins + AC_MSG_ERROR([QT_PLUGIN_PATH not found + - not in: ${qt_libdir}/plugins + - not in: ${qt_libdir}/qt5/plugins + - not in: ${qt_host_bins}/../plugins + - not in: ${QTDIR}/plugins + - not in: ${QTDIR}/share/qt5/plugins +]) fi MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" [$1]_CPPFLAGS="${[$1]_CFLAGS}" @@ -214,9 +244,6 @@ AC_DEFUN([AX_CHECK_QT], [ AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) fi test "x$prefix" = xNONE && prefix=$ac_default_prefix - if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then - QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr} - fi AC_ARG_WITH([qt-plugin-path], [AS_HELP_STRING([--with-qt-plugin-path=PATH], [define a different qt plugin path, current @<:@default=check@:>@])], diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index b13fb76..280dd4c 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -1,4 +1,4 @@ -## @id $Id$ +## @id $Id: ax_init_standard_project.m4 204 2016-09-29 18:29:53Z marc $ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -218,7 +218,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(AUTHOR_URL) AX_SUBST(AUTHOR_MAIL) AX_SUBST(PACKAGER) - PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}" + #PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}" SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}" AX_SUBST(PROJECT_URL) AX_SUBST(SOURCE_DOWNLOAD) @@ -365,12 +365,13 @@ AC_DEFUN([AX_USE_CXX], [ #### Begin: Appended by $0 %.app: % -rm -r [\$][@] - \$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install + \$(MAKE) DESTDIR=[\$][\$](pwd)/tmp install QTDIR="\${QTDIR}" \ QT_PLUGINS="\${QT_PLUGINS}" \ QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \ \${top_builddir}/mac-create-app-bundle.sh \ - [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix} + [\$][@] [\$][<] [\$][\$](pwd)/tmp[\$]{prefix} + -rm -rf tmp maintainer-clean-cxx-targets: -rm makefile.in diff --git a/bootstrap.sh b/bootstrap.sh index 3527f9b..69c0994 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,7 @@ #! /bin/bash ## @file ## -## $Id$ +## $Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $ ## ## $Date: 2004/08/31 15:57:19 $ ## $Author: marc $ @@ -41,7 +41,7 @@ while test $# -gt 0; do (--no-vcs|-n) novcs=1;; (--exclude-vcs|-x) shift; excludevcs+=("$1");; (--version|-v) - echo "$Id$"; + echo "$Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $"; exit;; (--help|-h) less < $@ + +CLEANFILES = 90wt-mode.el +MAINTAINERCLEANFILES = makefile.in diff --git a/scripts/wt-mode.el b/etc/wt-mode.el similarity index 100% rename from scripts/wt-mode.el rename to etc/wt-mode.el diff --git a/mac-create-app-bundle.sh b/mac-create-app-bundle.sh index 7ff4573..6b76c09 100755 --- a/mac-create-app-bundle.sh +++ b/mac-create-app-bundle.sh @@ -17,14 +17,12 @@ if test "$(uname -s)" != "Darwin"; then exit 1 fi -cd ${0%/*} - project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)} apptarget=${1:-${project}.app} -sources=${3:-$(pwd)/usr} +sources=${3:-$(pwd)/tmp} +! test -e "$apptarget" || rm -rf "$apptarget" test -n "$project" test -d "$sources" -! test -e "$apptarget" || rm -rf "$apptarget" target="$(pwd)/${apptarget}/Contents/MacOS" echo "Creating $apptarget for $project from $sources" @@ -32,7 +30,9 @@ echo "Creating $apptarget for $project from $sources" # Step 1: create and fill app directory structure mkdir -p ${apptarget}/Contents/{Resources,MacOS} ! test -d ${sources}/bin || \ - find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; + find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; +! test -d ${sources}/scripts || \ + find ${sources}/scripts -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; executablefile=${apptarget}/Contents/MacOS/${project} test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1) ! test -d ${sources}/lib || \ @@ -40,9 +40,9 @@ test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | ! test -d ${sources}/share/${project} || \ find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; ! test -d ${sources}/share || \ - find ${sources}/share -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; + find ${sources}/share -mindepth 1 -maxdepth 1 -name ${project} -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \; ! test -d ${sources} || \ - find ${sources} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; + find ${sources} -mindepth 1 -maxdepth 1 -name share -o -name bin -o -name lib -o -name scripts -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \; # Step 2: copy qt plugins, if necessary for f in ${QT_PLUGINS}; do @@ -59,7 +59,7 @@ while [ $found -ne 0 ]; do cd "${target}" for file in $(find . -type f); do for lib in $(otool -L ${file} | tail -n +2 \ - | egrep '/opt/local/|'"${HOME}" \ + | egrep '/usr/local/|/opt/local/|'"${HOME}" \ | grep -v $file | awk '{print $1}'); do found=1 test -f ${lib##*/} \ diff --git a/makefile.am b/makefile.am index e7445aa..829d15c 100644 --- a/makefile.am +++ b/makefile.am @@ -2,23 +2,29 @@ ## ## This file has been added: ## - by bootstrap.sh -## - on Wed, 14 June 2017 13:33:26 +0200 +## - on Wed, 18 July 2018 14:00:26 +0200 ## Feel free to change it or even remove and rebuild it, up to your needs ## ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -SUBDIRS = src test scripts doc +SUBDIRS = src etc test scripts doc desktopdir = ${datadir}/applications desktop_DATA = @PACKAGE_DESKTOP@ -dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh \ - resolve-rpmbuilddeps.sh autogen.sh \ +dist_pkgdata_DATA = @PACKAGE_ICON@ +dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \ + resolve-rpmbuilddeps.sh autogen.sh \ ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh \ build-resource-file.sh \ ax_init_standard_project.m4 \ mac-create-app-bundle.sh resolve-debbuilddeps.sh \ + dependency-graph.sh template.sh \ sql-to-dot.sed -dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog +dist_doc_DATA = AUTHORS NEWS README.md COPYING INSTALL ChangeLog +README: README.md + cp README.md README + +CLEANFILES = README MAINTAINERCLEANFILES = makefile.in diff --git a/scripts/makefile.am b/scripts/makefile.am index 47717dc..d9ba588 100644 --- a/scripts/makefile.am +++ b/scripts/makefile.am @@ -8,17 +8,4 @@ dist_bin_SCRIPTS = doxygen-webtester.sed -emacsdir = ${datadir}/emacs/site-lisp -dist_emacs_SCRIPTS = wt-mode.el - -emacsconfdir = ${sysconfdir}/emacs/site-start.d -emacsconf_DATA = 90wt-mode.el - -EXTRA_DIST = 90wt-mode.el.in - -90wt-mode.el: 90wt-mode.el.in - sed 's,@emacsdir@,'"${emacsdir}"',g' $< > $@ - -CLEANFILES = 90wt-mode.el MAINTAINERCLEANFILES = makefile.in - diff --git a/webtester.spec.in b/webtester.spec.in index 50514e5..4f6e2ee 100644 --- a/webtester.spec.in +++ b/webtester.spec.in @@ -7,7 +7,7 @@ Group: @RPM_GROUP@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, doxygen, graphviz, java-openjdk @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ +BuildRequires: which, pkgconfig, gnupg, expect, git, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, doxygen, graphviz, java-openjdk @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ #### os dependent definitions #### %if 0%{?suse_version} || 0%{?sles_version} @@ -52,11 +52,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -/etc /usr/bin -/usr/share/emacs /usr/share/applications -/usr/share/@PACKAGE_NAME@ +/usr/share/emacs + +%config +/etc %doc /usr/share/doc