[Laszlo-checkins] r11855 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-11-21 13:20:43 -0800 (Fri, 21 Nov 2008)
New Revision: 11855

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ToplevelCompiler.java
Log:
Change 20081121-hqm-x by hqm at badtzmaru.home on 2008-11-21 12:36:01 EST
    in /Users/hqm/openlaszlo/trunk4
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: don't include the lps/components/debugger window library if app has remote debugging enabled

New Features:

Bugs Fixed: LPP-7631

Technical Reviewer: ptw 
QA Reviewer: promanik
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    
+ If lzconsoledebug is enabled, do not auto-include the components debugger window library


Tests:

compile test/hello.lzx?lzconsoledebug=true 
connect to app via debug console, and see that
  +  lz.LzDebugWindow is undefined



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ToplevelCompiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ToplevelCompiler.java	2008-11-21 20:03:58 UTC (rev 11854)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ToplevelCompiler.java	2008-11-21 21:20:43 UTC (rev 11855)
@@ -238,8 +238,9 @@
             }
         }
         
-        // add the debugger, if canvas debug=true
-        if (env.getBooleanProperty(env.DEBUG_PROPERTY)) {
+        // If canvas debug=true, and we're not running a remote
+        // debugger, add the debugger-window component library
+        if (includesDebuggerWindow(env)) {
             if (explanations != null) {
                 explanations.put("debugger", "the canvas debug attribute is true");
             }
@@ -251,6 +252,17 @@
         return libraries;
     }
     
+    /** Decide whether to include the application GUI debugger component.
+     *
+     * Include the debugger window if debug=true no remote-debugging
+     * modes are enabled
+     */
+    static boolean includesDebuggerWindow(CompilationEnvironment env) {
+        return (env.getBooleanProperty(env.DEBUG_PROPERTY) &&
+                !env.getBooleanProperty(env.CONSOLEDEBUG_PROPERTY) &&
+                !env.getBooleanProperty(env.REMOTEDEBUG_PROPERTY));
+    }
+
     static List getLibraries(CompilationEnvironment env, Element element, Map explanations, Set autoIncluded, Set visited) {
         Map externalMap = null;
         Map visitedMap = null;