[Laszlo-checkins] r11713 - in openlaszlo/trunk: WEB-INF/lps/server/src/org/openlaszlo/cm WEB-INF/lps/server/src/org/openlaszlo/compiler WEB-INF/lps/server/src/org/openlaszlo/servlets/responders lps/includes/source
dda@openlaszlo.org
dda at openlaszlo.org
Sat Nov 8 13:40:50 PST 2008
Author: dda
Date: 2008-11-08 13:40:45 -0800 (Sat, 08 Nov 2008)
New Revision: 11713
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/cm/CompilationManager.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java
openlaszlo/trunk/lps/includes/source/embednew.js
Log:
Change 20081027-dda-A by dda at lester.local on 2008-10-27 15:50:29 EDT
in /Users/dda/laszlo/src/svn/openlaszlo/trunk-a
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Add source locators, etc. when 'hdebug' property is on
New Features:
Bugs Fixed: LPP-7242 (Added source locators when 'hdebug' property is on)
Technical Reviewer: hminsky (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
hdebug=true in a URL should trigger backtrace on, as well as source locators to be on.
This patch originally came from Ivar Meikas, and has been cleaned up some, especially in that it does not
unconditionally set the backtrace/sourcelocator/nameFunction/trackLines variables.
Tests:
Functionality tested by Ivar
Regression tests: (smokecheck+weather+lzpix) x (dhtml,swf8,swf9)
Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/cm/CompilationManager.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/cm/CompilationManager.java 2008-11-08 18:42:14 UTC (rev 11712)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/cm/CompilationManager.java 2008-11-08 21:40:45 UTC (rev 11713)
@@ -665,6 +665,19 @@
getProperties().getProperty(key));
}
}
+
+ String property = compilationProperties
+ .getProperty(CompilationEnvironment.TRACK_LINES);
+ if (property != null) {
+ compiler.setProperty(CompilationEnvironment.TRACK_LINES, property);
+ }
+
+ property = compilationProperties
+ .getProperty(CompilationEnvironment.NAME_FUNCTIONS);
+ if (property != null) {
+ compiler.setProperty(CompilationEnvironment.NAME_FUNCTIONS, property);
+ }
+
DependencyTracker dependencyTracker =
new DependencyTracker(compilationProperties);
TrackingFileResolver resolver =
Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java 2008-11-08 18:42:14 UTC (rev 11712)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java 2008-11-08 21:40:45 UTC (rev 11713)
@@ -34,9 +34,12 @@
public static final String PROXIED_PROPERTY = "lzproxied";
public static final String DEBUG_PROPERTY = "debug";
public static final String DEBUG_EVAL_PROPERTY = "debugEval";
+ public static final String HDEBUG_PROPERTY = "hdebug";
- // matches the value of sc.Compiler.DEBUG_BACKTRACE
+ // matches the values of sc.Compiler.DEBUG_BACKTRACE, NAME_FUNCTIONS, etc.
public static final String BACKTRACE_PROPERTY = "debugBacktrace";
+ public static final String NAME_FUNCTIONS = "nameFunctions";
+ public static final String TRACK_LINES = "trackLines";
public static final String PROFILE_PROPERTY = "profile";
public static final String LINK_PROPERTY = "link";
Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java 2008-11-08 18:42:14 UTC (rev 11712)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java 2008-11-08 21:40:45 UTC (rev 11713)
@@ -345,6 +345,16 @@
env.setProperty(CompilationEnvironment.SOURCELOCATOR_PROPERTY, sourcelocators);
}
+ String trackLines = props.getProperty(CompilationEnvironment.TRACK_LINES);
+ if (trackLines != null) {
+ env.setProperty(CompilationEnvironment.TRACK_LINES, trackLines);
+ }
+
+ String nameFunctions = props.getProperty(CompilationEnvironment.NAME_FUNCTIONS);
+ if (nameFunctions != null) {
+ env.setProperty(CompilationEnvironment.NAME_FUNCTIONS, nameFunctions);
+ }
+
try {
mLogger.debug(
/* (non-Javadoc)
@@ -414,9 +424,10 @@
env.getBooleanProperty(CompilationEnvironment.DEBUG_PROPERTY)));
compileTimeConstants.put("$profile", new Boolean(
env.getBooleanProperty(CompilationEnvironment.PROFILE_PROPERTY)));
- compileTimeConstants.put("$backtrace", new Boolean(
- env.getBooleanProperty(CompilationEnvironment.BACKTRACE_PROPERTY)));
+ boolean backtraceValue = env.getBooleanProperty(CompilationEnvironment.BACKTRACE_PROPERTY);
+ compileTimeConstants.put("$backtrace", new Boolean(backtraceValue));
+
runtime = env.getProperty(env.RUNTIME_PROPERTY);
// Must be kept in sync with server/sc/lzsc.py main
@@ -456,6 +467,7 @@
writer.close();
Canvas canvas = env.getCanvas();
+ canvas.setBacktrace(backtraceValue);
if (!errors.isEmpty()) {
if (canvas != null) {
canvas.setCompilationWarningText(
Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java 2008-11-08 18:42:14 UTC (rev 11712)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java 2008-11-08 21:40:45 UTC (rev 11713)
@@ -474,6 +474,17 @@
props.setProperty(CompilationEnvironment.BACKTRACE_PROPERTY, backtrace);
}
+ // Look for "hdebug=true" flag
+ // This flag is a shorthand for turning on various props needed by Harpoon debugging
+ props.setProperty(CompilationEnvironment.HDEBUG_PROPERTY, "false");
+ String hdebug = req.getParameter(CompilationEnvironment.HDEBUG_PROPERTY);
+ if (hdebug != null) {
+ props.setProperty(CompilationEnvironment.HDEBUG_PROPERTY, hdebug);
+ props.setProperty(CompilationEnvironment.NAME_FUNCTIONS, hdebug);
+ props.setProperty(CompilationEnvironment.TRACK_LINES, hdebug);
+ props.setProperty(CompilationEnvironment.BACKTRACE_PROPERTY, hdebug);
+ }
+
}
// Set the 'lzproxied' default = false
Modified: openlaszlo/trunk/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/embednew.js 2008-11-08 18:42:14 UTC (rev 11712)
+++ openlaszlo/trunk/lps/includes/source/embednew.js 2008-11-08 21:40:45 UTC (rev 11713)
@@ -274,7 +274,8 @@
if (i == 'lzr' || i == 'lzt'
|| i == 'debug' || i == 'profile' || i == 'lzbacktrace' || i =='lzconsoledebug'
|| i == 'lzdebug' || i == 'lzkrank' || i == 'lzprofile'
- || i == 'fb' || i == 'sourcelocators' || i == '_canvas_debug') {
+ || i == 'fb' || i == 'sourcelocators' || i == '_canvas_debug'
+ || i == 'hdebug') {
query += i + '=' + v + '&';
}
More information about the Laszlo-checkins
mailing list