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

skayser at users.sourceforge.net skayser at users.sourceforge.net
Thu Dec 9 04:47:04 CET 2010


Revision: 11860
          http://gar.svn.sourceforge.net/gar/?rev=11860&view=rev
Author:   skayser
Date:     2010-12-09 03:47:03 +0000 (Thu, 09 Dec 2010)

Log Message:
-----------
gar/v2: Transitional change for var renaming GAR{NAME,VERSION} -> {NAME,VERSION}

As a preparation for the introduction of GARTYPE, the two variables GARNAME
and GARVERSION will be renamed to NAME and VERSION (to better reflect their
relevance to the package, not GAR). This change renames these variables
within GAR while - for now - leaving existing build descriptions functional.

After adjusting our documentation and sending a heads up to maintainers@,
the next step will then obsolete the old variables.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/cpan_apply_updates
    csw/mgar/gar/v2/bin/depgraph
    csw/mgar/gar/v2/bin/gem2pkg
    csw/mgar/gar/v2/categories/cpan/category.mk
    csw/mgar/gar/v2/categories/java/category.mk
    csw/mgar/gar/v2/categories/kde/category.mk
    csw/mgar/gar/v2/categories/kde4/category.mk
    csw/mgar/gar/v2/categories/rbgems/category.mk
    csw/mgar/gar/v2/categories/xfce/category.mk
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.lib.mk
    csw/mgar/gar/v2/gar.mk
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/gar/v2/gar.svn.mk
    csw/mgar/gar/v2/lib/python/gartest.py
    csw/mgar/gar/v2/pkglib/Makefile
    csw/mgar/gar/v2/tests/example_test.py
    csw/mgar/gar/v2/tests/overrides_test.py
    csw/mgar/gar/v2/tests/static/example/Makefile

Modified: csw/mgar/gar/v2/bin/cpan_apply_updates
===================================================================
--- csw/mgar/gar/v2/bin/cpan_apply_updates	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/bin/cpan_apply_updates	2010-12-09 03:47:03 UTC (rev 11860)
@@ -28,7 +28,7 @@
         next;
     }
     print "Updating $module to $newvers\n";
-    my $rpat = "s/^(GARVERSION).*\$/\$1 = $newvers/";
+    my $rpat = "s/^(VERSION).*\$/\$1 = $newvers/";
     system("perl -i.bak -plne '$rpat' $module/Makefile")
         and die "Failed to upgrade $module\n";
     system("gmake -C $module update")

Modified: csw/mgar/gar/v2/bin/depgraph
===================================================================
--- csw/mgar/gar/v2/bin/depgraph	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/bin/depgraph	2010-12-09 03:47:03 UTC (rev 11860)
@@ -49,7 +49,7 @@
 
             my ($garname, @deps);
             foreach (@lines) {
-                if (/^GARNAME\s*=\s*(\S*)\s*$/) {
+                if (/^NAME\s*=\s*(\S*)\s*$/) {
                     $garname = $1;
                     next;
                 }

Modified: csw/mgar/gar/v2/bin/gem2pkg
===================================================================
--- csw/mgar/gar/v2/bin/gem2pkg	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/bin/gem2pkg	2010-12-09 03:47:03 UTC (rev 11860)
@@ -14,8 +14,8 @@
   blurb = spec.description.gsub("\n", ' ').squeeze.lstrip
 
   puts <<"EOF"
-GARNAME = #{spec.name}
-GARVERSION = #{spec.version}
+NAME = #{spec.name}
+VERSION = #{spec.version}
 CATEGORIES = rbgems
 
 DESCRIPTION = #{spec.summary}

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -3,7 +3,7 @@
 MASTER_SITES ?= $(CPAN_MIRRORS)
 
 # This is common to most modules - override in module makefile if different
-MODDIST   ?= $(GARNAME)-$(GARVERSION).tar.gz
+MODDIST   ?= $(NAME)-$(VERSION).tar.gz
 DISTFILES += $(MODDIST)
 CHECKPATH ?= $(firstword $(CPAN_MIRRORS))
 
@@ -28,13 +28,13 @@
 SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR))
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX ?= $(NAME)-(\d+(?:\.\d+)*).tar.gz
 USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
 
-$(foreach P,$(PACKAGES),$(eval _CATEGORY_SPKG_DESC_$P = $$(GARNAME): $$(or $$(SPKG_DESC_$P),$$(SPKG_DESC))))
-_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(GARNAME)";
+$(foreach P,$(PACKAGES),$(eval _CATEGORY_SPKG_DESC_$P = $$(NAME): $$(or $$(SPKG_DESC_$P),$$(SPKG_DESC))))
+_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(NAME)";
 
-SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME)
+SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(NAME)
 
 _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
 _CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec
@@ -91,23 +91,23 @@
 
 # Check for a CPAN module version update
 update-check:
-	@echo " ==> Update Check: $(GARNAME) $(GARVERSION)"
+	@echo " ==> Update Check: $(NAME) $(VERSION)"
 	@if test "x$(MANUAL_UPDATE)" != "x0" ; then \
 	    cpan_check $(CHECKPATH)$(MODDIST) \
 	               $(CURDIR)/../update_results.txt ; \
 	else \
-	    echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" ; \
+	    echo " ==> AUTO UPDATE CHECK FOR $(NAME) IS DISABLED" ; \
 	fi
 	
 # Print HTML info for modules
 module-info:
-	@echo " ==> Generating module info for $(GARNAME) $(GARVERSION)"
+	@echo " ==> Generating module info for $(NAME) $(VERSION)"
 	@printf "<a href=\"http://search.cpan.org/" \
 		>> ../module_info.html
 	@printf "~$(shell echo $(AUTHOR) | tr '[A-Z]' '[a-z]')/" \
 		>> ../module_info.html
-	@printf "$(GARNAME)-$(GARVERSION)" \
+	@printf "$(NAME)-$(VERSION)" \
 		>> ../module_info.html
-	@printf "\">$(GARNAME)-$(GARVERSION)</a><br/>\n" \
+	@printf "\">$(NAME)-$(VERSION)</a><br/>\n" \
 		>> ../module_info.html
 

Modified: csw/mgar/gar/v2/categories/java/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/java/category.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/categories/java/category.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -1,7 +1,7 @@
 # http://jakarta.apache.org/commons
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX ?= commons-$(GARNAME)-(\d+(?:\.\d+)*)-bin.tar.gz
+UFILES_REGEX ?= commons-$(NAME)-(\d+(?:\.\d+)*)-bin.tar.gz
 USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
 
 # Includes the rest of gar

Modified: csw/mgar/gar/v2/categories/kde/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/kde/category.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/categories/kde/category.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -6,8 +6,8 @@
 KDE_MIRROR    = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/
 
 MASTER_SITES ?= $(KDE_MIRROR)
-GARVERSION   ?= $(KDE_VERSION)
-PKGDIST      ?= $(GARNAME)-$(GARVERSION).tar.bz2
+VERSION   ?= $(KDE_VERSION)
+PKGDIST      ?= $(NAME)-$(VERSION).tar.bz2
 DISTFILES    += $(PKGDIST)
 
 # Compiler

Modified: csw/mgar/gar/v2/categories/kde4/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/kde4/category.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/categories/kde4/category.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -6,8 +6,8 @@
 KDE_MIRROR    = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/
 
 MASTER_SITES ?= $(KDE_MIRROR)
-GARVERSION   ?= $(KDE_VERSION)
-PKGDIST      ?= $(DISTNAME)-$(GARVERSION).tar.bz2
+VERSION   ?= $(KDE_VERSION)
+PKGDIST      ?= $(DISTNAME)-$(VERSION).tar.bz2
 DISTFILES    += $(PKGDIST)
 
 # Compiler

Modified: csw/mgar/gar/v2/categories/rbgems/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/rbgems/category.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -4,8 +4,8 @@
 MASTER_SITES ?= http://rubygems.org/downloads/
 
 # This is common to most modules - override in module makefile if different
-GEMNAME ?= $(GARNAME)
-GEMVERSION ?= $(GARVERSION)
+GEMNAME ?= $(NAME)
+GEMVERSION ?= $(VERSION)
 GEMFILE   ?= $(GEMNAME)-$(GEMVERSION).gem
 DISTFILES += $(GEMFILE)
 
@@ -86,5 +86,5 @@
 # Check for a CPAN module version update
 update-check:
 	@# TBD!
-	@echo " ==> Update Check: $(GARNAME) $(GARVERSION)"
-	@echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED"
+	@echo " ==> Update Check: $(NAME) $(VERSION)"
+	@echo " ==> AUTO UPDATE CHECK FOR $(NAME) IS DISABLED"

Modified: csw/mgar/gar/v2/categories/xfce/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/xfce/category.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/categories/xfce/category.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -4,8 +4,8 @@
 XFCE_MIRROR     = $(XFCE_ROOT)/archive/xfce-$(XFCE_VERSION)/src/
 
 MASTER_SITES   ?= $(XFCE_MIRROR)
-GARVERSION     ?= $(XFCE_VERSION)
-PKGDIST        ?= $(GARNAME)-$(GARVERSION).tar.bz2
+VERSION     ?= $(XFCE_VERSION)
+PKGDIST        ?= $(NAME)-$(VERSION).tar.bz2
 DISTFILES      += $(PKGDIST)
 
 # Compiler options

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/gar.conf.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -595,13 +595,13 @@
 #
 
 # Gnome
-GNOME_PROJ  ?= $(GARNAME)
+GNOME_PROJ  ?= $(NAME)
 GNOME_ROOT   = http://ftp.gnome.org/pub/GNOME/sources
-GNOME_SUBV   = $(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}')
+GNOME_SUBV   = $(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')
 GNOME_MIRROR = $(GNOME_ROOT)/$(GNOME_PROJ)/$(GNOME_SUBV)/
 
 # SourceForge
-SF_PROJ     ?= $(GARNAME)
+SF_PROJ     ?= $(NAME)
 SF_MIRRORS  ?= http://downloads.sourceforge.net/$(SF_PROJ)/
 # Keep this for compatibility
 SF_MIRROR    = $(firstword $(SF_MIRRORS))
@@ -609,18 +609,18 @@
 UPSTREAM_USE_SF	?= 0
 
 # Google Code
-GOOGLE_PROJECT ?= $(GARNAME)
+GOOGLE_PROJECT ?= $(NAME)
 GOOGLE_MIRROR  ?= http://$(GOOGLE_PROJECT).googlecode.com/files/
 
 # Berlios
-BERLIOS_PROJECT ?= $(GARNAME)
+BERLIOS_PROJECT ?= $(NAME)
 BERLIOS_MIRROR ?= http://download.berlios.de/$(BERLIOS_PROJECT)/ http://download2.berlios.de/$(BERLIOS_PROJECT)/
 
 # GNU
 GNU_SITE     = http://mirrors.kernel.org
 GNU_GNUROOT  = $(GNU_SITE)/gnu
 GNU_NGNUROOT = $(GNU_SITE)/non-gnu
-GNU_PROJ    ?= $(GARNAME)
+GNU_PROJ    ?= $(NAME)
 GNU_MIRROR   = $(GNU_GNUROOT)/$(GNU_PROJ)/
 GNU_NMIRROR  = $(GNU_NGNUROOT)/$(GNU_PROJ)/
 
@@ -635,7 +635,7 @@
 CPAN_FIRST_MIRROR = $(firstword $(CPAN_SITES))/authors/id
 
 # Python Package Index
-PYPI_PROJECT ?= $(GARNAME)
+PYPI_PROJECT ?= $(NAME)
 PYPI_SUBDIR = $(shell echo $(PYPI_PROJECT) | cut -c 1)
 PYPI_MIRROR = http://pypi.python.org/packages/source/$(PYPI_SUBDIR)/$(PYPI_PROJECT)/
 

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/gar.lib.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -200,7 +200,7 @@
 			else \
 				if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \
 					PACKAGE_UP_TO_DATE=1; \
-					echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \
+					echo "$(NAME) : Package is up-to-date. Current version is $$FILE" ; \
 				else \
 					NEW_FILES="$$FILE $$NEW_FILES"; \
 				fi; \
@@ -209,11 +209,11 @@
 		done; \
 		if test -z "$$NEW_FILES" ; then \
 			if [ ! -n '$(UFILES_REGEX)' ]; then \
-				echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \
+				echo "$(NAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \
 #				{ echo ""; \
-#				  echo "Hello dear $(GARNAME) maintainer,"; \
+#				  echo "Hello dear $(NAME) maintainer,"; \
 #				  echo ""; \
-#				  echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \
+#				  echo "The upstream notification job has detected that $(NAME) is not configured for automatic upstream file update detection."; \
 #				  echo ""; \
 #				  echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \
 #				  echo ""; \
@@ -221,22 +221,22 @@
 #				  echo ""; \
 #				  echo "--"; \
 #				  echo "Kindest regards"; \
-#				  echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \
+#				  echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(NAME) upstream update notification' $(NAME); \
 			else \
 				if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \
-					echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \
-					echo "$(GARNAME) :     UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \
-					echo "$(GARNAME) :     DISTNAME is $(DISTNAME)" ; \
-					echo "$(GARNAME) :     UFILES_REGEX is : $(UFILES_REGEX)" ; \
-					echo "$(GARNAME) : Please check configuration" ; \
+					echo "$(NAME) : Warning no files to check ! $(FILES2CHECK)" ; \
+					echo "$(NAME) :     UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \
+					echo "$(NAME) :     DISTNAME is $(DISTNAME)" ; \
+					echo "$(NAME) :     UFILES_REGEX is : $(UFILES_REGEX)" ; \
+					echo "$(NAME) : Please check configuration" ; \
 				fi; \
 			fi; \
 		else \
-			echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \
+			echo "$(NAME) : new upstream files available: $$NEW_FILES"; \
 			{	echo ""; \
-				echo "Hello dear $(GARNAME) maintainer,"; \
+				echo "Hello dear $(NAME) maintainer,"; \
 				echo ""; \
-				echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \
+				echo "The upstream notification job has detected the availability of new files for $(NAME)."; \
 				echo ""; \
 				echo "The following upstream file(s):"; \
 				echo "    $$NEW_FILES"; \
@@ -250,7 +250,7 @@
 				echo ""; \
 				echo "--"; \
 				echo "Kindest regards"; \
-				echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \
+				echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(NAME) upstream update notification' $(NAME); \
 		fi; \
 	fi
 
@@ -266,7 +266,7 @@
 			else \
 				if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \
 					PACKAGE_UP_TO_DATE=1; \
-					echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \
+					echo "$(NAME) : Package is up-to-date. Current version is $$FILE" ; \
 				else \
 					NEW_FILES="$$FILE $$NEW_FILES"; \
 				fi; \
@@ -275,18 +275,18 @@
 		done; \
 		if test -z "$$NEW_FILES" ; then \
 			if [ ! -n '$(UFILES_REGEX)' ]; then \
-				echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \
+				echo "$(NAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \
 			else \
 				if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \
-					echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \
-					echo "$(GARNAME) :     UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \
-					echo "$(GARNAME) :     DISTNAME is $(DISTNAME)" ; \
-					echo "$(GARNAME) :     UFILES_REGEX is : $(UFILES_REGEX)" ; \
-					echo "$(GARNAME) : Please check configuration" ; \
+					echo "$(NAME) : Warning no files to check ! $(FILES2CHECK)" ; \
+					echo "$(NAME) :     UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \
+					echo "$(NAME) :     DISTNAME is $(DISTNAME)" ; \
+					echo "$(NAME) :     UFILES_REGEX is : $(UFILES_REGEX)" ; \
+					echo "$(NAME) : Please check configuration" ; \
 				fi; \
 			fi; \
 		else \
-			echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \
+			echo "$(NAME) : new upstream files available: $$NEW_FILES"; \
 		fi; \
 	fi
 	
@@ -380,7 +380,7 @@
 # to supply an alternate target at their discretion
 git-extract-%:
 	@echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))"
-	git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR)
+	git --bare archive --prefix=$(NAME)-$(VERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR)
 	@$(MAKECOOKIE)
 
 # rule to extract files with unzip
