Commit: 07291803b55069c7ea335cf48aa4824c99ae8627 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 07291803b55069c7ea335cf48aa4824c99ae8627 (tree)
• l'heure: 2013-06-19 23:35:53
• Auteur: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Message de Log

Rework defective package build time-stamping logic.

Change Summary

• modified: ChangeLog
• modified: Makefile.in

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Rework defective package build time-stamping logic.
+
+	* Makefile.in (%.time): Make it explicitly touch its target; the
+	2013-05-15 changes, to reduce redundancy, didn't work as expected.
+	(%.tag): Add a side effect; make it also explicitly touch %.time.
+	(%.tagged.time): This is now redundant; remove it.
+
 2013-06-14  Keith Marshall  <[e-mail]>
 
 	Collect distributable package files in user specified directory.

--- a/Makefile.in
+++ b/Makefile.in
@@ -249,20 +249,21 @@ sinclude *.d
 %.$(OBJEXT): %.ico
 	echo $* ICON $*.ico | $(RC) -I ${srcdir}/icons -o $@
 
-# Release tagging...
+# Release tagging; note that, whereas %.time is nominally updated as
+# a side effect of %.tag, we also must provide an explicit rule which
+# will update it directly.  This ensures that we may INDIRECTLY force
+# a dependency on the TIME when %.tag is updated, WITHOUT creating an
+# explicit dependency on %.tag itself.
 #
 time-stamp:
-%.tagged.time: time-stamp
-	> $*.time
-
-%.time: %.tagged.time
-
-%.tag: %.tagged.time
+%.time:; > $@
+%.tag: time-stamp
 	>> $@; tag=`date +%Y%m%d`; \
 	  tag=`awk -F- -v today=$$tag ' \
 	    BEGIN { tag = 1 } $$1 == today { tag += $$2 } \
 	    END { print today "-" tag }' $@`; \
 	  echo $$tag > $@
+	> $*.time
 
 %.c: %.c.in
 	$(VERSION_SCRIPT) $< > $@