Changeset 1324

Timestamp:

Oct 28, 2016, 5:43:15 AM (8 years ago)

Author:

rlwalsh

Message:

install: move creation of 'readme' and 'readme.nls' shadows from
'*.wis' to 'instl0xx.cmd' to avoid errors when installing an XWP-lite
build; also, fix errors and inconsistencies in '*.wis'
note: these changes to '*.wis' will be deprecated by the next patch

Location:

branches/branch-1-0

Files:

• 001/misc/instl001.cmd (modified) (1 diff)
• 001/nls001.wis (modified) (3 diffs)
• 031/misc/instl031.cmd (modified) (1 diff)
• 031/nls031.wis (modified) (6 diffs)
• 039/misc/instl039.cmd (modified) (1 diff)
• 039/nls039.wis (modified) (4 diffs)
• 049/misc/instl049.cmd (modified) (1 diff)
• 049/nls049.wis (modified) (3 diffs)
• 081/misc/instl081.cmd (modified) (1 diff)
• 081/nls081.wis (modified) (3 diffs)
• xwp.wis (modified) (6 diffs)

branches/branch-1-0/001/misc/instl001.cmd ¶

@@ -93 +93 @@
 class = "WPShadow";
 title = "readme";
-setup = "SHADOWID="pdir||"README;"
+setup = "SHADOWID="pdir||"readme;";
 id = "<XWP_READMEMAINSHADOW>"
 target = "<XWP_MAINFLDR>";
 call CreateObject;
+
+/* "Readme.nls" shadow (not present in English version)
+class = "WPShadow";
+title = "readme.nls";
+setup = "SHADOWID="pdir||"readme.nls;";
+id = "<XWP_READMENLSMAINSHADOW>"
+target = "<XWP_MAINFLDR>";
+call CreateObject;
+*/
 
 /* create "XWorkplace Setup" (added V0.9.0) */

branches/branch-1-0/001/nls001.wis ¶

@@ -15 +15 @@
        EXECUTE: change the last three digits of the package index and the instl001.cmd file
                 to your country code
-  CREATEOBJECT: translate "readme" to what the file would be called in your own language
-                change the digits in both the shadow and object ID to your own country code
   WRITEPROFILE: change the digits to your country code
    >text</PCK>: adapt and translate the text to your own language, and use the current
@@ -34 +32 @@
 
      EXECUTE="CREATEOBJECT|$(1001)\install\instl001.cmd"
-
-     CREATEOBJECT="WPShadow|readme|<XWP_MAINFLDR>|SHADOWID=$(2001)\readme;OBJECTID=<XWP_README001MAINSHADOW>"
-     CREATEOBJECT="WPShadow|readme.nls|<XWP_MAINFLDR>|SHADOWID=$(2001)\readme.nls;OBJECTID=<XWP_READMENLS001MAINSHADOW>"
 
      WRITEPROFILE="USER\XWorkplace\JustInstalled|1"
@@ -69 +64 @@
 </TEXT>
                 <!-- change the last three digits to your country code -->
-                <!-- change "readme.nls" to the file name you used in the CREATEOBJECT statement above -->
+                <!-- change "readme.nls" to your translation of this file -->
+                <!-- Note: 'readme.nls' should be displayed here but it doesn't exist -->
                 <README
                         FORMAT="PLAIN"
-                        EXTRACTFROMPCK="2001">readme.nls</README>
+                        EXTRACTFROMPCK="2001">readme</README>
 
                 <!-- translate "Next" to your own language -->

branches/branch-1-0/031/misc/instl031.cmd ¶

@@ -93 +93 @@
 class = "WPShadow";
 title = "Lees Mij";
-setup = "SHADOWID="pdir||"README;"
+setup = "SHADOWID="pdir||"leesmij;"
 id = "<XWP_READMEMAINSHADOW>"
 target = "<XWP_MAINFLDR>";
 call CreateObject;
+
+/* "Readme.nls" shadow (not present in Dutch version)
+class = "WPShadow";
+title = "Lees Mij.nls";
+setup = "SHADOWID="pdir||"leesmij.nls;";
+id = "<XWP_READMENLSMAINSHADOW>"
+target = "<XWP_MAINFLDR>";
+call CreateObject;
+*/
 
 /* create "XWorkplace Setup" (added V0.9.0) */

branches/branch-1-0/031/nls031.wis ¶

@@ -4 +4 @@
 
 <!-- adapt and translate this to your language, and use the current version number -->
-<TITLE>English National Language Support for XWorkplace 1.0.11</TITLE>
+<TITLE>Dutch National Language Support for XWorkplace 1.0.11</TITLE>
 
 <!-- change the package descriptions according to the following instructions
@@ -15 +15 @@
        EXECUTE: change the last three digits of the package index and the instl031.cmd file
                 to your country code
