Changeset 10019 for trunk/tools

Timestamp:

Apr 15, 2003, 12:08:04 AM (22 years ago)

Author:

bird

Message:

Made it work again :)

Location:

trunk/tools/DailyBuild

Files:

• job.cmd (modified) (5 diffs)
• odin32env.cmd (modified) (2 diffs)
• odin32ftp2.cmd (modified) (2 diffs)

trunk/tools/DailyBuild/job.cmd

@@ -1 @@
-/* $Id: job.cmd,v 1.9 2003-02-06 21:05:37 bird Exp $
+/* $Id: job.cmd,v 1.10 2003-04-14 22:08:03 bird Exp $
  *
  * Main job for building OS/2.
@@ -54 +54 @@
     parse source sd1 sd2 sScript
     sScriptDir = filespec('drive', sScript) || filespec('path', sScript);
-    sLogFile = sScriptDir || '\logs\' || sDate || '.log';
+    sStateDir = sScriptDir||'State'||sType;
+    sLogFile = sScriptDir || 'Logs\' || sDate || '.log';
     sTree    = sScriptDir || '..\tree' || sDate;
-    'mkdir 'sScriptDir||'\logs'
-    'mkdir 'sScriptDir||'\DBBackup'
+    'call' sScriptDir||'bin\CreatePath.cmd 'sScriptDir||'Logs'
+    'call' sScriptDir||'bin\CreatePath.cmd 'sScriptDir||'DBBackup'
+    'call' sScriptDir||'bin\CreatePath.cmd 'sStateDir;
 
     /*
@@ -65 +67 @@
     filespec('drive', sScript);
     'cd' sTree;
-    if (rc <> 0) then call failure rc, 'cd ..\'sTree 'failed.';
+    if (rc <> 0) then call failure rc, '', 'cd 'sTree 'failed.';
     'call' sScriptDir || 'odin32env.cmd'
-    if (rc <> 0) then call failure rc, 'Env failed.';
+    if (rc <> 0) then call failure rc, '', 'Env failed.';
+    if (IsChangeLogModified(sStateDir)) then
+    do
+        say 'Nothing to do. ChangeLog unmodified.'
+        'echo ChangeLog unmodified >' sLogFile;
+        exit(0);
+    end
     'call' sScriptDir || 'odin32clean.cmd'
-    if (rc <> 0) then call failure rc, 'Clean failed.';
+    if (rc <> 0) then call failure rc, sStateDir, 'Clean failed.';
     'call' sScriptDir || 'odin32get.cmd'
-    if (rc <> 0) then call failure rc, 'Get failed.';
+    if (rc <> 0) then call failure rc, sStateDir, 'Get failed.';
     'call' sScriptDir || 'odin32bldnr.cmd inc'
-    if (rc <> 0) then call failure rc, 'Build Nr inc failed.';
+    if (rc <> 0) then call failure rc, sStateDir, 'Build Nr inc failed.';
     'call' sScriptDir || 'odin32build.cmd 2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
-    if (rc <> 0) then call failure rc, 'Build failed.';
+    if (rc <> 0) then call failure rc, sStateDir, 'Build failed.';
     'call' sScriptDir || 'odin32bldnr.cmd commit'
-    if (rc <> 0) then call failure rc, 'Build Nr commit failed.';
+    if (rc <> 0) then call failure rc, sStateDir, 'Build Nr commit failed.';
 
     /*
@@ -83 +91 @@
      */
     'call' sScriptDir || 'odin32pack.cmd  2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
-    if (rc <> 0) then call failure rc, 'Packing failed.';
-    'start /BG "Uploading Odin..." nice -f cmd /C' sScriptDir || 'odin32ftp2.cmd';
-    if (rc <> 0) then say 'rc='rc' FTPing failed. i = ' || i;
+    if (rc <> 0) then call failure rc, sStateDir, 'Packing failed.';
+    'call' sScriptDir || 'odin32ftp2.cmd';
+    if (rc <> 0) then call failure rc, sStateDir, 'Upload failed!';
+
 
     /*
      * database update
      */
+    /*
     sScriptDir || 'odin32db.cmd  2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
-    if (rc <> 0) then call failure rc, 'db failed.';
+    if (rc <> 0) then call failure rc, '', 'db failed.';
+    */
 
