update build system
This commit is contained in:
		
							
								
								
									
										20
									
								
								ChangeLog
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								ChangeLog
									
									
									
									
									
								
							| @@ -1,3 +1,23 @@ | |||||||
|  | 2016-05-03 06:52   | ||||||
|  |  | ||||||
|  | 	* src/commands.hxx: some smaller fixes and improvements for joomla | ||||||
|  | 	  testing | ||||||
|  |  | ||||||
|  | 2016-05-02 15:25   | ||||||
|  |  | ||||||
|  | 	* src/commands.hxx, src/testgui.hxx: some smaller fixes and | ||||||
|  | 	  improvements for joomla testing | ||||||
|  |  | ||||||
|  | 2016-05-02 11:02   | ||||||
|  |  | ||||||
|  | 	* COPYING, ChangeLog, INSTALL, autogen.sh, | ||||||
|  | 	  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   | 2016-04-03 16:19   | ||||||
|  |  | ||||||
| 	* configure.ac, debian/control.in: after svn-server restore | 	* configure.ac, debian/control.in: after svn-server restore | ||||||
|   | |||||||
| @@ -14,6 +14,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], | |||||||
|       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" |       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" | ||||||
|       for path in . .. ../.. ../../..; do |       for path in . .. ../.. ../../..; do | ||||||
|         if test -d .svn; then |         if test -d .svn; then | ||||||
|  |           svn upgrade 1>&2 > /dev/null || true | ||||||
|           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||||
|           if test -n "${VCS_REVISION}"; then break; fi |           if test -n "${VCS_REVISION}"; then break; fi | ||||||
|         elif test -d .git; then |         elif test -d .git; then | ||||||
| @@ -26,6 +27,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], | |||||||
|       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" |       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" | ||||||
|       for path in . .. ../.. ../../..; do |       for path in . .. ../.. ../../..; do | ||||||
|         if test -d .svn; then |         if test -d .svn; then | ||||||
|  |           svn upgrade 1>&2 > /dev/null || true | ||||||
|           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||||
|           if test -n "${VCS_REVISION}"; then break; fi |           if test -n "${VCS_REVISION}"; then break; fi | ||||||
|         elif test -d .git; then |         elif test -d .git; then | ||||||
| @@ -46,6 +48,7 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([ | |||||||
|   VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" |   VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" | ||||||
|   for path in . .. ../.. ../../..; do |   for path in . .. ../.. ../../..; do | ||||||
|     if test -d .svn; then |     if test -d .svn; then | ||||||
|  |       svn upgrade 1>&2 > /dev/null || true | ||||||
|       VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |       VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||||
|       if test -n "${VCS_REVISION}"; then break; fi |       if test -n "${VCS_REVISION}"; then break; fi | ||||||
|     elif test -d .git; then |     elif test -d .git; then | ||||||
| @@ -178,8 +181,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ | |||||||
|   _AM_SUBST_NOTMAKE([AUTHOR]) |   _AM_SUBST_NOTMAKE([AUTHOR]) | ||||||
|   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) |   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) | ||||||
|   AX_SUBST(DISTRO) |   AX_SUBST(DISTRO) | ||||||
|   ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm)) |  | ||||||
|   AX_SUBST(ARCH) |  | ||||||
|   DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null) |   DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null) | ||||||
|   case "${DISTRIBUTOR// /-}" in |   case "${DISTRIBUTOR// /-}" in | ||||||
|     (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);; |     (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);; | ||||||
|   | |||||||
| @@ -129,7 +129,6 @@ GENERATED FILES | |||||||
|     * resolve-debbuilddeps.sh - script to install debian package dependencies |     * resolve-debbuilddeps.sh - script to install debian package dependencies | ||||||
|     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies |     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies | ||||||
|     * build-in-docker.sh - script to build the project encapsulated in a docker container |     * build-in-docker.sh - script to build the project encapsulated in a docker container | ||||||
|     * build-in-docker.conf - additional configuration for build-in-docker.sh |  | ||||||
|     * build-resource-file.sh - build resource.qrc file from a resource directory |     * build-resource-file.sh - build resource.qrc file from a resource directory | ||||||
|     * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen |     * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen | ||||||
|     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle |     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle | ||||||
| @@ -1163,12 +1162,6 @@ Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@ | |||||||
| Cflags: -I\${includedir} @CPPFLAGS@ | Cflags: -I\${includedir} @CPPFLAGS@ | ||||||
| Requires: @PKG_REQUIREMENTS@ | Requires: @PKG_REQUIREMENTS@ | ||||||
| EOF | EOF | ||||||
| to build-in-docker.conf <<EOF |  | ||||||
| repos+=("Debian|Ubuntu-precise::::::universe") |  | ||||||
| repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'") |  | ||||||
| envs+=("-e 'HOME=\${HOME}'") |  | ||||||
| dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro") |  | ||||||
| EOF |  | ||||||
|  |  | ||||||
| #### Cleanup If Makefile Exists #### | #### Cleanup If Makefile Exists #### | ||||||
| if test -f makefile; then | if test -f makefile; then | ||||||
|   | |||||||
| @@ -189,9 +189,9 @@ case $mode in | |||||||
|     (apt) |     (apt) | ||||||
|         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' |         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 |         for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do | ||||||
|             docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" |             docker exec -it ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" | ||||||
|             docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" |             docker exec -it ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" | ||||||
|             docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" |             docker exec -it ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" | ||||||
|         done |         done | ||||||
|         docker exec ${DOCKER_ID} apt-get update ${OPTIONS} |         docker exec ${DOCKER_ID} apt-get update ${OPTIONS} | ||||||
|         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} |         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user