-  CREATEOBJECT: translate "readme" to what the file would be called in your own language
-                change the digits in both the shadow and object ID to your own country code
   WRITEPROFILE: change the digits to your country code
    >text</PCK>: adapt and translate the text to your own language, and use the current
@@ -24 +22 @@
 <PCK INDEX=1031
 
-     PACKAGEID="Ulrich M”ller\XWorkplace\English NLS\1\0\11"
+     PACKAGEID="Ulrich M”ller\XWorkplace\Dutch NLS\1\0\11"
      TARGET="$(Ulrich M”ller\XWorkplace\Kernel)"
-     TITLE="English National Language Support"
+     TITLE="Dutch National Language Support"
 
      FIXED
@@ -35 +33 @@
      EXECUTE="CREATEOBJECT|$(1031)\install\instl031.cmd"
 
-     CREATEOBJECT="WPShadow|readme|<XWP_MAINFLDR>|SHADOWID=$(2031)\readme;OBJECTID=<XWP_README031MAINSHADOW>"
-     CREATEOBJECT="WPShadow|readme.nls|<XWP_MAINFLDR>|SHADOWID=$(2031)\readme.nls;OBJECTID=<XWP_READMENLS031MAINSHADOW>"
-
      WRITEPROFILE="USER\XWorkplace\JustInstalled|1"
      WRITEPROFILE="USER\XWorkplace\Language|031"
 
-     >English National Language Support for XWorkplace 1.0.11</PCK>
+     >Dutch National Language Support for XWorkplace 1.0.11</PCK>
 
 <PCK INDEX=2031
 
-     PACKAGEID="Ulrich M”ller\XWorkplace\English Documentation\1\0\11"
+     PACKAGEID="Ulrich M”ller\XWorkplace\Dutch Documentation\1\0\11"
      TARGET="$(Ulrich M”ller\XWorkplace\Kernel)"
-     TITLE="English Documentation"
+     TITLE="Dutch Documentation"
 
      SELECT
 
-     >This package contains the complete English documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
+     >This package contains the complete Dutch documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
 </HEAD>
 
@@ -65 +60 @@
 
 <!-- adapt and translate to your own language -->
-<TEXT>Welcome to the English National Language Support for XWorkplace 1.0.11.
+<TEXT>Welcome to the Dutch National Language Support for XWorkplace 1.0.11.
 Please note the following:
 </TEXT>
                 <!-- change the last three digits to your country code -->
-                <!-- change "readme.nls" to the file name you used in the CREATEOBJECT statement above -->
+                <!-- change "readme.nls" to your translation of this file -->
+                <!-- Note: 'leesmij.nls' should be displayed here but it doesn't exist -->
                 <README
                         FORMAT="PLAIN"
-                        EXTRACTFROMPCK="2031">readme.nls</README>
+                        EXTRACTFROMPCK="2031">leesmij</README>
 
                 <!-- translate "Next" to your own language -->
@@ -458 +454 @@
 
                 <!-- translate to your own language -->
-                <TEXT>WarpIN can rename the WPS objects that have been created by XWorkplace to English for you. For that purpose, "Create WPS objects" has to be enabled.
+                <TEXT>WarpIN can rename the WPS objects that have been created by XWorkplace to Dutch for you. For that purpose, "Create WPS objects" has to be enabled.
 
 Press "Install" to start installation.

branches/branch-1-0/039/misc/instl039.cmd ¶

@@ -92 +92 @@
 /* "Readme" shadow (added V0.9.2) */
 class = "WPShadow";
-title = "readme";
-setup = "SHADOWID="pdir||"README;"
+title = "leggimi";
+setup = "SHADOWID="pdir||"leggimi;"
 id = "<XWP_READMEMAINSHADOW>"
+target = "<XWP_MAINFLDR>";
+call CreateObject;
+
+/* "Readme.nls" shadow */
+class = "WPShadow";
+title = "leggimi.nls";
+setup = "SHADOWID="pdir||"leggimi.nls;";
+id = "<XWP_READMENLSMAINSHADOW>"
 target = "<XWP_MAINFLDR>";
 call CreateObject;

branches/branch-1-0/039/nls039.wis ¶

@@ -15 +15 @@
        EXECUTE: change the last three digits of the package index and the instl001.cmd file
                 to your country code
-  CREATEOBJECT: translate "readme" to what the file would be called in your own language
-                change the digits in both the shadow and object ID to your own country code
   WRITEPROFILE: change the digits to your country code
    >text</PCK>: adapt and translate the text to your own language, and use the current
@@ -35 +33 @@
      EXECUTE="CREATEOBJECT|$(1039)\install\instl039.cmd"
 
