Changeset 827

Timestamp:

Nov 18, 2010, 3:23:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Rearranged "Development" and "Development Runtime" packages in lib.wpi to make more sense. Also fixed a bunch of qtconf.sys-related bugs.

Location:

packaging

Files:

• Makefile.packages (modified) (3 diffs)
• dev.wis.tpl (modified) (5 diffs)

packaging/Makefile.packages

@@ -113 +113 @@
 #
 
+pkg.dev.runtime.PATH            = $(WPI_ROOT)/pkg.dev.runtime
+pkg.dev.runtime.SOURCES         = \
+        $(QT_INSTALL)/bin/QtAsCl4.dll \
+        $(QT_INSTALL)/bin/QtDsgn4.dll \
+        $(QT_INSTALL)/bin/QtDsgC4.dll
+
 pkg.dev.libraries.PATH          = $(WPI_ROOT)/pkg.dev.libraries
 pkg.dev.libraries.SOURCES       = \
@@ -128 +134 @@
         QtEnv.cmd->util/
 
-pkg.dev.runtime.PATH            = $(WPI_ROOT)/pkg.dev.runtime
-pkg.dev.runtime.SOURCES         = \
-        $(QT_INSTALL)/bin/QtAsCl4.dll \
-        $(QT_INSTALL)/bin/QtDsgn4.dll \
-        $(QT_INSTALL)/bin/QtDsgC4.dll
-
 pkg.dev.plugins.PATH            = $(WPI_ROOT)/pkg.dev.plugins
 pkg.dev.plugins.SOURCES         = \
@@ -147 +147 @@
 wpi.dev.SCRIPT      = $(WPI_ROOT)/dev.wis
 wpi.dev.PACKAGES        = \
-        pkg.dev.libraries=1 \
-        pkg.dev.runtime=2 \
+        pkg.dev.runtime=1 \
+        pkg.dev.libraries=2 \
         pkg.dev.plugins=3 \
     pkg.dev.translations=4 \

packaging/dev.wis.tpl

@@ -6 +6 @@
 
 <PCK INDEX=1
+     PACKAGEID="netlabs.org\Qt4\Development Runtime\${version_path}"
+     TITLE="Runtime"
+     NODESELECT
+     REQUIRES="netlabs.org\Qt4\Runtime\${version_path}"
+     TARGET="$(netlabs.org\Qt4\Runtime)" FIXED
+     LONGFILENAMES
+>Contains runtime libraries for development tools. This package is required</PCK>
+
+<PCK INDEX=2
      PACKAGEID="netlabs.org\Qt4\Development\${version_path}"
      TITLE="Libraries, Headers and Tools"
@@ -11 +20 @@
      REQUIRES="netlabs.org\Qt4\Runtime\${version_path}"
      REQUIRES="netlabs.org\Qt4\Installation Utilities\${version_path}"
-     REQUIRES="2"
+     REQUIRES="1"
      TARGET="$(netlabs.org\Qt4\Installation Utilities)"
      LONGFILENAMES
      CREATEOBJECT="WPFolder|Qt ${version}|<WP_DESKTOP>|OBJECTID=<QT4_FOLDER>;"
-     CREATEOBJECT="WPProgram|Designer|<QT4_FOLDER>|EXENAME=$(1)\bin\designer.exe;OBJECTID=<QT4_DESIGNER>;"
-     CREATEOBJECT="WPProgram|Linguist|<QT4_FOLDER>|EXENAME=$(1)\bin\linguist.exe;OBJECTID=<QT4_LINGUIST>;"
-     CREATEOBJECT="WPProgram|Assistant|<QT4_FOLDER>|EXENAME=$(1)\bin\assistant.exe;OBJECTID=<QT4_ASSISTANT>;"
-     CREATEOBJECT="WPProgram|PixelTool|<QT4_FOLDER>|EXENAME=$(1)\bin\pixeltool.exe;OBJECTID=<QT4_PIXELTOOL>;"
+     CREATEOBJECT="WPProgram|Designer|<QT4_FOLDER>|EXENAME=$(2)\bin\designer.exe;OBJECTID=<QT4_DESIGNER>;"
+     CREATEOBJECT="WPProgram|Linguist|<QT4_FOLDER>|EXENAME=$(2)\bin\linguist.exe;OBJECTID=<QT4_LINGUIST>;"
+     CREATEOBJECT="WPProgram|Assistant|<QT4_FOLDER>|EXENAME=$(2)\bin\assistant.exe;OBJECTID=<QT4_ASSISTANT>;"
+     CREATEOBJECT="WPProgram|PixelTool|<QT4_FOLDER>|EXENAME=$(2)\bin\pixeltool.exe;OBJECTID=<QT4_PIXELTOOL>;"
      CREATEOBJECT="WPProgram|Qt Readme|<QT4_FOLDER>|EXENAME=e.exe;PROGTYPE=PROG_PM;PARAMETERS=$(5)\README;STARTUPDIR=$(5);OPEN=RUNNING;OBJECTID=<QT4_README>;"
      CREATEOBJECT="WPProgram|Qt Readme (OS/2)|<QT4_FOLDER>|EXENAME=e.exe;PROGTYPE=PROG_PM;PARAMETERS=$(5)\README.OS2;STARTUPDIR=$(5);OPEN=RUNNING;OBJECTID=<QT4_README_OS2>;"
@@ -24 +33 @@
      CREATEOBJECT="WPUrl|qt.nokia.com|<QT4_FOLDER>|URL=http://qt.nokia.com;OBJECTID=<QT4_NOKIA_COM>;"
      CREATEOBJECT="WPUrl|svn.netlabs.org/qt4|<QT4_FOLDER>|URL=http://svn.netlabs.org/qt4;OBJECTID=<QT4_SVN_NETLABS_ORG>;"
-     CREATEOBJECT="WPProgram|Qt4 Command Prompt|<QT4_FOLDER>|EXENAME=cmd.exe;PARAMETERS=/k $(1)\util\QtEnv.cmd;OBJECTID=<QT4_ENV_CMD>;"
-     CREATEOBJECT="WPProgram|Qt4 Command Prompt (4OS/2)|<QT4_FOLDER>|EXENAME=4os2.exe;PARAMETERS=/k $(1)\util\QtEnv.cmd;OBJECTID=<QT4_ENV_4OS2>;"
-     EXECUTE="$(2)\util\UpdateQtSysConf.cmd|Headers=$(1),Libraries=$(1),Binaries=$(1)"
-     DEEXECUTE="$(2)\util\UpdateQtSysConf.cmd|Headers,Libraries,Binaries"
->Contains Qt development libraries, C++ headers and tools. This package is required. Note that the directory you select for this package will also be used for installing demos, examples and doc packages</PCK>
-
-<PCK INDEX=2
-     PACKAGEID="netlabs.org\Qt4\Development Runtime\${version_path}"
-     TITLE="Runtime"
-     NODESELECT
-     REQUIRES="1"
-     REQUIRES="netlabs.org\Qt4\Runtime\${version_path}"
-     TARGET="$(netlabs.org\Qt4\Runtime)" FIXED
-     LONGFILENAMES
->Contains runtime libraries for development tools. This package is required</PCK>
+     CREATEOBJECT="WPProgram|Qt4 Command Prompt|<QT4_FOLDER>|EXENAME=cmd.exe;PARAMETERS=/k $(2)\util\QtEnv.cmd;OBJECTID=<QT4_ENV_CMD>;"
+     CREATEOBJECT="WPProgram|Qt4 Command Prompt (4OS/2)|<QT4_FOLDER>|EXENAME=4os2.exe;PARAMETERS=/k $(2)\util\QtEnv.cmd;OBJECTID=<QT4_ENV_4OS2>;"
+     EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Headers=$(2)/include,Libraries=$(2)/lib,Binaries=$(2)/bin,Data=$(2)"
+     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Headers,Libraries,Binaries"
+>Contains Qt development libraries, C++ headers and tools. This package is required</PCK>
 
 <PCK INDEX=3
@@ -54 +53 @@
      TITLE="Translations"
      SELECT
-     REQUIRES="1"
+     REQUIRES="2"
      REQUIRES="netlabs.org\Qt4\Translations\${version_path}"
      TARGET="$(netlabs.org\Qt4\Translations)" FIXED
@@ -127 +126 @@
 <TEXT>Please select the packages which are to be installed.
 
-Note that most package installation paths use the system directories and cannot be changed.</TEXT>
+Note that the directory you select for the "Libraries, Headers and Tools" package will also be used for installing "Demos", "Examples" and "Documentation" packages (provided in separate WPI archives).</TEXT>
 </PAGE>