Changeset 6128 for trunk/tools

Timestamp:

Jun 27, 2001, 10:57:57 AM (24 years ago)

Author:

bird

Message:

Added rexx ftp put function. Uses this for netlabs currently.

File:

• trunk/tools/DailyBuild/odin32ftp2.cmd (modified) (4 diffs)

trunk/tools/DailyBuild/odin32ftp2.cmd

@@ -1 @@
-/* $Id: odin32ftp2.cmd,v 1.16 2001-05-13 20:35:54 bird Exp $
+/* $Id: odin32ftp2.cmd,v 1.17 2001-06-27 08:57:57 bird Exp $
  *
  * Uploads the relase and debug builds to the FTP sites.
@@ -63 +63 @@
         rc = cleanFtp('os2-delete', '/daily', 'www.os2.org');
         do j = 1 to asUploads.0
-            if (1) then
-                rc = putFtp(asUploads.j, 'os2-'||asUploads.j, '/'||sDirectory, 'www.os2.org');
-            else
-                rc = forwardSF(asUploads.j, 'os2-'||asUploads.j, '/'||sDirectory, 'www.os2.org');
+            rc = putFtp(asUploads.j, 'os2-'||asUploads.j, '/'||sDirectory, 'www.os2.org');
+            /*rc = putRexxFtp(asUploads.j, 'os2-'||asUploads.j, '/'||sDirectory, 'www.os2.org');*/
+            /*rc = forwardSF(asUploads.j, 'os2-'||asUploads.j, '/'||sDirectory, 'www.os2.org');*/
         end
     end
@@ -77 +76 @@
         rc = cleanFtp('netlabs-delete', '/daily', 'ftp.netlabs.org');
         do j = 1 to asUploads.0
-            if (1) then
-                rc = putFtp(asUploads.j, 'netlabs-'||asUploads.j, '/'||sDirectory, 'ftp.netlabs.org');
-            else
-                rc = forwardSF(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
     end
@@ -267 +265 @@
 
 
-
-
+/*
+ * REXX FTP put function.
+ */
+putRexxFtp: procedure
+    parse arg sFile, sLockFile, sRemoteDir, sSite
+
+    /* check for done-lock */
+    if stream(sLockFile,'c','query exists') = '' then
+    do
+        say '--- put' sFile '->' sRemoteDir'/'sFile '---';
+
+        /* get password */
+        sPasswdString = GetPassword(sSite);
+        if (sPasswdString = '') then
+        do
+            call failure rc, 'Can''t find userid/password for' sSite'.', -1;
+            return -1;
+        end
+        parse var sPasswdString sUser':'sPasswd;
+
+        /* log on the ftp site */
+        rc = FtpSetUser(sSite, sUser, sPasswd);
+        if (rc = 1) then
+        do
+            /* put file, delete it if we fail */
+            say sSite  sUser  sPasswd  sFile  sRemoteDir'/'sFile  'Binary'
+            rcPut = FtpPut(sFile, sRemoteDir'/'sFile, 'Binary');
+            /*
+            if (rcPut <> 0) then
+                rc = FtpDelete(sRemoteDir'/'sFile);
+            */
+
+            /* Logoff and make lock file. */
+            rc = FtpLogoff();
+            if (rcPut = 0) then
+                'echo ok > ' || sLockFile;
+            else
+                call failure rc, 'FtpPut failed -' sSite , FTPERRNO;
+            rc = rcPut;
+        end
+        else
+        do
+            call failure rc, 'Logon failed -' sSite, FTPERRNO;
+            if rc = 0 then rc = -1;
+        end
+    end
+    else
+        rc = 0;
+    return 0;
+
+/*
+ * Report error. (non-fatal)
+ */
 failure: procedure
 parse arg rc, sText, iftperrno;