nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-30 03:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some changes to allow for snapshot builds.

Browse Source 
Signed-off-by: Andrew McMillan <andrew@morphoss.com>
This commit is contained in:
Andrew McMillan 2011-01-20 23:34:21 +13:00
parent f59e109ace
commit 6f50f3e2e2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -3,6 +3,7 @@
package=davical package=davical
version=$(shell cat VERSION) version=$(shell cat VERSION)
snapshot : version = $(shell sed -n 's:\([0-9\.]*\)[-a-f0-9-]*:\1:p' VERSION)-git$(shell git rev-parse --short HEAD)
all: htdocs/always.php built-docs built-po all: htdocs/always.php built-docs built-po
@ -31,6 +32,8 @@ release: built-docs VERSION
$(shell find $(package)-$(version)/docs/api/ ! -name "phpdoc.ini" ) $(shell find $(package)-$(version)/docs/api/ ! -name "phpdoc.ini" )
rm $(package)-$(version) rm $(package)-$(version)
snapshot: release
clean: clean:
rm -f built-docs built-po rm -f built-docs built-po
-find . -name "*~" -delete -find . -name "*~" -delete

2
scripts/build-always.sh
View File

@ -7,7 +7,7 @@ DAVICAL_VERSION="`head -n1 VERSION`"
DB_VERSION="`grep 'SELECT new_db_revision' dba/davical.sql | cut -f2 -d'(' | cut -f1-3 -d,`" DB_VERSION="`grep 'SELECT new_db_revision' dba/davical.sql | cut -f2 -d'(' | cut -f1-3 -d,`"
AWL_VERSION="`head -n1 ../awl/VERSION`" AWL_VERSION="`head -n1 ../awl/VERSION`"
if [ -z "${AWL_VERSION}" ] ; then if [ -z "${AWL_VERSION}" ] ; then
AWL_VERSION="`grep 'want_awl_version' htdocs/always.php | cut -f2 -d= | cut -f1 -d';'`" AWL_VERSION="'`grep 'want_awl_version' inc/always.php.in | cut -f2 -d= | cut -f1 -d';' | sed 's: ::g'`'"
fi fi
sed -e "/^ *.c->version_string *= *'[^']*' *;/ s/^ *.c->version_string *= *'[^']*' *;/\$c->version_string = '${DAVICAL_VERSION}';/" \ sed -e "/^ *.c->version_string *= *'[^']*' *;/ s/^ *.c->version_string *= *'[^']*' *;/\$c->version_string = '${DAVICAL_VERSION}';/" \