Changeset 725

Timestamp:

May 1, 2010, 12:51:27 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Delete temporary package directories at start to make sure removed files are not accidentally packed to WPIs (this also fixes the problem of directories not being updated when gathering them in temporary package dirs).

Location:

packaging

Files:

• Makefile.packages (modified) (8 diffs)
• deltree.cmd (added)

packaging/Makefile.packages

@@ -47 +47 @@
         $(QT_BUILD)/CHANGES.OS2
 
+#
 # Runtime archive
+#
 
 pkg.lib.runtime.PATH            = $(WPI_ROOT)/pkg.lib.runtime
@@ -85 +87 @@
 wpi.lib.PATH            = $(OUT_ROOT)/qt-lib-$(QT_VER_FULL).wpi
 wpi.lib.SCRIPT      = $(WPI_ROOT)/lib.wis
-wpi.lib.PACKAGES        = pkg.lib.runtime=1 pkg.lib.instutils=2 pkg.lib.plugins=3 \
-                      pkg.lib.translations=4 pkg.lib.systray=5 pkg.readme=6
-
+wpi.lib.PACKAGES        = \
+        pkg.lib.runtime=1 \
+        pkg.lib.instutils=2 \
+        pkg.lib.plugins=3 \
+        pkg.lib.translations=4 \
+        pkg.lib.systray=5 \
+        pkg.readme=6
+
+#
 # Development archive
+#
 
 # @todo QtDsgn4.dll and QtDsgC4.dll must be taken from $(QT_INSTALL)
@@ -118 +127 @@
 wpi.dev.PATH            = $(OUT_ROOT)/qt-dev-$(QT_VER_FULL).wpi
 wpi.dev.SCRIPT      = $(WPI_ROOT)/dev.wis
-wpi.dev.PACKAGES        = pkg.dev.libraries=1 pkg.dev.runtime=2 \
-                      pkg.dev.translations=3 pkg.readme=4
-
+wpi.dev.PACKAGES        = \
+        pkg.dev.libraries=1 \
+        pkg.dev.runtime=2 \
+    pkg.dev.translations=3 \
+        pkg.readme=4
+
+#
 # Examples archive
+#
 
 pkg.examples.demos.PATH         = $(WPI_ROOT)/pkg.examples.demos
@@ -136 +150 @@
 
 # @todo add examples.example-plugins
-# @todo install qtdemo in bin/ when its' ready
+# @todo install qtdemo in bin/ when it's ready
 
 wpi.examples.PATH               = $(OUT_ROOT)/qt-examples-$(QT_VER_FULL).wpi
 wpi.examples.SCRIPT             = $(WPI_ROOT)/examples.wis
-wpi.examples.PACKAGES   = pkg.examples.demos=1 pkg.examples.demo-plugins=2 \
-                                                  pkg.examples.examples=3 \
-                                                  pkg.readme=4
-
+wpi.examples.PACKAGES   = \
+        pkg.examples.demos=1 \
+        pkg.examples.demo-plugins=2 \
+        pkg.examples.examples=3 \
+        pkg.readme=4
+
+#
 # Summary
+#
 
 WPIS = wpi.lib wpi.dev wpi.examples
@@ -162 +180 @@
 _DIRS_ += $(1)
 $$(eval $$(call EnsureDir,$(dir $(1:%/=%))))
-$$(shell if not exist $(subst /,\,$(1:%/=%)) mkdir $(subst /,\,$(1:%/=%)) >nul 2>&1)
+$$(shell if not exist "$(subst /,\,$(1:%/=%))" mkdir "$(subst /,\,$(1:%/=%))" >nul 2>&1)
 endif
 endif
@@ -169 +187 @@
 
 # Generate rules to copy one file.
-# @param $(1)   Stem whose file is to copy.
+# @param $(1)   Stem which file is to copy.
 # @param $(2)   File name in format src[->tgt].
 define GenFileCopyRule
@@ -208 +226 @@
 $$(foreach file,$$($(1).SOURCES),$$(eval $$(call GenFileCopyRule,$(1),$$(file))))
 $(1): $$($(1).TARGETS)
+clean-$(1):
+        if exist "$($(1).PATH)" deltree.cmd "$(subst /,\,$($(1).PATH))" /Y /S
 endif
 endef
@@ -226 +246 @@
 $(eval $(1).PACKAGES :=)
 $(foreach pkg,$($(1)._PACKAGES),$(eval $(call GenWpiRuleHelper,$(1),$(pkg))))
-$(1): $($(1).PACKAGES) $($(1).SCRIPT)
+# generate WPI target (depends on clean to make sure the removed files are not packed)
+$(1): clean-$(1) $($(1).PACKAGES) $($(1).SCRIPT)
         -del $(subst /,\,$($(1).PATH))
         $(WIC) $($(1).PATH) -a $($(1)._PACKAGES_CMD) -s $($(1).SCRIPT)
+# clean WPI target
+clean-$(1): $(foreach pkg,$($(1).PACKAGES),clean-$(pkg))
+# helpers
 $(foreach pkg,$($(1).PACKAGES),$(eval $(pkg).TARGETS :=))
 $(foreach pkg,$($(1).PACKAGES),$(eval $(call GenPkgRule,$(pkg))))