Changeset 4193 for trunk/tools

Timestamp:

Sep 5, 2000, 7:36:22 PM (25 years ago)

Author:

bird

Message:

Updated daily build macros:

• better cleanup.
• not so many directories. Logs are now moved to be a child of the dailybuild-script directory. so are database backups.
• more flexible database backup.

Location:

trunk/tools/DailyBuild

Files:

• job.cmd (modified) (6 diffs)
• odin32clean.cmd (modified) (2 diffs)
• odin32db.cmd (modified) (4 diffs)
• readme.txt (modified) (3 diffs)

trunk/tools/DailyBuild/job.cmd

@@ -1 @@
-/* $Id: job.cmd,v 1.2 2000-07-18 11:18:13 bird Exp $
+/* $Id: job.cmd,v 1.3 2000-09-05 17:36:21 bird Exp $
  *
  * Main job for building OS/2.
@@ -13 +13 @@
     call SysloadFuncs;
 
-    sLogFile = '..\logs\' || Date(S) || '.log';
-    sTree    = 'tree' || Date(S);
+    /*
+     * Get source directory of this script
+     */
+    parse source sd1 sd2 sScript
+    sScriptDir = filespec('drive', sScript) || filespec('path', sScript);
+    sLogFile = sScriptDir || '\logs\' || Date('S') || '.log';
+    sTree    = sScriptDir || '..\tree' || Date('S');
 
     /*
      * Clean tree, get it and build it.
      */
-    'mkdir ..\'||sTree
-    'cd ..\'||sTree
+    'mkdir' sTree
+    filespec('drive', sScript);
+    'cd' sTree;
     if (rc <> 0) then call failure rc, 'cd ..\'sTree 'failed.';
-    'call ..\scripts\odin32env.cmd'
+    'call' sScriptDir || 'odin32env.cmd'
     if (rc <> 0) then call failure rc, 'Env failed.';
-    'call ..\scripts\odin32clean.cmd'
+    'call' sScriptDir || 'odin32clean.cmd'
     if (rc <> 0) then call failure rc, 'Clean failed.';
-    'call ..\scripts\odin32get.cmd'
+    'call' sScriptDir || 'odin32get.cmd'
     if (rc <> 0) then call failure rc, 'Get failed.';
-    'call ..\scripts\odin32build.cmd 2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
+    'call' sScriptDir || 'odin32build.cmd 2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
     if (rc <> 0) then call failure rc, 'Build failed.';
 
@@ -34 +40 @@
      * Pack and upload it.
      */
-    'call ..\scripts\odin32pack.cmd  2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
+    '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 ..\scripts\odin32ftp2.cmd';
+    'start /BG "Uploading Odin..." nice -f cmd /C' sScriptDir || 'odin32ftp2.cmd';
     if (rc <> 0) then say 'rc='rc' FTPing failed. i = ' || i;
 
@@ -42 +48 @@
      * database update
      */
-    '..\scripts\odin32db.cmd  2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
+    sScriptDir || 'odin32db.cmd  2>&1 | tee /a ' || sLogFile; /* 4OS/2 tee command. */
     if (rc <> 0) then call failure rc, 'db failed.';
 
@@ -52 +58 @@
     'cd c:\odin32';
     if (rc <> 0) then call failure rc, 'cd c:\odin32 failed.';
-    'unzip -o d:\odin32\tree\*debug.zip';
+    'unzip -o ' || sTree || '*debug.zip';
     if (rc <> 0) then call failure rc, 'unzip failed.';
     'd:'
@@ -68 +74 @@
     say 'rc='rc sText
     exit(rc);
+

trunk/tools/DailyBuild/odin32clean.cmd

@@ -1 @@
-/* $Id: odin32clean.cmd,v 1.1 2000-04-27 11:32:24 bird Exp $
+/* $Id: odin32clean.cmd,v 1.2 2000-09-05 17:36:22 bird Exp $
  *
- * Deletes the tree (current directory and all subdirectories).
+ * Removes trees. WARNING!!!!! All tree<date> directories are removed
+ * if .nodelete is not found in the root of them.
  *
- * (assumes that rd is equal to "deltree"  (which it is in my installation).
+ * (Delpath is a "deltree" clone I've made, use your own.)
  *
  * Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
@@ -10 +11 @@
  *
  */
