Changeset 607

Timestamp:

Apr 19, 2007, 12:39:21 AM (19 years ago)

Author:

John Small

Message:

• Changed to support improved WPI build process
• Other minor code improvements

File:

• trunk/warpin/bld_fm2_wpi.cmd (modified) (6 diffs)

trunk/warpin/bld_fm2_wpi.cmd

@@ -71 +71 @@
 /* Add the files to the WPI   */
    do
+/*
       if stream(WPI.archivename, 'c', 'query exists') \= '' then
          if archive_previous_WPI == 1 then
@@ -76 +77 @@
          else
             'del 'WPI.archivename
+*/
       do p = 1 to WPI.pkg.0
          call SysFileTree WPI.pkg.p.dir || '\*', 'pkgfilelist.', 'FOS'
@@ -86 +88 @@
       end
       if delete_files_afterwards = 1 then
-         do pkgnum = 1 to WPI.pkg.0
-            call EmptyDir WPI.pkg.pkgnum.dir
-         end
-   end
-
-/* 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
+         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
 
 /*
@@ -139 +140 @@
    WPI.retval = 0
    WPI.scriptonly = 0
-/*
-   parse arg WPI.archivename WPI.scriptname .
-   if WPI.archivename == '' then
-      WPI.archivename = WPI.default_archivename
-   if WPI.scriptname == '' then
-      WPI.scriptname = left(WPI.archivename, length(WPI.archivename) - 3) || 'wis'
-*/
    WPI.archivename = WPI.default_archivename
    WPI.scriptname = left(WPI.archivename, length(WPI.archivename) - 3) || 'wis'
@@ -177 +171 @@
 
    ext_libpath = SysQueryExtLibpath('B')
-   if pos( Warpin_pathentry, ';' || translate(SysQueryExtLibpath('B')) || ';' ) == 0 then
-      call SysSetExtLibpath Warpin_pathentry || ';' || ext_libpath, 'B'
+   if pos( Warpin_pathentry, ';' || translate(ext_libpath) || ';' ) == 0 then
+      call SysSetExtLibpath Warpin_Path || ';' || ext_libpath, 'B'
 
    parse source . . thispgm
@@ -199 +193 @@
 return
 */
-
-Emptydir: procedure
-   parse arg dir
-   call SysFileTree dir'\*', 'dirs.', 'DO'
-   do i = 1 to dirs.0
-      call EmptyDir dirs.i
-   end
-   call SysFileTree dir'\*', 'files.', 'FO'
-   do i = 1 to files.0
-      '@attrib -r -s -h 'files.i' >NUL 2>NUL'
-      '@del 'files.i' >NUL 2>NUL'
-   end
-   '@rd 'dir
-return
 
 novalue: