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

[bdwalton at users.sourceforge.net]

Revision: 14236
          http://gar.svn.sourceforge.net/gar/?rev=14236&view=rev
Author:   bdwalton
Date:     2011-04-16 23:53:28 +0000 (Sat, 16 Apr 2011)

Log Message:
-----------
gar/v2: add support for enabling automatic (de-)registration of php extensions without postinstall/preremove scripts (similar to the ap2 mod handling)

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2011-04-16 23:48:25 UTC (rev 14235)
+++ csw/mgar/gar/v2/gar.mk	2011-04-16 23:53:28 UTC (rev 14236)
@@ -806,7 +806,7 @@
 
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) post-merge
+merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge
 	banner merge
 	@$(MAKECOOKIE)
 
@@ -843,6 +843,10 @@
 	$(GARBIN)/ap2mod_build_scripts $(PKGROOT) $(AP2_MODFILES)
 	@$(MAKECOOKIE)
 
+post-merge-php5ext:
+	$(GARBIN)/php5ext_build_scripts $(PKGROOT) $(PHP5_EXTFILES)
+	@$(MAKECOOKIE)
+
 # This merges the 
 merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
 	@$(MAKECOOKIE)
@@ -890,7 +894,7 @@
 .PHONY: remerge reset-merge reset-merge-modulated
 remerge: reset-merge merge
 
-reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-src
+reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src
 	@rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge
 	@rm -rf $(PKGROOT)
 

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-04-16 23:48:25 UTC (rev 14235)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-04-16 23:53:28 UTC (rev 14236)
@@ -231,6 +231,7 @@
 # if AP2_MODS is set, files matching this shell glob (passed to find)
 # will have 'build' set as their class
 AP2_MODFILES ?= opt/csw/apache2/libexec/*so $(EXTRA_AP2_MODFILES)
+PHP5_EXTFILES ?= *so $(EXTRA_PHP5_EXTFILES)
 
 # - set class for all config files
 _CSWCLASS_FILTER = | perl -ane '\
@@ -245,6 +246,7 @@
 		$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\
 		$(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		$(if $(AP2_MODS), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \
+		$(if $(PHP5_EXT), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/php5/extensions/.*));) \
 		$$F[1] = "cswcptemplates" if( $$F[2] =~ m(^/opt/csw/etc/templates/.+$$) and $$F[0] eq "f" ); \
 		print join(" ", at F),"\n";'
 
@@ -736,6 +738,9 @@
 reset-merge-ap2mod:
 	@rm -f $(COOKIEDIR)/post-merge-ap2mod
 
+reset-merge-php5ext:
+	@rm -f $(COOKIEDIR)/post-merge-php5ext
+
 merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S))
 	@$(MAKECOOKIE)
 


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