@@ -768,8 +768,8 @@
 
 # pkg-config scripts
 install-%-config:
-	mkdir -p $(STAGINGDIR)/$(GARNAME)
-	cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/
+	mkdir -p $(STAGINGDIR)/$(NAME)
+	cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(NAME)/
 	$(MAKECOOKIE)
 
 ######################################

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/gar.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -15,6 +15,16 @@
 $(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81)
 endif
 
+# Prepare for the GARNAME & GARVERSION to NAME & VERSION migration. While the
+# recipes have not been adjusted, we will accept both variables. Once the
+# adjustment has been carried out, delete these two lines and uncomment the
+# deprecation errors below.
+NAME ?= $(GARNAME)
+VERSION ?= $(GARVERSION)
+
+#$(if $(GARNAME),$(error The deprecated variable 'GARNAME' is defined, please replace it with 'NAME'))
+#$(if $(GARVERSION),$(error The deprecated variable 'GARVERSION' is defined, please replace it with 'VERSION'))
+
 # $(GARDIR) is pre-set by the top-level category.mk
 GARBIN  = $(GARDIR)/bin
 
@@ -33,7 +43,7 @@
 PARALLELMFLAGS ?= $(MFLAGS)
 export PARALLELMFLAGS
 
-DISTNAME ?= $(GARNAME)-$(GARVERSION)
+DISTNAME ?= $(NAME)-$(VERSION)
 
 DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR))))
 _LOCALFILES = $(notdir $(wildcard files/*))
@@ -57,9 +67,9 @@
 # For rules that do nothing, display what dependencies they
 # successfully completed
 #DONADA = @echo "	[$@] complete.  Finished rules: $+"
-#DONADA = @touch $(COOKIEDIR)/$@; echo "	[$@] complete for $(GARNAME)."
+#DONADA = @touch $(COOKIEDIR)/$@; echo "	[$@] complete for $(NAME)."
 COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1)
-DONADA = @touch $(call COOKIEFILE,$@); echo "	[$@] complete for $(GARNAME)."
+DONADA = @touch $(call COOKIEFILE,$@); echo "	[$@] complete for $(NAME)."
 
 
 # TODO: write a stub rule to print out the name of a rule when it
@@ -425,8 +435,8 @@
 	@( if [ -d "$(WORKSRC)" ]; then \
 		echo ' ==> Snapshotting extracted source tree with git'; \
 		cd $(WORKSRC); git init; git add .; \
-		git commit -m "Upstream $(GARVERSION)"; \
-		git tag -am "Upstream $(GARVERSION)" upstream-$(GARVERSION); \
+		git commit -m "Upstream $(VERSION)"; \
+		git tag -am "Upstream $(VERSION)" upstream-$(VERSION); \
 		git checkout -b csw; \
 	   fi )
 	@$(MAKECOOKIE)
@@ -471,7 +481,7 @@
 	@( if [ -d "$(WORKSRC)/.git" ]; then \
 		echo "Tagging top of current csw patch stack..."; \
 		cd $(WORKSRC); \
-		git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION); \
+		git tag -am "CSW $(VERSION)" csw-$(VERSION); \
 	  fi )
 	@$(MAKECOOKIE)
 
@@ -495,7 +505,7 @@
 			echo "Capturing changes..."; \
 			git commit $(GIT_COMMIT_OPTS) && \
 			( NEXTPATCH=`git log --pretty=oneline master..HEAD | wc -l | tr -d '[[:space:]]'`; \
-			git format-patch --start-number=$$NEXTPATCH csw-$(GARVERSION); \
+			git format-patch --start-number=$$NEXTPATCH csw-$(VERSION); \
 			echo Add the following to your recipe and then; \
 			NEWPATCHES=`echo 00*-*patch`; \
 			FILES_PATCHES=`for p in $$NEWPATCHES; do echo files/$$p; done`; \

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -22,8 +22,8 @@
 PKGINFO ?= /usr/bin/pkginfo
 
 # You can use either PACKAGES with dynamic gspec-files or explicitly add gspec-files to DISTFILES.
-# Do "PACKAGES = CSWmypkg" when you build a package whose GARNAME is not the package name.
-# If no explicit gspec-files have been defined the default name for the package is CSW$(GARNAME).
+# Do "PACKAGES = CSWmypkg" when you build a package whose NAME is not the package name.
+# If no explicit gspec-files have been defined the default name for the package is CSW$(NAME).
 # The whole processing is done from _PKG_SPECS, which includes all packages to be build.
 
 # SRCPACKAGE_BASE is the name of the package containing the sourcefiles for all packages
@@ -31,8 +31,8 @@
 # SRCPACKAGE is the name of the package containing the sources
 
 ifeq ($(origin PACKAGES), undefined)
-PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
-CATALOGNAME    ?= $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME))
+PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(NAME))
+CATALOGNAME    ?= $(if $(filter %.gspec,$(DISTFILES)),,$(NAME))
 SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
 SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))
@@ -78,7 +78,7 @@
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
-BUNDLE ?= $(GARNAME)
+BUNDLE ?= $(NAME)
 
 # pkgname - Get the name of a package from a gspec-name or package-name
 #
@@ -150,7 +150,7 @@
 
 
 SPKG_DESC      ?= $(DESCRIPTION)
-SPKG_VERSION   ?= $(GARVERSION)
+SPKG_VERSION   ?= $(VERSION)
 SPKG_CATEGORY  ?= application
 SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) \
 			$(if $(filter $(GNU_MIRROR),$(MASTER_SITES)),http://www.gnu.org/software/$(GNU_PROJ)) \
@@ -248,7 +248,7 @@
 # Where we find our mkpackage global templates
 PKGLIB = $(GARDIR)/pkglib
 
-PKG_EXPORTS  = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
+PKG_EXPORTS  = NAME VERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
 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
@@ -484,7 +484,7 @@
 # Dynamic gspec-files are constructed as follows:
 # - Packages using dynamic gspec-files must be listed in PACKAGES
 # - There is a default of PACKAGES containing one packages named CSW
-#   followed by the GARNAME. It can be changed by setting PACKAGES explicitly.
+#   followed by the NAME. It can be changed by setting PACKAGES explicitly.
 # - The name of the generated package is always the same as listed in PACKAGES
 # - The catalog name defaults to the suffix following CSW of the package name,
 #   but can be customized by setting CATALOGNAME_<pkg> = <catalogname-of-pkg>
@@ -930,13 +930,13 @@
 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)
+	$(SVN) -m "$(NAME): Tag as release $(SPKG_VERSION),$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(NAME)-$(SPKG_VERSION),$(SPKG_REVSTAMP)
 
 # dependb - update the dependency database
 #
 dependb:
 	@dependb --db $(SPKG_DEPEND_DB) \
-             --parent $(CATEGORIES)/$(GARNAME) \
+             --parent $(CATEGORIES)/$(NAME) \
              --add $(DEPENDS)
 
 # pkgenv - dump the packaging environment

Modified: csw/mgar/gar/v2/gar.svn.mk
===================================================================
--- csw/mgar/gar/v2/gar.svn.mk	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/gar.svn.mk	2010-12-09 03:47:03 UTC (rev 11860)
@@ -27,6 +27,6 @@
 	$(GARDIR)/bin/svnignore work cookies download
 
 scm-tag-release:
-	$(SVN) cp ../trunk ../tags/$(GARNAME)-$(GARVERSION)$(SPKG_REVSTAMP)
+	$(SVN) cp ../trunk ../tags/$(NAME)-$(VERSION)$(SPKG_REVSTAMP)
 
 .PHONY: scm-help scm-update-all scm-update-package scm-update-gar scm-update-ignores scm-tag-release

Modified: csw/mgar/gar/v2/lib/python/gartest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/gartest.py	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/lib/python/gartest.py	2010-12-09 03:47:03 UTC (rev 11860)
@@ -120,13 +120,13 @@
     os.mkdir(self.filedir)
     self.install_files = []
     self.garvars = {
-        "GARNAME": "testbuild",
+        "NAME": "testbuild",
         "DESCRIPTION": u"A test package from %s" % self,
         "CATEGORIES": "lib",
         "CONFIGURE_ARGS": "$(DIRPATHS)",
         "SPKG_SOURCEURL": "http://www.opencsw.org/",
         "MASTER_SITES": "",
-        "GARVERSION": "0.0.1",
+        "VERSION": "0.0.1",
         "CONFIGURE_SCRIPTS": "",
         "BUILD_SCRIPTS": "",
         "TEST_SCRIPTS": "",

Modified: csw/mgar/gar/v2/pkglib/Makefile
===================================================================
--- csw/mgar/gar/v2/pkglib/Makefile	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/pkglib/Makefile	2010-12-09 03:47:03 UTC (rev 11860)
@@ -1,5 +1,5 @@
-GARNAME = csw
-GARVERSION = 1.0
+NAME = csw
+VERSION = 1.0
 CATEGORIES = none
 
 DESCRIPTION = CSW static include files for Solaris packaging.

Modified: csw/mgar/gar/v2/tests/example_test.py
===================================================================
--- csw/mgar/gar/v2/tests/example_test.py	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/tests/example_test.py	2010-12-09 03:47:03 UTC (rev 11860)
@@ -10,9 +10,9 @@
   """An example end-to-end test of GAR."""
 
   def testPkginfoName(self):
-    """Checks that the GARNAME makes it to the NAME in pkginfo."""
+    """Checks that the NAME makes it to the NAME in pkginfo."""
     mybuild = gartest.DynamicGarBuild()
-    mybuild.SetGarVariable("GARNAME", "foo")
+    mybuild.SetGarVariable("NAME", "foo")
     mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n")
     mybuild.WriteGarFiles()
     self.assertEquals(0, mybuild.Build())

Modified: csw/mgar/gar/v2/tests/overrides_test.py
===================================================================
--- csw/mgar/gar/v2/tests/overrides_test.py	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/tests/overrides_test.py	2010-12-09 03:47:03 UTC (rev 11860)
@@ -13,7 +13,7 @@
   def testOneOverride(self):
     """Checks that CHECKPKG_OVERRIDES variable creates an override."""
     mybuild = gartest.DynamicGarBuild()
-    mybuild.SetGarVariable("GARNAME", "overrides-test")
+    mybuild.SetGarVariable("NAME", "overrides-test")
     mybuild.SetGarVariable("CATALOGNAME", "overrides_test")
     mybuild.SetGarVariable("CHECKPKG_OVERRIDES",
                            "example-tag|example-parameter")
@@ -33,7 +33,7 @@
   def testTwoOverriders(self):
     """Checks that CHECKPKG_OVERRIDES variable creates overrides."""
     mybuild = gartest.DynamicGarBuild()
-    mybuild.SetGarVariable("GARNAME", "overrides-test")
+    mybuild.SetGarVariable("NAME", "overrides-test")
     mybuild.SetGarVariable("CATALOGNAME", "overrides_test")
     mybuild.SetGarVariable(
         "CHECKPKG_OVERRIDES",
@@ -58,7 +58,7 @@
 #     """http://sourceforge.net/apps/trac/gar/ticket/17"""
 #     overr_file_1 = "/opt/csw/share/checkpkg/overrides/overrides_test_1"
 #     mybuild = gartest.DynamicGarBuild()
-#     mybuild.SetGarVariable("GARNAME", "overrides-test")
+#     mybuild.SetGarVariable("NAME", "overrides-test")
 #     mybuild.SetGarVariable("PACKAGES", "CSWoverrides-test-1 "
 #                                        "CSWoverrides-test-2")
 #     mybuild.SetGarVariable("CATALOGNAME_CSWoverrides-test-1",

Modified: csw/mgar/gar/v2/tests/static/example/Makefile
===================================================================
--- csw/mgar/gar/v2/tests/static/example/Makefile	2010-12-09 03:29:48 UTC (rev 11859)
+++ csw/mgar/gar/v2/tests/static/example/Makefile	2010-12-09 03:47:03 UTC (rev 11860)
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-GARNAME = loose-files
-GARVERSION = 1.0
+NAME = loose-files
+VERSION = 1.0
 CATEGORIES = utils
 DESCRIPTION = An example of a package created from loose files.
 define BLURB


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


More information about the devel mailing list