Changeset 820

Timestamp:

Nov 18, 2010, 1:55:01 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Attempted to solve a possible broken installation (see comment 1 of #172) by making the "Installation Utilities" package path fixed and allowing to change the "Development" package path instead.

Location:

packaging

Files:

• dev.wis.tpl (modified) (2 diffs)
• doc.wis.tpl (modified) (1 diff)
• examples.wis.tpl (modified) (2 diffs)
• lib.wis.tpl (modified) (1 diff)

packaging/dev.wis.tpl

@@ -12 +12 @@
      REQUIRES="netlabs.org\Qt4\Installation Utilities\${version_path}"
      REQUIRES="2"
-     TARGET="$(netlabs.org\Qt4\Installation Utilities)" FIXED
+     TARGET="$(netlabs.org\Qt4\Installation Utilities)"
      LONGFILENAMES
      CREATEOBJECT="WPFolder|Qt ${version}|<WP_DESKTOP>|OBJECTID=<QT4_FOLDER>;"
@@ -26 +26 @@
      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>;"
->Contains Qt development libraries, C++ headers and tools. This package is required</PCK>
+     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

packaging/doc.wis.tpl

@@ -15 +15 @@
      LONGFILENAMES
      EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Documentation=$(1)"
+     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Documentation"
 >Contains the Qt reference documentation in QCH format. This package is recommended</PCK>
 

packaging/examples.wis.tpl

@@ -16 +16 @@
      LONGFILENAMES
      EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Demos=$(1)"
+     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Demos"
 >Contains the executables and the source code of the Qt demo applications</PCK>
 
@@ -37 +38 @@
      LONGFILENAMES
      EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Examples=$(3)"
+     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Examples"
 >Contains the executables and the source code of the Qt example applications</PCK>
 

packaging/lib.wis.tpl

@@ -149 +149 @@
      NODESELECT
      REQUIRES="1"
-     TARGET="=("GetSysAppPath")\Qt4"
-     LONGFILENAMES
->Contains installation utilities. This package is required. The installation directory of this package serves as a base directory for all other Qt packages except Runtime, as well as for other Qt 4 installation archives ("dev", "examples" and "doc")</PCK>
+     TARGET="=("GetSysAppPath")\Qt4" FIXED
+     LONGFILENAMES
+>Contains installation utilities. This package is required</PCK>
 
 <PCK INDEX=3