-    'echo y > %temp%\y_odin32';
-    'rd . < %temp%\y_odin32';
-    if RC <> 0 then call failure rc, 'Del failed.';
-    'del %temp%\y_odin32';
+
+    call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs';
+    call SysloadFuncs;
+
+    sTree    = 'tree' || Date(S);
+
+    /*
+     * We assume currentdirectory is the current tree.
+     */
+    rc = SysFileTree('..\tree'||substr(Date('S'),1,4)||'*.', 'asTrees', 'DO');
+    if (rc = 0) then
+    do
+        do i = 1 to asTrees.0
+            if (stream(asTrees.i||'\.nodelete', 'c', 'query exists') = '') then
+            do
+                'echo y | delpath' asTrees.i;
+            end
+            say asTrees.i
+        end
+    end
+
     exit(0);
 

trunk/tools/DailyBuild/odin32db.cmd

@@ -1 @@
-/* $Id: odin32db.cmd,v 1.1 2000-04-27 11:32:25 bird Exp $
+/* $Id: odin32db.cmd,v 1.2 2000-09-05 17:36:22 bird Exp $
  *
  * Updates the Odin32 API database.
@@ -11 +11 @@
     call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs';
     call SysloadFuncs;
+
+    /*
+     * Get source directory of this script
+     */
+    parse source sd1 sd2 sScript
+    sScriptDir = filespec('drive', sScript) || filespec('path', sScript);
 
     'cd tools\database';
@@ -26 +32 @@
 
     /* create database backup */
-    'c:'
+    filespec('drive', getMySqlDataDir());
     if rc <> 0 then call failure rc, 'c: failed';
-    'cd c:\emx\mysql\data\odin32'
+    'cd' getMySqlDataDir()||'\odin32';
     if rc <> 0 then call failure rc, 'cd <> failed';
     'mysqladmin refresh';
-    'rar a -m5 d:\temp\db'||date(S)||'.rar *'
+    'rar a -m5 ' || sScriptDir || 'dbbackup\db'||date(S)||'.rar *'
     if rc <> 0 then call failure rc, 'rar db failed';
     'cd \';
@@ -43 +49 @@
     exit(rc);
 
+
+/*
+ * Get the MySql data directory.
+ */
+getMySqlDataDir: procedure
+
+    /* Get mysql variables */
+    '@mysqladmin variables | rxqueue /lifo'
+
+    /* Get datadir */
+    sDataDir = '';
+    do queued()
+        pull s;
+        if (pos(' DATADIR ', s) > 0) then
+        do
+            sDataDir = strip( substr( s, pos('|',s,3) + 1 ) );
+            sDataDir = strip( substr(sDataDir, 1, length(sDataDir)-1) );
+            leave;
+        end
+    end
+
+    /* Drain queue */
+    do queued()
+        pull s
+    end
+    drop s;
+
+    /* If failure set default directory. */
+    if (sDataDir = '') then
+        sDataDir = 'd:\knut\Apps\MySql\data\';
+    return sDataDir;
+

trunk/tools/DailyBuild/readme.txt

@@ -1 @@
-/* $Id: readme.txt,v 1.1 2000-04-27 12:00:10 bird Exp $ */
+/* $Id: readme.txt,v 1.2 2000-09-05 17:36:22 bird Exp $ */
 
 This is a short readme for the daily builder scripts. These are all the
@@ -7 +7 @@
 Directory structure
 -------------------
-The build scripts assumes that the scripts are found in ..\scripts and
-that the Odin32 CVS tree checkout is to be placed in ..\tree (relative to
-the starting directory). The job.cmd is normally started from the scripts
-directory, and starts out changing the to ..\tree.
+The build scripts assumes that the scripts are found in ..\DailyBuild and
+that the Odin32 CVS tree checkout is to be placed in ..\tree<date> (relative
+to the start directory). The job.cmd is normally started from the
+DailyBuild directory, and starts out changing the to ..\tree<date>.
 Logs are placed in ..\logs.
 
-    <basedir>\scripts   - All these scripts.
-    <basedir>\tree      - The CVS tree (don't work on this, tree it's delete every night...).
-    <basedir>\logs      - Logs.
+    <basedir>\DailyBuild        - All these scripts.
+    <basedir>\tree<date>        - The CVS tree (don't work on this, tree it's delete every night...).
+    <basedir>\DailyBuild\logs   - Logs.
+    <basedir>\DailyBuild\dbbackup   - Database backups.
 
 
@@ -50 +51 @@
       (I have a very simple one if needed.)
 
-Thu 27.04.2000
+Tue 05.09.2000
   knut