Changeset 4917 for trunk/tools/DailyBuild

Timestamp:

Jan 10, 2001, 2:50:48 PM (25 years ago)

Author:

bird

Message:

Changed and corrected .zip packing. (uses the root of the tree as base directory)

File:

• trunk/tools/DailyBuild/odin32pack.cmd (modified) (8 diffs)

trunk/tools/DailyBuild/odin32pack.cmd

@@ -1 @@
-/* $Id: odin32pack.cmd,v 1.9 2001-01-09 18:46:28 bird Exp $
+/* $Id: odin32pack.cmd,v 1.10 2001-01-10 13:50:48 bird Exp $
  *
  * Make the two zip files.
@@ -15 +15 @@
      * Make .WPI files.
      */
-    call ChDir 'tools\install';
+/*    call ChDir 'tools\install';
     'call odin.cmd debug'
     if (RC <> 0) then call failure rc, 'odin.cmd debug failed.';
@@ -23 +23 @@
     if (RC <> 0) then call failure rc, 'failed to move the *.wpi ->' sStartDir;
     call ChDir '..\..';
-
+*/
 
     /*
      * Make .ZIP files.
      */
-    call ChDir 'bin';
-    call packdir 'debug', 'debug'
-    call packdir3dx 'debug', 'debug'
-    call packdir 'release', 'release'
-    call packdir3dx 'release', 'release'
-    call ChDir '..';
+    call packdir 'bin\debug', 'debug'
+    call packdir3dx 'bin\debug\glide', 'glide-debug'
+    call packdir 'bin\release', 'release'
+    call packdir3dx 'bin\release\glide', 'glide-release'
 
     /* return successfully */
@@ -42 +40 @@
 parse arg sDir, sType;
 
-    sZipFile = filespec('path', directory())||'odin32bin-' || DATE(S) || '-' || sType || '.zip';
+    sZipFile = directory() || '\odin32bin-' || DATE(S) || '-' || sType || '.zip';
 
     /*
      * Change into the directory we're to pack and do some fixups
      */
+    sRoot = directory();
     call ChDir sDir
     'del /Q /Y /Z *.cmd > nul 2>&1'
@@ -69 +68 @@
 
     /* Copy root files into the pack directory. */
-    call copy '..\wgss50.dll', 'system32\wgss50.dll';
-    call copy '..\odin.ini'
-    call copy '..\..\doc\odin.ini.txt'
-    call copy '..\..\LICENSE.txt';
-    call copy '..\..\ChangeLog';
-    call copy '..\..\doc\Readme.txt';
-    call copy '..\..\doc\Logging.txt';
-    call copy '..\..\doc\ReportingBugs.txt';
-    call copy '..\..\doc\ChangeLog-2000';
-    call copy '..\..\doc\ChangeLog-1999';
+    call copy sRoot'\bin\odin.ini'
+    call copy sRoot'\doc\odin.ini.txt'
+    call copy sRoot'\LICENSE.txt';
+    call copy sRoot'\ChangeLog';
+    call copy sRoot'\doc\Readme.txt';
+    call copy sRoot'\doc\Logging.txt';
+    call copy sRoot'\doc\ReportingBugs.txt';
+    call copy sRoot'\doc\ChangeLog-2000';
+    call copy sRoot'\doc\ChangeLog-1999';
 
     /*
@@ -84 +82 @@
      * and pack it.
      */
-    'ren ..\'||sDir '.\system32'
+    'ren' sRoot'\'sDir '.\system32'
     if (RC <> 0) then call failure rc, 'renaming' sDir'->system32 failed';
     'ren .\system32\glide ..\glide_tmp'
     if (RC <> 0) then
     do
-        'ren .\system32 ..\'||sDir
-        call failure rc, 'renaming system32\glide -> ..\glide_tmp failed';
+        rc2 = rc;
+        'ren .\system32' sRoot'\'sDir
+        call failure rc2, 'renaming system32\glide -> ..\glide_tmp failed';
     end
+
+    call copy sRoot'\bin\wgss50.dll', 'system32\wgss50.dll';
 
     say 'zip -9 -R' sZipFile '* -xCVS';
@@ -99 +100 @@
         rc2 = rc;
         'ren ..\glide_tmp .\system32\glide'
-        'ren .\system32 ..\'||sDir
+        'ren .\system32' sRoot'\'sDir
         call failure rc2, 'zip...';
     end
     'ren ..\glide_tmp .\system32\glide'
     if (RC <> 0) then call failure rc, 'renaming glide_tmp failed';
-    'ren .\system32 ..\'||sDir
+    'ren .\system32' sRoot'\'sDir
     if (RC <> 0) then call failure rc, 'renaming' sDir'->system32 failed';
 
     /* restore directory */
-    call ChDir '..';
+    call directory(sRoot);
     return;
 
@@ -116 +117 @@
 packdir3dx: procedure expose sStartDir;
 parse arg sDir, sType;
-    sZipFile = filespec('path', directory())||'odin32bin-' || DATE(S) || '-glide-' || sType || '.zip';
-    sDir = directory();
+    sZipFile = directory()||'\odin32bin-' || DATE(S) || '-' || sType || '.zip';
 
+    sRoot = directory();
     call ChDir sDir
-    say 'zip -9 -R' sZipFile 'glide\* -xCVS';
-    'zip -9 -R' sZipFile 'glide\* -xCVS';
+    say 'zip -9 -R' sZipFile '* -xCVS';
+    'zip -9 -R' sZipFile '* -xCVS';
     if (rc <> 0) then call failure rc, 'zip...';
 
     /* restore directory */
-    call directory(sDir);
+    call directory(sRoot);
     return;