Changeset 1735

Timestamp:

Feb 21, 2014, 4:53:01 PM (12 years ago)

Author:

John Small

Message:

Ticket #462: Fixed/improved handling of enronment variables

File:

• trunk/ReleaseTool.cmd (modified) (5 diffs)

trunk/ReleaseTool.cmd

@@ -274 +274 @@
                do /* Ensure the edits build */
                   say
-                  'set WARNALL=1'
+                  myWarnall = SetEnv('WARNALL', '1')
                   call ExecCmd 'wmake -a all | tee warnall.log |' cmd.pager
-                  'set WARNALL='
+                  call SetEnv 'WARNALL', myWarnall
                   call ExecCmd 'diff.exe -rub warnall.base warnall.log > warnall.diff'
                   call ExecCmd cmd.editor 'warnall.diff'
@@ -304 +304 @@
             when user_choice = mainmenu.Build_all_for_release_num then
                do /* Build for the release */
-                  'set WARNALL='
-                  'set FORTIFY='
-                  'set DEBUG='
-                  call ExecCmd 'wmake -a all | tee build.log'
+                  myWarnall = SetEnv('WARNALL', '')
+                  myFortify = SetEnv('FORTIFY', '')
+                  myDebug   = SetEnv('DEBUG', '')
+
+                  call ExecCmd 'wmake -a all  | tee build.log'
+
+                  call SetEnv 'WARNALL', myWarnall
+                  call SetEnv 'FORTIFY', myFortify
+                  call SetEnv 'DEBUG', myDebug
                   prev_user_choice = user_choice
                end
@@ -329 +334 @@
             when user_choice = mainmenu.LXLITE_build_num then
                do /* Lxlite */
-                  'wmake lxlite | tee lxlite.log'
+                  myDebug = SetEnv('DEBUG', '')
+
+                  'wmake -a lxlite | tee lxlite.log'
+
+                  call SetEnv 'DEBUG', myDebug
                   prev_user_choice = user_choice
                end
@@ -347 +356 @@
             when user_choice = mainmenu.Build_WPI_file_num then
                do /* Build distro */
+                  myWarnall = SetEnv('WARNALL', '')
+                  myFortify = SetEnv('FORTIFY', '')
+                  myDebug   = SetEnv('DEBUG', '')
+
                   call ExecCmd 'wmake dist | tee dist.log'
+
+                  call SetEnv 'WARNALL', myWarnall
+                  call SetEnv 'FORTIFY', myFortify
+                  call SetEnv 'DEBUG', myDebug
                   prev_user_choice = user_choice
                end
@@ -2462 +2479 @@
 return
 
+GetEnv: procedure expose (globals)
+   parse arg varname
+return value(varname,, 'OS2ENVIRONMENT')
+
+SetEnv: procedure expose (globals)
+   parse arg varname, varvalue
+   oldvarvalue = GetEnv(varname)
+   call value varname, varvalue, 'OS2ENVIRONMENT'
+return oldvarvalue
+
 /* JBS: Disabled internal CFG code:
 Configuration: procedure expose (globals)