-    /*
-     * Update local installation at d:\odin...
-     */
-/*
-    'd:';
-    if (rc <> 0) then call failure rc, 'd: failed.';
-    'cd d:\odin';
-    if (rc <> 0) then call failure rc, 'cd d:\odin failed.';
-    'unzip -o ' || sTree || '\odin*debug.zip';
-    if (rc <> 0) then call failure rc, 'unzip failed.';
-    'd:'
-    if (rc <> 0) then call failure rc, 'd: failed.';
-*/
     /* successfull exit */
     exit(0);
@@ -114 +112 @@
  */
 failure: procedure
-parse arg rc, sText;
+parse arg rc, sStateDir, sText;
     say 'rc='rc sText
+    if (sStateDir <> '') then
+        call ForceNextBuild sStateDir;
     exit(rc);
 
+
+/*
+ * Checks if the change log is up to date or not.
+ */
+IsChangeLogModified: procedure
+parse arg sStateDir;
+
+    sDir = directory();
+    'cd' sStateDir
+    if (rc <> 0) then call failure rc, 'cd 'sStateDir' failed!';
+
+    if (stream(sStateDir'\ChangeLog', 'c', 'query exist') == '') then
+    do
+        /* no such file: check it out. */
+        fUpToDate = 0;
+    end
+    else
+    do
+        /* check if up to date. */
+        'cvs status ChangeLog | grep -q "Status: Up-to-date"';
+        if (rc <> 0) then
+            fUpToDate = 0;
+        else
+            fUpToDate = 1;
+    end
+
+    /*
+     * Check out the latest ChangeLog.
+     */
+    if (\fUpToDate) then
+    do
+        /* check if up to date. */
+        'if exist ChangeLog del ChangeLog';
+        'call cvs checkout ChangeLog';
+    end
+
+    call directory sDir;
+return fUpToDate;
+
+
+/*
+ * Force build next time.
+ * Called when we fail.
+ */
+ForceNextBuild: procedure
+parse arg sStateDir;
+    'if exist 'sStateDir'\ChangeLog del 'sStateDir'\ChangeLog';
+return rc;

trunk/tools/DailyBuild/odin32env.cmd

@@ -1 @@
-/* $Id: odin32env.cmd,v 1.30 2003-02-11 15:06:36 bird Exp $
+/* $Id: odin32env.cmd,v 1.31 2003-04-14 22:08:04 bird Exp $
  *
  * Sets the build environment.
@@ -17 +17 @@
 /* base env */
 sOldDir = directory();
-call directory sSrc||'\bin';
-call BuildEnv 'warpin mysql perl~ cvs ddkbase mscv6-16 emx gcc303 vac365õ watcomc11cõ vac40õ vac308 toolkit40 debug'
+call directory sDir||'\bin';
+call BuildEnv 'warpin mysql perl~ cvs ddkbase mscv6-16 emx gcc321 vac365õ watcomc11cõ vac40õ vac308 toolkit40 debug'
 call directory sOldDir;
 

trunk/tools/DailyBuild/odin32ftp2.cmd

@@ -1 @@
-/* $Id: odin32ftp2.cmd,v 1.20 2003-02-18 01:01:01 bird Exp $
+/* $Id: odin32ftp2.cmd,v 1.21 2003-04-14 22:08:04 bird Exp $
  *
  * Uploads the relase and debug builds to the FTP sites.
@@ -86 +86 @@
         rc = cleanFtp('netlabs-delete', '/daily', 'ftp.netlabs.org');
         do j = 1 to asUploads.0
-            /*rc = putFtp(asUploads.j, 'netlabs-'||asUploads.j, '/'||sDirectory, 'ftp.netlabs.org'); */
-            rc = putRexxFtp(asUploads.j, 'netlabs-'||asUploads.j, '/'||sDirectory, 'ftp.netlabs.org');
+            rc = putFtp(asUploads.j, 'netlabs-'||asUploads.j, '/'||sDirectory, 'ftp.netlabs.org');
+            /*rc = putRexxFtp(asUploads.j, 'netlabs-'||asUploads.j, '/'||sDirectory, 'ftp.netlabs.org');*/
             /*rc = forwardSF(asUploads.j, 'netlabs-'||asUploads.j, '/'||sDirectory, 'ftp.netlabs.org');*/
         end