Changeset 4902 for trunk/tools/DailyBuild

Timestamp:

Jan 9, 2001, 7:44:07 PM (25 years ago)

Author:

bird

Message:

Splitted out the 3dxf/glide stuff.

Location:

trunk/tools/DailyBuild

Files:

• odin32ftp2.cmd (modified) (5 diffs)
• odin32pack.cmd (modified) (7 diffs)

trunk/tools/DailyBuild/odin32ftp2.cmd

@@ -1 @@
-/* $Id: odin32ftp2.cmd,v 1.5 2001-01-08 19:51:59 bird Exp $
+/* $Id: odin32ftp2.cmd,v 1.6 2001-01-09 18:44:07 bird Exp $
  *
  * Uploads the relase and debug builds to the FTP sites.
@@ -19 +19 @@
     sDelete         = 'odin32bin-'|| DateSub(DATE('S'), 7);
     sFileDbg        = sFile   || '-debug.zip';
+    sFileGlideDbg   = sFile   || '-glide-debug.zip';
     sFileDbgWPI     = sFile   || '-debug.wpi';
     sDeleteDbg      = sDelete || '-debug.zip';
+    sDeleteGlideDbg = sDelete || '-glide-debug.zip';
     sDeleteDbgWPI   = sDelete || '-debug.wpi';
     sFileRel        = sFile   || '-release.zip';
+    sFileGlideRel   = sFile   || '-glide-release.zip';
     sFileRelWPI     = sFile   || '-release.wpi';
     sDeleteRel      = sDelete || '-release.zip';
+    sDeleteGlideRel = sDelete || '-glide-release.zip';
     sDeleteRelWPI   = sDelete || '-release.wpi';
     sChangeLog      = 'ChangeLog';
@@ -36 +40 @@
      * Put file to SourceForge.
      */
-    rc = putSF(sFileDbg,    'SF-debug');
-    rc = putSF(sFileDbgWPI, 'SF-debug-wpi');
-    rc = putSF(sFileRel,    'SF-release');
-    rc = putSF(sFileRelWPI, 'SF-release-wpi');
-    rc = putSF(sChangeLog,  'SF-ChangeLog');
+    rc = putSF(sFileDbg,        'SF-debug');
+    rc = putSF(sFileGlideDbg,   'SF-glide-debug');
+    rc = putSF(sFileDbgWPI,     'SF-debug-wpi');
+    rc = putSF(sFileRel,        'SF-release');
+    rc = putSF(sFileGlideRel,   'SF-glide-release');
+    rc = putSF(sFileRelWPI,     'SF-release-wpi');
+    rc = putSF(sChangeLog,      'SF-ChangeLog');
 
     /*
@@ -49 +55 @@
         rc = deletefunction(   '/daily/'sDeleteDbg,    '/daily/'sDeleteRel,     'os2-delete', 'www.os2.org');
         rc = deletefunction('/daily/'sDeleteDbgWPI, '/daily/'sDeleteRelWPI, 'os2-delete-wpi', 'www.os2.org');
-        rc = forwardSF(sFileDbg,          'os2-debug', '/daily', 'www.os2.org');
-        rc = forwardSF(sFileRel,        'os2-release', '/daily', 'www.os2.org');
-        rc = forwardSF(sFileDbgWPI,   'os2-debug-wpi', '/daily', 'www.os2.org');
-        rc = forwardSF(sFileRelWPI, 'os2-release-wpi', '/daily', 'www.os2.org');
-        rc = forwardSF(sChangeLog,    'os2-ChangeLog', '/daily', 'www.os2.org');
+        rc = forwardSF(sFileDbg,              'os2-debug', '/daily', 'www.os2.org');
+        rc = forwardSF(sFileGlideDbg,   'os2-glide-debug', '/daily', 'www.os2.org');
+        rc = forwardSF(sFileRel,            'os2-release', '/daily', 'www.os2.org');
+        rc = forwardSF(sFileGlideRel, 'os2-glide-release', '/daily', 'www.os2.org');
+        rc = forwardSF(sFileDbgWPI,       'os2-debug-wpi', '/daily', 'www.os2.org');
+        rc = forwardSF(sFileRelWPI,     'os2-release-wpi', '/daily', 'www.os2.org');
+        rc = forwardSF(sChangeLog,        'os2-ChangeLog', '/daily', 'www.os2.org');
 
     end
@@ -59 +67 @@
     if (0 /*sLoc = '' | sLoc = 'netlabs'*/) then
     do
