make-rules/ips.mk
branchs11-update
changeset 3787 e0eb0826110c
parent 3783 9edbfb2ff34a
child 3996 20c0f21bbe1e
--- a/make-rules/ips.mk	Mon Feb 02 18:48:58 2015 -0800
+++ b/make-rules/ips.mk	Fri Nov 14 08:04:06 2014 -0800
@@ -225,6 +225,13 @@
 
 # Build Python version-wrapping manifests from the generic version.
 # Creates build/manifest-*-modulename.p5m file.
+# Note that the mkgeneric transform uses the literal string "###PYV###"
+# as the place-holder for the Python version (for mkgeneric-python) and
+# the Perl version (for mkgeneric-perl below) and the Ruby version (for
+# mkgeneric-ruby further below).  The authors did not anticipate that this
+# mechanism would be extended beyond Python when they wrote it; something
+# more generic like LANGVER might make more sense, but for now we are
+# sticking with something known to work.
 $(MANIFEST_BASE)-%.p5m: %-PYVER.p5m $(BUILD_DIR)/mkgeneric-python
 	$(PKGMOGRIFY) -D PYV=###PYV### $(BUILD_DIR)/mkgeneric-python \
 		$(WS_TOP)/transforms/mkgeneric $< > [email protected]
@@ -249,8 +256,10 @@
 		$(call mkgeneric,runtime/perl,$(ver)))
 
 # Build Perl version-wrapping manifests from the generic version.
+# See the block comment above about why "###PYV###" is used here even
+# though this is for Perl rather than Python.
 $(MANIFEST_BASE)-%.p5m: %-PERLVER.p5m $(BUILD_DIR)/mkgeneric-perl
-	$(PKGMOGRIFY) -D PLV=### $(BUILD_DIR)/mkgeneric-perl \
+	$(PKGMOGRIFY) -D PLV=###PYV### $(BUILD_DIR)/mkgeneric-perl \
 		$(WS_TOP)/transforms/mkgeneric $< > [email protected]
 	if [ -f $*-GENFRAG.p5m ]; then cat $*-GENFRAG.p5m >> [email protected]; fi
 
@@ -287,10 +296,8 @@
 # Build Ruby version-wrapping manifests from the generic version.
 # Creates build/manifest-*-modulename.p5m file.
 #
-# ###PYV### is used here as the mkgeneric() call used to create 
-# mkgeneric-ruby uses this value version subsitute key.  We also
-# use the same key, ###PYV###, to pick up the required entry
-# in mkgeneric when pkgmogrify is invoked
+# See the block comment above about why "###PYV###" is used here even
+# though this is for Ruby rather than Python.
 $(MANIFEST_BASE)-%.p5m: %-RUBYVER.p5m $(BUILD_DIR)/mkgeneric-ruby
 	$(PKGMOGRIFY) -D RUBYV=###PYV### $(BUILD_DIR)/mkgeneric-ruby \
 		$(WS_TOP)/transforms/mkgeneric $< > [email protected]