-     CREATEOBJECT="WPShadow|leggimi|<XWP_MAINFLDR>|SHADOWID=$(2039)\leggimi;OBJECTID=<XWP_README039MAINSHADOW>"
-     CREATEOBJECT="WPShadow|leggimi.nls|<XWP_MAINFLDR>|SHADOWID=$(2039)\leggimi.nls;OBJECTID=<XWP_READMENLS039MAINSHADOW>"
-
      WRITEPROFILE="USER\XWorkplace\JustInstalled|1"
      WRITEPROFILE="USER\XWorkplace\Language|039"
@@ -47 +42 @@
      PACKAGEID="Gabriele Gamba\XWorkplace\Italian Documentation\1\0\11"
      TARGET="$(Ulrich M”ller\XWorkplace\Kernel)"
-     TITLE="English Documentation"
+     TITLE="Italian Documentation"
 
      SELECT
@@ -70 +65 @@
 </TEXT>
                 <!-- change the last three digits to your country code -->
-                <!-- change "readme.nls" to the file name you used in the CREATEOBJECT statement above -->
+                <!-- change "readme.nls" to your translation of this file -->
                 <README
                         FORMAT="PLAIN"

branches/branch-1-0/049/misc/instl049.cmd ¶

@@ -92 +92 @@
 /* "Readme" shadow (added V0.9.2) */
 class = "WPShadow";
-title = "readme";
-setup = "SHADOWID="pdir||"README;"
+title = "liesmich";
+setup = "SHADOWID="pdir||"liesmich;"
 id = "<XWP_READMEMAINSHADOW>"
+target = "<XWP_MAINFLDR>";
+call CreateObject;
+
+/* "Readme.nls" shadow */
+class = "WPShadow";
+title = "liesmich.nls";
+setup = "SHADOWID="pdir||"liesmich.nls;";
+id = "<XWP_READMENLSMAINSHADOW>"
 target = "<XWP_MAINFLDR>";
 call CreateObject;

branches/branch-1-0/049/nls049.wis ¶

@@ -15 +15 @@
        EXECUTE: change the last three digits of the package index and the instl001.cmd file
                 to your country code
-  CREATEOBJECT: translate "readme" to what the file would be called in your own language
-                change the digits in both the shadow and object ID to your own country code
   WRITEPROFILE: change the digits to your country code
    >text</PCK>: adapt and translate the text to your own language, and use the current
@@ -34 +32 @@
 
      EXECUTE="CREATEOBJECT|$(1049)\install\instl049.cmd"
-
-     CREATEOBJECT="WPShadow|liesmich|<XWP_MAINFLDR>|SHADOWID=$(2049)\liesmich;OBJECTID=<XWP_README049MAINSHADOW>"
-     CREATEOBJECT="WPShadow|liesmich.nls|<XWP_MAINFLDR>|SHADOWID=$(2049)\liesmich.nls;OBJECTID=<XWP_READMENLS049MAINSHADOW>"
 
      WRITEPROFILE="USER\XWorkplace\JustInstalled|1"
@@ -69 +64 @@
 </TEXT>
                 <!-- change the last three digits to your country code -->
-                <!-- change "readme.nls" to the file name you used in the CREATEOBJECT statement above -->
+                <!-- change "readme.nls" to your translation of this file -->
                 <README
                         FORMAT="PLAIN"

branches/branch-1-0/081/misc/instl081.cmd ¶

@@ -100 +100 @@
 class = "WPShadow";
 title = "readme";
-setup = "SHADOWID="pdir||"README;"
+setup = "SHADOWID="pdir||"readme;"
 id = "<XWP_READMEMAINSHADOW>"
+target = "<XWP_MAINFLDR>";
+call CreateObject;
+
+/* "Readme.nls" shadow */
+class = "WPShadow";
+title = "readme.nls";
+setup = "SHADOWID="pdir||"readme.nls;";
+id = "<XWP_READMENLSMAINSHADOW>"
 target = "<XWP_MAINFLDR>";
 call CreateObject;

branches/branch-1-0/081/nls081.wis ¶

@@ -15 +15 @@
        EXECUTE: change the last three digits of the package index and the instl001.cmd file
                 to your country code
-  CREATEOBJECT: translate "readme" to what the file would be called in your own language
-                change the digits in both the shadow and object ID to your own country code
   WRITEPROFILE: change the digits to your country code
    >text</PCK>: adapt and translate the text to your own language, and use the current
@@ -34 +32 @@
 
      EXECUTE="CREATEOBJECT|$(1081)\install\instl081.cmd"
-
-     CREATEOBJECT="WPShadow|readme|<XWP_MAINFLDR>|SHADOWID=$(2081)\readme;OBJECTID=<XWP_README081MAINSHADOW>"
-     CREATEOBJECT="WPShadow|readme.nls|<XWP_MAINFLDR>|SHADOWID=$(2081)\readme.nls;OBJECTID=<XWP_READMENLS081MAINSHADOW>"
 
      WRITEPROFILE="USER\XWorkplace\JustInstalled|1"
