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

[dmichelsen at users.sourceforge.net]

Revision: 4338
          http://gar.svn.sourceforge.net/gar/?rev=4338&view=rev
Author:   dmichelsen
Date:     2009-04-16 08:02:24 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
mGAR v2: Append UNCOMMITTED etc. to package filename if sources have not been fully checked in

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/gar/v2/pkglib/csw_vars.gspec

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-04-15 22:48:14 UTC (rev 4337)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-04-16 08:02:24 UTC (rev 4338)
@@ -112,6 +112,8 @@
 
 SPKG_DEPEND_DB  = $(GARDIR)/csw/depend.db
 
+SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg
+
 PKGGET_DESTDIR ?=
 
 DEPMAKER_EXTRA_ARGS = --noscript --nodep SUNW
@@ -134,7 +136,7 @@
 PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT
 PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY
 PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES
-PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP
+PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER SPKG_PKGFILE TIMESTAMP
 PKG_EXPORTS += DEPMAKER_EXTRA_ARGS PKGLIB DESTDIR
 
 define _PKG_ENV

Modified: csw/mgar/gar/v2/pkglib/csw_vars.gspec
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_vars.gspec	2009-04-15 22:48:14 UTC (rev 4337)
+++ csw/mgar/gar/v2/pkglib/csw_vars.gspec	2009-04-16 08:02:24 UTC (rev 4338)
@@ -1,6 +1,6 @@
 %cvar           arch %{GARCH}
 %cvar           desc %{SPKG_DESC}
-%cvar           pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-CSW.pkg
+%cvar           pkgfile %{SPKG_PKGFILE}
 %cvar           RC_INIT_SCRIPT csw%{bitname}
 %cvar           SMF_SCRIPT svc-csw%{bitname}
 %cvar           SMF_MANIFEST csw%{bitname}.xml


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