[Dev] Re: [commits] (stearns) [8978] To allow RunChandler & RunPython to be used with --wing (which requires not using python optimization, -O) in release runs,

Tue, 10 Jan 2006 08:39:41 -0800

Title: [commits] (stearns) [8978] To allow RunChandler & RunPython to be used with --wing (which requires not using python optimization, -O) in release runs,
(doh - I didn't mention in my commit message that this was for bug 4951, "RunChandler & RunPython should optionally exclude -O". Lo siento. ...Bryan)

[email protected] wrote:
Revision
8978
Author
stearns
Date
2006-01-10 08:37:53 -0800 (Tue, 10 Jan 2006)

Log Message

To allow RunChandler & RunPython to be used with --wing (which requires not using python optimization, -O) in release runs,

- Recognize a new environment variable, CHANDLERNOOPTIMIZE, that if non-empty will cause -O to not be used.
- Only add -O in the release command lines that run python (which means: I've removed it from the RunChandler scripts that run python by invoking RunPython; only Windows' RunChandler runs python directly, so it's the only RunChandler that does any "-O"-ness. This fixes situations where -O was getting added twice.

r=bear.

Modified Paths

Diff

Modified: trunk/internal/launchers/scripts/RunChandler.release.linux (8977 => 8978)

--- trunk/internal/launchers/scripts/RunChandler.release.linux	2006-01-10 11:57:56 UTC (rev 8977)
+++ trunk/internal/launchers/scripts/RunChandler.release.linux	2006-01-10 16:37:53 UTC (rev 8978)
@@ -10,4 +10,4 @@
     CHANDLERBIN=$CHANDLERHOME
 fi
 
-$CHANDLERBIN/release/RunPython -O $CHANDLERHOME/Chandler.py "$@"
+$CHANDLERBIN/release/RunPython $CHANDLERHOME/Chandler.py "$@"

Modified: trunk/internal/launchers/scripts/RunChandler.release.macosx (8977 => 8978)

--- trunk/internal/launchers/scripts/RunChandler.release.macosx	2006-01-10 11:57:56 UTC (rev 8977)
+++ trunk/internal/launchers/scripts/RunChandler.release.macosx	2006-01-10 16:37:53 UTC (rev 8978)
@@ -10,4 +10,4 @@
     CHANDLERBIN=$CHANDLERHOME
 fi
 
-$CHANDLERBIN/release/RunPython -O $CHANDLERHOME/Chandler.py "$@"
+$CHANDLERBIN/release/RunPython $CHANDLERHOME/Chandler.py "$@"

Modified: trunk/internal/launchers/scripts/RunChandler.release.windows (8977 => 8978)

--- trunk/internal/launchers/scripts/RunChandler.release.windows	2006-01-10 11:57:56 UTC (rev 8977)
+++ trunk/internal/launchers/scripts/RunChandler.release.windows	2006-01-10 16:37:53 UTC (rev 8978)
@@ -2,8 +2,9 @@
 setlocal
 if "%CHANDLERHOME%"=="" set CHANDLERHOME=.
 if "%CHANDLERBIN%"=="" set CHANDLERBIN=%CHANDLERHOME%
+if "%CHANDLERNOOPTIMIZE%"=="" set OPTIMIZE=-O
 echo CHANDLERHOME is %CHANDLERHOME%
 echo CHANDLERBIN is %CHANDLERBIN%
 path %CHANDLERBIN%\release\bin
-"%CHANDLERBIN%\release\bin\python.exe" -O "%CHANDLERHOME%\Chandler.py" %*
+"%CHANDLERBIN%\release\bin\python.exe" %OPTIMIZE% "%CHANDLERHOME%\Chandler.py" %*
 endlocal

Modified: trunk/internal/launchers/scripts/RunPython.release.linux (8977 => 8978)

--- trunk/internal/launchers/scripts/RunPython.release.linux	2006-01-10 11:57:56 UTC (rev 8977)
+++ trunk/internal/launchers/scripts/RunPython.release.linux	2006-01-10 16:37:53 UTC (rev 8978)
@@ -10,6 +10,11 @@
     export CHANDLERBIN=$CHANDLERHOME
 fi
 
+if [ "$CHANDLERNOOPTIMIZE" = "" ]
+then
+    OPTIMIZE=-O
+fi
+
 if [ -d $CHANDLERHOME -a -f $CHANDLERBIN/release/bin/python ]
 then
     echo "Using $CHANDLERBIN/release/bin/python"
@@ -33,4 +38,4 @@
     export PYTHONPATH=$PYTHONPATH:$PARCELPATH
 fi
 
-$CHANDLERBIN/release/bin/python -O "$@"
+$CHANDLERBIN/release/bin/python $OPTIMIZE "$@"

Modified: trunk/internal/launchers/scripts/RunPython.release.macosx (8977 => 8978)

--- trunk/internal/launchers/scripts/RunPython.release.macosx	2006-01-10 11:57:56 UTC (rev 8977)
+++ trunk/internal/launchers/scripts/RunPython.release.macosx	2006-01-10 16:37:53 UTC (rev 8978)
@@ -15,6 +15,11 @@
     PYTHON_VER=2.4
 fi
 
+if [ "$CHANDLERNOOPTIMIZE" = "" ]
+then
+    OPTIMIZE=-O
+fi
+
 if [ -f $CHANDLERBIN/release/Library/Frameworks/Python.framework/Versions/$PYTHON_VER/Resources/Python.app/Contents/MacOS/Python ]
 then
     export PYTHONHOME=$CHANDLERBIN/release/Library/Frameworks/Python.framework/Versions/$PYTHON_VER
@@ -50,5 +55,5 @@
     echo -O $@
     exec gdb $PYTHONBIN
 else
-    exec $PYTHONBIN -O "$@"
+    exec $PYTHONBIN $OPTIMIZE "$@"
 fi

Modified: trunk/internal/launchers/scripts/RunPython.release.windows (8977 => 8978)

--- trunk/internal/launchers/scripts/RunPython.release.windows	2006-01-10 11:57:56 UTC (rev 8977)
+++ trunk/internal/launchers/scripts/RunPython.release.windows	2006-01-10 16:37:53 UTC (rev 8978)
@@ -2,10 +2,11 @@
 setlocal
 if "%CHANDLERHOME%"=="" set CHANDLERHOME=.
 if "%CHANDLERBIN%"=="" set CHANDLERBIN=%CHANDLERHOME%
+if "%CHANDLERNOOPTIMIZE%"=="" set OPTIMIZE=-O
 echo CHANDLERHOME is %CHANDLERHOME%
 echo CHANDLERBIN is %CHANDLERBIN%
 path %CHANDLERBIN%\release\bin
 set PYTHONPATH=%CHANDLERHOME%;%CHANDLERHOME%\parcels
 if not "%PARCELPATH%"=="" set PYTHONPATH=%PYTHONPATH%;%PARCELPATH%
-"%CHANDLERBIN%\release\bin\python.exe" -O %*
+"%CHANDLERBIN%\release\bin\python.exe" %OPTIMIZE% %*
 endlocal

  

_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits
  




_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

Open Source Applications Foundation "Dev" mailing list
http://lists.osafoundation.org/mailman/listinfo/dev

Reply via email to