-        /*                 (                  sDeleteFile1,                   sDeleteFile2,            sLockFile,             sSite); */
-        rc = deletefunction(   '/odinftp/daily/'sDeleteDbg,    '/odinftp/daily/'sDeleteRel,     'netlabs-delete', 'ftp.netlabs.org');
-        rc = deletefunction('/odinftp/daily/'sDeleteDbgWPI, '/odinftp/daily/'sDeleteRelWPI, 'netlabs-delete-wpi', 'ftp.netlabs.org');
-        /*              (sFile,            sFileRemote,           sLockFile,             sSite); */
-        rc = putfunction(sFileDbg,    '/odinftp/daily',     'netlabs-debug', 'ftp.netlabs.org');
-        rc = putfunction(sFileRel,    '/odinftp/daily',   'netlabs-release', 'ftp.netlabs.org');
-        rc = putfunction(sFileDbgWPI, '/odinftp/daily',     'netlabs-debug', 'ftp.netlabs.org');
-        rc = putfunction(sFileRelWPI, '/odinftp/daily',   'netlabs-release', 'ftp.netlabs.org');
-        rc = putfunction('ChangeLog', '/odinftp/daily', 'netlabs-ChangeLog', 'ftp.netlabs.org');
+        /*                 (                    sDeleteFile1,                     sDeleteFile2,             sLockFile,             sSite); */
+        rc = deletefunction(     '/odinftp/daily/'sDeleteDbg,      '/odinftp/daily/'sDeleteRel,      'netlabs-delete', 'ftp.netlabs.org');
+        rc = deletefunction('/odinftp/daily/'sDeleteGlideDbg, '/odinftp/daily/'sDeleteGlideRel,'netlabs-delete-glide', 'ftp.netlabs.org');
+        rc = deletefunction(  '/odinftp/daily/'sDeleteDbgWPI,   '/odinftp/daily/'sDeleteRelWPI,  'netlabs-delete-wpi', 'ftp.netlabs.org');
+        /*              (sFile,              sFileRemote,           sLockFile,             sSite); */
+        rc = putfunction(sFileDbg,      '/odinftp/daily',     'netlabs-debug', 'ftp.netlabs.org');
+        rc = putfunction(sFileGlideDbg, '/odinftp/daily',     'netlabs-debug', 'ftp.netlabs.org');
+        rc = putfunction(sFileRel,      '/odinftp/daily',   'netlabs-release', 'ftp.netlabs.org');
+        rc = putfunction(sFileGlideRel, '/odinftp/daily',   'netlabs-release', 'ftp.netlabs.org');
+        rc = putfunction(sFileDbgWPI,   '/odinftp/daily',     'netlabs-debug', 'ftp.netlabs.org');
+        rc = putfunction(sFileRelWPI,   '/odinftp/daily',   'netlabs-release', 'ftp.netlabs.org');
+        rc = putfunction('ChangeLog',   '/odinftp/daily', 'netlabs-ChangeLog', 'ftp.netlabs.org');
     end
 end

trunk/tools/DailyBuild/odin32pack.cmd

@@ -1 @@
-/* $Id: odin32pack.cmd,v 1.7 2001-01-08 19:54:22 bird Exp $
+/* $Id: odin32pack.cmd,v 1.8 2001-01-09 18:43:19 bird Exp $
  *
  * Make the two zip files.
@@ -24 +24 @@
     call ChDir '..\..';
 
+
     /*
      * Make .ZIP files.
@@ -29 +30 @@
     call ChDir 'bin';
     call packdir 'debug', 'debug'
+    call packdir3dx 'debug', 'debug'
     call packdir 'release', 'release'
+    call packdir3dx 'release', 'release'
     call ChDir '..';
 
@@ -50 +53 @@
     'del /Q /Y /Z /X .\glide\Voodoo1\CVS > nul 2>&1'
     'del /Q /Y /Z /X .\glide\Voodoo2\CVS > nul 2>&1'
+    'del /Q /Y /Z /X .\Voodoo1\CVS > nul 2>&1'
+    'del /Q /Y /Z /X .\Voodoo1 > nul 2>&1'
+    'del /Q /Y /Z /X .\Voodoo2\CVS > nul 2>&1'
+    'del /Q /Y /Z /X .\Voodoo2 > nul 2>&1'
+    'rmdir .\Voodoo2 > nul 2>&1'
+    'rmdir .\Voodoo1 > nul 2>&1'
     call copy '..\odin.ini'
     call copy '..\..\doc\odin.ini.txt'
@@ -76 +85 @@
     'ren ..\'||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';
+    end
 
     say 'zip -9 -R' sZipFile '* -xCVS';
@@ -82 +97 @@
     do
         rc2 = rc;
+        'ren ..\glide_tmp .\system32\glide'
         'ren .\system32 ..\'||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
     if (RC <> 0) then call failure rc, 'renaming' sDir'->system32 failed';
@@ -91 +109 @@
     call ChDir '..';
     return;
+
+/*
+ * Pack the 3dx dlls.
+ */
+packdir3dx: procedure expose sStartDir;
+parse arg sDir, sType;
+    sZipFile = filespec('path', directory())||'odin32bin-' || DATE(S) || '-glide-' || sType || '.zip';
+    sDir = directory();
+
+    call ChDir sDir
+    say 'zip -9 -R' sZipFile 'glide\* -xCVS';
+    'zip -9 -R' sZipFile 'glide\* -xCVS';
+    if (rc <> 0) then call failure rc, 'zip...';
+
+    /* restore directory */
+    call directory(sDir);
+    return;
+
 
 /*