@@ -69 +64 @@
 </TEXT>
                 <!-- change the last three digits to your country code -->
-                <!-- change "readme.nls" to the file name you used in the CREATEOBJECT statement above -->
+                <!-- change "readme.nls" to your translation of this file -->
                 <README
                         FORMAT="PLAIN"

branches/branch-1-0/xwp.wis ¶

@@ -73 +73 @@
      TARGET="$(WARPIN_DEFAULTTOOLSPATH)\WPS\XWorkplace"
 
+<!-- these entries should be moved to 'instl007.cmd' because they will
+     cause errors when installing XWP-lite which has no <XWP_MAINFLDR>;
+     see 'inst049.cmd' for an example of how to create these objects.
      CREATEOBJECT="WPShadow|readme.ru|<XWP_MAINFLDR>|SHADOWID=$(2007)\readme.ru;OBJECTID=<XWP_README007MAINSHADOW>"
      CREATEOBJECT="WPShadow|readme_nls.ru|<XWP_MAINFLDR>|SHADOWID=$(2007)\readme_nls.ru;OBJECTID=<XWP_READMENLS007MAINSHADOW>"
+ -->
 
      >This package contains the complete Russian documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
@@ -98 +102 @@
      TARGET="$(WARPIN_DEFAULTTOOLSPATH)\WPS\XWorkplace"
 
-     CREATEOBJECT="WPShadow|readme.nl|<XWP_MAINFLDR>|SHADOWID=$(2031)\readme.nl;OBJECTID=<XWP_README031MAINSHADOW>"
-     CREATEOBJECT="WPShadow|readme_nls.nl|<XWP_MAINFLDR>|SHADOWID=$(2031)\readme_nls.nl;OBJECTID=<XWP_READMENLS031MAINSHADOW>"
-
      >This package contains the complete Dutch documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
 
@@ -123 +124 @@
      TARGET="$(WARPIN_DEFAULTTOOLSPATH)\WPS\XWorkplace"
 
-     CREATEOBJECT="WPShadow|leggimi|<XWP_MAINFLDR>|SHADOWID=$(2039)\leggimi;OBJECTID=<XWP_README039MAINSHADOW>"
-     CREATEOBJECT="WPShadow|leggimi.nls|<XWP_MAINFLDR>|SHADOWID=$(2039)\leggimi.nls;OBJECTID=<XWP_READMENLS039MAINSHADOW>"
-        
      >This package contains the complete Italian documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
 
@@ -148 +146 @@
      TARGET="$(WARPIN_DEFAULTTOOLSPATH)\WPS\XWorkplace"
 
+<!-- these entries should be moved to 'instl007.cmd' because they will
+     cause errors when installing XWP-lite which has no <XWP_MAINFLDR>;
+     see 'inst049.cmd' for an example of how to create these objects.
      CREATEOBJECT="WPShadow|readme.sv|<XWP_MAINFLDR>|SHADOWID=$(2046)\readme.sv;OBJECTID=<XWP_README046MAINSHADOW>"
      CREATEOBJECT="WPShadow|readme_nls.sv|<XWP_MAINFLDR>|SHADOWID=$(2046)\readme_nls.sv;OBJECTID=<XWP_READMESV046MAINSHADOW>"
+ -->
 
      >This package contains the complete Swedish documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
@@ -173 +175 @@
      TARGET="$(WARPIN_DEFAULTTOOLSPATH)\WPS\XWorkplace"
 
-     CREATEOBJECT="WPShadow|liesmich|<XWP_MAINFLDR>|SHADOWID=$(2049)\liesmich;OBJECTID=<XWP_README049MAINSHADOW>"
-     CREATEOBJECT="WPShadow|liesmich.nls|<XWP_MAINFLDR>|SHADOWID=$(2049)\liesmich.nls;OBJECTID=<XWP_READMENLS049MAINSHADOW>"
-
      >This package contains the complete German documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>
 
@@ -197 +196 @@
      TITLE="Japanese Documentation"
      TARGET="$(WARPIN_DEFAULTTOOLSPATH)\WPS\XWorkplace"
-
-     CREATEOBJECT="WPShadow|readme.jp|<XWP_MAINFLDR>|SHADOWID=$(2081)\readme.jp;OBJECTID=<XWP_README081MAINSHADOW>"
-     CREATEOBJECT="WPShadow|readme_nls.jp|<XWP_MAINFLDR>|SHADOWID=$(2081)\readme_nls.jp;OBJECTID=<XWP_READMENLS081MAINSHADOW>"
 
      >This package contains the complete Japanese documentation for XWorkplace. You can extract this documentation separately to be able to read it before installing the rest of XWorkplace. If you only install this package, your system is not altered in any way.</PCK>