Changeset 825

Timestamp:

Nov 18, 2010, 2:24:57 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Rearranged "Runtime" and "Installation utilities" packages in lib.wpi to make more sense.

Location:

packaging

Files:

• Makefile.packages (modified) (3 diffs)
• lib.wis.tpl (modified) (6 diffs)

packaging/Makefile.packages

@@ -50 +50 @@
 # Runtime archive
 #
+
+pkg.lib.instutils.PATH          = $(WPI_ROOT)/pkg.lib.instutils
+pkg.lib.instutils.SOURCES       = \
+        UpdateQtSysConf.cmd->util/
 
 pkg.lib.runtime.PATH            = $(WPI_ROOT)/pkg.lib.runtime
@@ -67 +71 @@
     $(QT_INSTALL)/bin/QtXmlP4.dll
 
-pkg.lib.instutils.PATH          = $(WPI_ROOT)/pkg.lib.instutils
-pkg.lib.instutils.SOURCES       = \
-        UpdateQtSysConf.cmd->util/
-
 pkg.lib.plugins.PATH            = $(WPI_ROOT)/pkg.lib.plugins
 pkg.lib.plugins.SOURCES         = \
@@ -92 +92 @@
 wpi.lib.SCRIPT      = $(WPI_ROOT)/lib.wis
 wpi.lib.PACKAGES        = \
-        pkg.lib.runtime=1 \
-        pkg.lib.instutils=2 \
+        pkg.lib.instutils=1 \
+        pkg.lib.runtime=2 \
         pkg.lib.plugins=3 \
         pkg.lib.translations=4 \

packaging/lib.wis.tpl

@@ -134 +134 @@
 
 <PCK INDEX=1
+     PACKAGEID="netlabs.org\Qt4\Installation Utilities\${version_path}"
+     TITLE="Installation Utilities"
+     NODESELECT
+     TARGET="=("GetSysAppPath")\Qt4" FIXED
+     LONGFILENAMES
+>Contains installation utilities. This package is required</PCK>
+
+<PCK INDEX=2
      PACKAGEID="netlabs.org\Qt4\Runtime\${version_path}"
      TITLE="Runtime=("AskToUninstallPreviousVersion")"
@@ -139 +147 @@
      REQUIRES="netlabs.org\kLIBC\LIBC 0.6 Runtime\0\6\3"
      REQUIRES="netlabs.org\GCC4\Runtime\4\4\2\20091204"
+     REQUIRES="1"
      TARGET="=("GetDLLPath")" FIXED
      LONGFILENAMES
-     EXECUTE="$(2)\util\UpdateQtSysConf.cmd|Prefix=$(2),Settings=$\(ETC\)/xdg"
+     EXECUTE="$(1)\util\UpdateQtSysConf.cmd|Prefix=$(1),Settings=$\(ETC\)/xdg"
      DEEXECUTE="del $(ETC)\qtsys.conf"
 >Contains Qt runtime libraries. This package is required</PCK>
-
-<PCK INDEX=2
-     PACKAGEID="netlabs.org\Qt4\Installation Utilities\${version_path}"
-     TITLE="Installation Utilities"
-     NODESELECT
-     REQUIRES="1"
-     TARGET="=("GetSysAppPath")\Qt4" FIXED
-     LONGFILENAMES
->Contains installation utilities. This package is required</PCK>
 
 <PCK INDEX=3
@@ -158 +158 @@
      TITLE="Plugins"
      NODESELECT
-     REQUIRES="1"
-     TARGET="$(2)\plugins" FIXED
+     REQUIRES="2"
+     TARGET="$(1)\plugins" FIXED
      LONGFILENAMES
 >Contains standard Qt plugins. This package is required</PCK>
@@ -167 +167 @@
      TITLE="Translations"
      SELECT
-     REQUIRES="1"
-     TARGET="$(2)\translations" FIXED
+     REQUIRES="2"
+     TARGET="$(1)\translations" FIXED
      LONGFILENAMES
 >Contains translations of the Qt runtime. This package is recommended</PCK>
@@ -176 +176 @@
      TITLE="Extended System Tray widget for XCenter"
      SELECT
-     REQUIRES="1"
+     REQUIRES="2"
      REQUIRES="Ulrich M”ller\XWorkplace\Kernel\0\9\9"
      TARGET="$(Ulrich M”ller\XWorkplace\Kernel)" FIXED
@@ -186 +186 @@
      TITLE="Readmes and Licenses"
      SELECT
-     TARGET="$(2)" FIXED
+     TARGET="$(1)" FIXED
      LONGFILENAMES
 >Contains the readme files and license agreements</PCK>