Changeset 48

Timestamp:

Jun 24, 2009, 11:04:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Undo temporary file rename operations we perform when building qmake if we fail and exit the script in the middle.

File:

• trunk/configure.cmd (modified) (7 diffs)

trunk/configure.cmd

@@ -732 +732 @@
      * however they are real functions in the library */
 
-    old_qconfig_h = ""
+    /* use an "at exit" slot to undo temporary file rename operations since we
+     * can fail in the middle */
+    exs = AddAtExitSlot()
+
     qconfig_h = G.OutPath"\src\corelib\global\qconfig.h"
     qmake_qconfig_h = qconfig_h".qmake"
     if (FileExists(qconfig_h)) then do
-         old_qconfig_h = qconfig_h
-         call MoveFile old_qconfig_h, old_qconfig_h".old"
+        call MoveFile qconfig_h, qconfig_h".old"
+        /* record undo Move operation */
+        call PutToAtExitSlot exs, 'call MoveFile "'qconfig_h'.old", "'qconfig_h'"'
     end
 
@@ -746 +750 @@
 
     call MoveFile qmake_qconfig_h, qconfig_h
+    /* record undo Move operation */
+    call PutToAtExitSlot exs, 'call MoveFile "'qconfig_h'", "'qmake_qconfig_h'"'
+
     list.1 = G.OutPath"\include\QtCore\qconfig.h"
     list.2 = G.OutPath"\include\Qt\qconfig.h"
@@ -761 +768 @@
 
     /* put back original qconfig.h */
-    call MoveFile qconfig_h, qmake_qconfig_h
-    if (old_qconfig_h \== "") then
-        call MoveFile old_qconfig_h".old", old_qconfig_h
+    call RunAtExitSlot exs
 
     /* exit on failure */
@@ -2335 +2340 @@
  *  @version 1.1
  */
-/* <<< export to qt.cmd starts */
 AddPathVar: procedure expose (Globals)
     parse arg name, path, mode, environment
@@ -2385 +2389 @@
     else call value name, cur
     return
-/* >>> export to qt.cmd ends */
 
 /**
  *  Shortcut to AddPathVar(name, path, prepend, 'OS2ENVIRONMENT')
  */
-/* <<< export to qt.cmd starts */
 AddPathEnv: procedure expose (Globals)
     parse arg name, path, prepend
     call AddPathVar name, path, prepend, 'OS2ENVIRONMENT'
     return
-/* >>> export to qt.cmd ends */
 
 /**
@@ -2422 +2423 @@
     end
     return str
+
+/**
+ * Initializes a new "at exit" slot and returns its ID.
+ */
+AddAtExitSlot: procedure expose (Globals)
+    id = 1
+    if (symbol('G.AtExit.0') == 'VAR') then
+        id = G.AtExit.0 + 1
+    G.AtExit.0 = id
+    G.AtExit.id = ""
+    return id
+
+/**
+ * Puts the REXX code passed in @a aCommand to the "at exit" slot with @a aID.
+ * The entire set of commands will be executed upon program termination
+ * unless the slot is purged earlier with RunAtExitSlot.
+ *
+ * Note that the commands will be executed in the order reverse to the order of
+ * PutToAtExitSlot calls (i.e. the last put command will be executed first).
+ *
+ * @param aID       Slot ID to add the command to.
+ * @param aCommand  Command to add.
+ */
+PutToAtExitSlot: procedure expose (Globals)
+    parse arg aID, aCommand
+    if (G.AtExit.aID == "") then
+        G.AtExit.aID = aCommand
+    else
+        G.AtExit.aID = aCommand"; "G.AtExit.aID
+    return
+
+/**
+ * Executes the "at exit" slot with @a aID and purges (removes) it from the
+ * collection of slots so that it won't be executed upon program termination.
+ *
+ * Note that the commands will be executed in the order reverse to the order of
+ * PutToAtExitSlot calls (i.e. the last put command will be executed first).
+ *
+ * @param aID       Slot ID to run.
+ */
+RunAtExitSlot: procedure expose (Globals)
+    parse arg aID
+    cmds = G.AtExit.aID
+    drop G.AtExit.aID
+    /* shorten the list if we are the last (unless called from Done) */
+    if (value('G.Done_done') \= 1) then
+        if (G.AtExit.0 == aID) then
+            G.AtExit.0 = aID - 1
+    /* execute commands */
+    interpret cmds
+    return
 
 /**
@@ -2488 +2540 @@
     call value 'G.Done_done', 1
     /* cleanup stuff goes there */
-    /* ... */
+    if (symbol('G.AtExit.0') == 'VAR') then do
+        /* run all AtExit slots */
+        do i = 1 to G.AtExit.0
+            if (symbol('G.AtExit.'i) == 'VAR') then
+                call RunAtExitSlot i
+        end
+    end
+    drop G.AtExit.
     /* finally, exit */
     exit code