Changeset 1266

Timestamp:

Oct 30, 2008, 3:49:53 PM (17 years ago)

Author:

John Small

Message:

Warpin build improvements, including condensed script-related code and
eliminated occasional duplicate addtion of the script to the WPI file

Location:

trunk/warpin

Files:

• bld_fm2_wpi.cmd (modified) (2 diffs)
• makefile (modified) (1 diff)

trunk/warpin/bld_fm2_wpi.cmd

@@ -9 +9 @@
  *
  * History
- *    09 Oct 07 jbs: Changed the "find Warpin" code so that it will no longer
+ *    09 Oct 07 JBS: Changed the "find Warpin" code so that it will no longer
  *       mistakenly find a WIC.EXE on the PATH which may not be Warpin's
  *       WIC.EXE
+ *    30 Oct 08 JBS: Deleted WPI script addtion. (Now done solely by makefile.
  *
  * Requirements/assumptions
@@ -86 +87 @@
       if delete_files_afterwards = 1 then
          call clean_wpidirs
-   end
-   do
-      /* Add the script file to the WPI   */
-      /*
-      'eautil 'WPI.scriptname' NUL /s'
-      */
-      WPI.WIC_pgm WPI.archivename' -s 'WPI.scriptname
-      if rc \= 0 then
-         call ErrorExit 4 rc
    end
 

trunk/warpin/makefile

@@ -81 +81 @@
    bld_fm2_wpi fm2$(FM2_VER).wpi
 
-# fm2$(FM2_VER).wpi:: fm2.wis makefile
-#    @echo Inserting the new Warpin script into the WPI file...
-#    bld_fm2_wpi fm2$(FM2_VER).wpi /SCRIPT
-
 fm2utils$(FM2UTILS_VER).wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shdwmgr.cmd makefile
    @echo Building FM2Utils