updated stuff

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@171 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/PKGBUILD b/PKGBUILD
index dde6f99f90c0d0f0c205d29ce063446e19a3a228..14ec0a642c563f7fa1b319d942ade4884b69e9d7 100644 (file)
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 license=('BSD')
 pkgrel='1'
 makedepends=('byacc')
-source=('dataworks::svn+http://sw.nishi.boats/svn/nishi-dataworks/trunk#revision=169')
+source=('dataworks::svn+http://sw.nishi.boats/svn/nishi-dataworks/trunk#revision=170')
 sha256sums=('SKIP')
 
 build() {

diff --git a/common-decl.mk b/common-decl.mk
index 3b5139f805185c71e160b8bcde5719b402cd1f2e..b9e0d23bef07a72fe41c0a7fb953939eda75b0c5 100644 (file)
--- a/common-decl.mk
+++ b/common-decl.mk
@@ -23,5 +23,6 @@ PLATFORM_P = `uname -p | sed -E "s/[ \\(\\)]/-/g"`
 LINK_LIB = ../Library/$(STATICLIB_PREFIX)dataworks$(STATICLIB_SUFFIX)
 SERVER = ./Server
 SERVER_MODULE = tcpip.o
+VERSION = `cat Library/dataworks.c | grep " dataworks_version " | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?'`
 
 COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIB="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)" WINDRES="$(WINDRES)" YACC="$(YACC)" LEX="$(LEX)" LFLAGS="$(LFLAGS)" YFLAGS="$(YFLAGS)" SERVER_MODULE="$(SERVER_MODULE)"

diff --git a/common.mk b/common.mk
index 4f59ab8b5711156dfe4b6ba75c4c873a18239f3f..9d6f9b8ae1304352a211d76c2c2ad02f214ec559 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-.PHONY: all no-doc replace format clean ./Library ./Client ./Document ./Grammar archive archive-prepare archive-cleanup archive-targz archive-zip dosbox prepare-dosbox dosbox-x cleanup-dosbox
+.PHONY: all no-doc replace format clean ./Library ./Client ./Document ./Grammar ./PKGBUILD PKGBUILD archive archive-prepare archive-cleanup archive-targz archive-zip dosbox prepare-dosbox dosbox-x cleanup-dosbox get-version
 
 all: ./Grammar ./Library ./Client $(SERVER) ./Document
 
@@ -116,11 +116,14 @@ dosbox-x: prepare-dosbox
 cleanup-dosbox:
        rm -f op.txt dosbox.conf DW.* DWSERV.* dw.* dwserv.* dosbox.core
 
+get-version:
+       echo $(VERSION)
+
 ./PKGBUILD:
        echo "# \$$Id\$$" > $@
        echo >> $@
        echo "pkgname='dataworks'" >> $@
-       echo "pkgver='"`cat Library/dataworks.c | grep " dataworks_version " | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?'`"'" >> $@
+       echo "pkgver='"$(VERSION)"'" >> $@
        echo "pkgdesc='Database System'" >> $@
        echo "arch=('i686' 'x86_64')" >> $@
        echo "license=('BSD')" >> $@
@@ -147,3 +150,5 @@ cleanup-dosbox:
        echo "  ln -sf dataworks_server \$$pkgdir/usr/bin/dwserv" >> $@
        echo "  ln -sf dataworks \$$pkgdir/usr/bin/dw" >> $@
        echo "}" >> $@
+
+PKGBUILD: ./PKGBUILD