From: nishi Date: Wed, 12 Jun 2024 05:58:58 +0000 (+0000) Subject: fix X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=7726ddb9cf58689abd5d3bec6dfc04b99bd7623c;p=dataworks.git fix git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@252 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- diff --git a/PKGBUILD b/Package/PKGBUILD similarity index 95% rename from PKGBUILD rename to Package/PKGBUILD index 5aed47f..5fe6562 100644 --- a/PKGBUILD +++ b/Package/PKGBUILD @@ -5,9 +5,9 @@ pkgver='0.1.0' pkgdesc='Database System' arch=('i686' 'x86_64') license=('BSD') -pkgrel='37' +pkgrel='38' makedepends=('byacc') -source=('dataworks::svn+http://sw.nishi.boats/svn/nishi-dataworks/trunk#revision=250') +source=('dataworks::svn+http://sw.nishi.boats/svn/nishi-dataworks/trunk#revision=252') sha256sums=('SKIP') build() { diff --git a/Package/increment-PKGBUILD b/Package/increment-PKGBUILD new file mode 100644 index 0000000..a272009 --- /dev/null +++ b/Package/increment-PKGBUILD @@ -0,0 +1 @@ +39 diff --git a/common.mk b/common.mk index 207b506..888fcf5 100644 --- a/common.mk +++ b/common.mk @@ -1,6 +1,6 @@ # $Id$ -.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 +.PHONY: all no-doc replace format clean ./Library ./Client ./Document ./Grammar ./Package/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 @@ -119,7 +119,7 @@ cleanup-dosbox: get-version: @echo $(VERSION) -./PKGBUILD: +./Package/PKGBUILD: echo "# \$$Id\$$" > $@ echo >> $@ echo "pkgname='dataworks'" >> $@ @@ -127,7 +127,7 @@ get-version: echo "pkgdesc='Database System'" >> $@ echo "arch=('i686' 'x86_64')" >> $@ echo "license=('BSD')" >> $@ - echo "pkgrel='`cat increment-PKGBUILD`'" >> $@ + echo "pkgrel='`cat ./Package/increment-PKGBUILD`'" >> $@ echo "makedepends=('byacc')" >> $@ echo "source=('dataworks::svn+http://sw.nishi.boats/svn/nishi-dataworks/trunk#revision="`svn info -r HEAD | grep "Revision" | grep -Eo "[0-9]+" | xargs expr 1 +`"')" >> $@ echo "sha256sums=('SKIP')" >> $@ @@ -151,4 +151,4 @@ get-version: echo " ln -sf dataworks_server \$$pkgdir/usr/bin/dwserv" >> $@ echo " ln -sf dataworks \$$pkgdir/usr/bin/dw" >> $@ echo "}" >> $@ - expr `cat increment-PKGBUILD` + 1 > increment-PKGBUILD + expr `cat ./Package/increment-PKGBUILD` + 1 > ./Package/increment-PKGBUILD diff --git a/increment-PKGBUILD b/increment-PKGBUILD deleted file mode 100644 index e522732..0000000 --- a/increment-PKGBUILD +++ /dev/null @@ -1 +0,0 @@ -38