[csw-devel] SF.net SVN: gar:[6727] csw/mgar/gar/v2-pbuild

[dmichelsen at users.sourceforge.net]

Revision: 6727
          http://gar.svn.sourceforge.net/gar/?rev=6727&view=rev
Author:   dmichelsen
Date:     2009-10-06 14:32:10 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
mGAR v2-pbuild: Add submitpkg target

Modified Paths:
--------------
    csw/mgar/gar/v2-pbuild/bin/checkpkg
    csw/mgar/gar/v2-pbuild/gar.pkg.mk

Modified: csw/mgar/gar/v2-pbuild/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2-pbuild/bin/checkpkg	2009-10-06 14:31:37 UTC (rev 6726)
+++ csw/mgar/gar/v2-pbuild/bin/checkpkg	2009-10-06 14:32:10 UTC (rev 6727)
@@ -543,6 +543,7 @@
     print "Doing late evaluations of package library dependencies."
     while read ldep; do
 	lib=`echo $ldep | nawk '{print $1}'`
+        [ "$lib" = "libm.so.2" ] && continue
 	pkg=`echo $ldep | nawk '{print $2}'`
 	/usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS
 	if [ $? -ne 0 ]; then

Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-10-06 14:31:37 UTC (rev 6726)
+++ csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-10-06 14:32:10 UTC (rev 6727)
@@ -279,7 +279,7 @@
 # The package may be generated during this build or already installed on the system.
 # /etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA l none SUNWcsr
 #perl -ane '$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){print join(" ",$$F[3..$$#F]),"\n";exit}'</var/sadm/install/contents
-#$(shell /usr/sbin/pkgchk -l -p $1 2>/dev/null | awk '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)')
+#$(shell /usr/sbin/pkgchk -l -p $1 2>/dev/null | $(GAWK) '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)')
 # 'pkchk -l -p' doesn't work as it concatenates package names with more than 14 characters,
 # e. g. SUNWgnome-base-libs-develSUNWgnome-calculatorSUNWgnome-freedb-libsSUNWgnome-cd-burnerSUNWgnome-character-map
 define file2pkg
@@ -374,7 +374,7 @@
 		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
 			$(if $(SPKG_DESC_$(PKG)), \
 				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
-				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \
+				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \
 			) \
 		)) >$@)
 
@@ -675,6 +675,14 @@
 		)\
 	)
 
+submitpkg: submitpkg-default
+
+submitpkg-%: _PKGURL=$(shell svn info .. | $(GAWK) '$$1 == "URL:" { print $$2 }')
+submitpkg-%:
+	@$(if $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),\
+		$(error You have local files not in the repository. Please commit everything before submitting a package))
+	$(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION)$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION)$(SPKG_REVSTAMP)
+
 # dependb - update the dependency database
 #
 dependb:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.