OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 02-Aug-2006 23:51:53
Branch: HEAD Handle: 2006080222515300
Modified files:
openpkg-registry .cvsignore Makefile
Log:
new clean and register.8 targets; modify deploylab and fieldtest logic
to work in a tmp dir; CVS ignore tmp dir and tar file
Summary:
Revision Changes Path
1.2 +2 -0 openpkg-registry/.cvsignore
1.12 +25 -11 openpkg-registry/Makefile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.2 .cvsignore
--- openpkg-registry/.cvsignore 25 Jul 2006 13:41:31 -0000 1.1
+++ openpkg-registry/.cvsignore 2 Aug 2006 21:51:53 -0000 1.2
@@ -1 +1,3 @@
*.8
+tmp
+*.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-registry/Makefile
============================================================================
$ cvs diff -u -r1.11 -r1.12 Makefile
--- openpkg-registry/Makefile 25 Jul 2006 13:41:31 -0000 1.11
+++ openpkg-registry/Makefile 2 Aug 2006 21:51:53 -0000 1.12
@@ -2,10 +2,11 @@
PACKAGE_NAME = openpkg-registry
PACKAGE_DESC = OpenPKG Registry
VERSION_FILE = VERSION
-
+TMP = tmp/
POD2MAN = pod2man
all:
+ @echo "$(MAKE) clean ....... delete temporary files"
@echo "$(MAKE) release ..... release current state (ALL IN ONE)"
@echo "$(MAKE) private ..... release w/o CVS activity (MOST IN ONE)"
@echo "$(MAKE) version ..... update distribution version (INDIVIDUAL
STEP)"
@@ -13,6 +14,13 @@
@echo "$(MAKE) tarball ..... make distribution tarball (INDIVIDUAL
STEP)"
@echo "$(MAKE) upload ...... upload distribution tarball (INDIVIDUAL
STEP)"
+clean:
+ @( rm openpkg-registry-*.tar.gz \
+ register.8 \
+ $(TMP)/rm0/* $(TMP)/en2/* 2>/dev/null; \
+ rmdir $(TMP)/rm0 $(TMP)/en2 $(TMP) \
+ ) 2>/dev/null || true
+
release:
@$(MAKE) $(MFLAGS) version
@cvs ci -m "bump before release"
@@ -44,6 +52,9 @@
-e "s/^my \\\$$progvers=\"[^\"]*\";/my
\\\$$progvers=\"$${V}\";/" \
-e "s/^my \\\$$progdate=\"[^\"]*\";/my
\\\$$progdate=\"$${D}\";/" \
registry-db.pl registry-ui.pl
+
+register.8: register.sh
+ @echo "++ generating register.8 manual page"; \
$(POD2MAN) --section=8 --center="OpenPKG" \
--release=\"$${V}\" --date=\"$${D}\" \
register.sh >register.8
@@ -52,7 +63,7 @@
echo "++ tagging with OPENPKG_REGISTRY_$$V"; \
cvs tag -F OPENPKG_REGISTRY_$$V
-tarball:
+tarball: clean register.8
@V=`shtool version -l txt -d short $(VERSION_FILE)`; \
echo "++ rolling distribution tarball ($(PACKAGE_NAME)-$${V}.tar.gz)"; \
shtool tarball -o $(PACKAGE_NAME)-$${V}.tar.gz \
@@ -69,29 +80,32 @@
V=`shtool version -l txt -d short $(VERSION_FILE)`; V="$$V+DEV"; \
D=`date '+%Y%m%d%H%M%S'`; \
echo V=$$V D=$$D; \
- cp registry-db.pl registry-db-rm0.pl; \
- cp registry-ui.pl registry-ui-rm0.pl; \
- cp register.sh register-rm0.sh; \
+ mkdir -p $(TMP)rm0/; \
+ cp registry-db.pl registry-ui.pl registry.pm register.sh $(TMP)rm0/; \
shtool subst \
-e "s/^my \\\$$progvers=\"[^\"]*\";/my
\\\$$progvers=\"$${V}\";/" \
-e "s/^my \\\$$progdate=\"[^\"]*\";/my
\\\$$progdate=\"$${D}\";/" \
-e "s;@l_prefix@;/openpkg-reg;g" \
registry-*-rm0.pl register-rm0.sh
- scp register-rm0.sh [EMAIL
PROTECTED]:/openpkg-reg/libexec/openpkg-tools/register.sh
- scp registry-ui-rm0.pl [EMAIL
PROTECTED]:/openpkg-reg/cgi/openpkg-registry/registry-ui-dev.pl
- scp registry-db-rm0.pl [EMAIL
PROTECTED]:/openpkg-reg/sbin/openpkg-registry-setup
+ $(TMP)rm0/*
+ ( for i in `builtin cd $(TMP)rm0/ && echo *`; do diff -U 3 $$i
$(TMP)rm0/$$i; done ) | cvs-diff-colorize
+ scp $(TMP)rm0/register.sh [EMAIL
PROTECTED]:/openpkg-reg/libexec/openpkg-tools/register-dev.sh
+ scp $(TMP)rm0/registry-ui.pl [EMAIL
PROTECTED]:/openpkg-reg/cgi/openpkg-registry/registry-ui-dev.pl
+ scp $(TMP)rm0/registry-db.pl [EMAIL
PROTECTED]:/openpkg-reg/sbin/registry-db-dev
fieldtest:
@echo "++ deploy code directly for field testing"; \
V=`shtool version -l txt -d short $(VERSION_FILE)`; V="$$V+DEV"; \
D=`date '+%Y%m%d%H%M%S'`; \
echo V=$$V D=$$D; \
- cp registry-db.pl registry-db-en2.pl; cp registry-ui.pl
registry-ui-en2.pl; \
+ mkdir -p $(TMP)en2/; \
+ cp registry-db.pl registry-ui.pl register.sh $(TMP)en2/; \
shtool subst \
-e "s/^my \\\$$progvers=\"[^\"]*\";/my
\\\$$progvers=\"$${V}\";/" \
-e "s/^my \\\$$progdate=\"[^\"]*\";/my
\\\$$progdate=\"$${D}\";/" \
-e "s;@l_prefix@;/v/openpkg/sw;g" \
registry-*-en2.pl
- scp registry-ui-en2.pl [EMAIL
PROTECTED]:/v/openpkg/sw/cgi/openpkg-registry/registry-ui-dev.pl
- scp registry-db-en2.pl [EMAIL
PROTECTED]:/v/openpkg/sw/sbin/openpkg-registry-setup
+ scp $(TMP)en2/register.sh [EMAIL
PROTECTED]:/v/openpkg/sw/libexec/openpkg-tools/register-dev.sh
+ scp $(TMP)en2/registry-ui.pl [EMAIL
PROTECTED]:/v/openpkg/sw/cgi/openpkg-registry/registry-ui-dev.pl
+ scp $(TMP)en2/registry-db.pl [EMAIL
PROTECTED]:/v/openpkg/sw/sbin/registry-db-dev
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
