[Laszlo-checkins] r11736 - in openlaszlo/trunk: 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
Wed Nov 12 12:51:51 PST 2008
Author: dda
Date: 2008-11-12 12:51:47 -0800 (Wed, 12 Nov 2008)
New Revision: 11736
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ToplevelCompiler.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java
openlaszlo/trunk/lps/includes/source/embednew.js
Log:
Change 20081111-dda-R by dda at lester.local on 2008-11-11 16:28:01 EST
in /Users/dda/laszlo/src/svn/openlaszlo/trunk-b
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Improvements for source locators.
New Features:
Bugs Fixed: LPP-7242 (Added source locators when 'hdebug' property is on)
LPP-7312 ('hdebug' property used for harpoon debugging should be renamed)
Technical Reviewer: ptw (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Changed 'hdebug' URL option to 'lzsourceannotations'.
lzsourceannonations does not turn on backtrace, but does cause
the backtrace version of the LFC to be used.
Tests:
Regression tests: (smoke,lzpix,weather) x (swf8,swf9,dhtml)
Nexb will need to verify that functionality is correct for their needs, but I did:
- Ran http://127.0.0.1:8080/trunk-b/test/nexb715.lzx?lzsourceannotations=true&lzr=dhtml&lzt=html
and inserted some code to capture the compiled output, it looks correct.
- Verified using lzc and print stmts that -Dlzsourceannotations=true use the backtrace lfc.
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-12 20:51:05 UTC (rev 11735)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java 2008-11-12 20:51:47 UTC (rev 11736)
@@ -34,7 +34,7 @@
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";
+ public static final String SOURCE_ANNOTATIONS_PROPERTY = "lzsourceannotations";
// matches the values of sc.Compiler.DEBUG_BACKTRACE, NAME_FUNCTIONS, etc.
public static final String BACKTRACE_PROPERTY = "debugBacktrace";
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-12 20:51:05 UTC (rev 11735)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ToplevelCompiler.java 2008-11-12 20:51:47 UTC (rev 11736)
@@ -270,7 +270,8 @@
return LPS.getLFCname(env.getRuntime(),
env.getBooleanProperty(env.DEBUG_PROPERTY),
env.getBooleanProperty(env.PROFILE_PROPERTY),
- env.getBooleanProperty(env.BACKTRACE_PROPERTY));
+ env.getBooleanProperty(env.BACKTRACE_PROPERTY) ||
+ env.getBooleanProperty(env.SOURCE_ANNOTATIONS_PROPERTY));
}
static void handleAutoincludes(CompilationEnvironment env, Element element) {
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-12 20:51:05 UTC (rev 11735)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java 2008-11-12 20:51:47 UTC (rev 11736)
@@ -474,15 +474,14 @@
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);
+ // Look for "sourceannotations=true" flag
+ // This flag is a shorthand for turning on various props needed by IDE debuggers
+ props.setProperty(CompilationEnvironment.SOURCE_ANNOTATIONS_PROPERTY, "false");
+ String srcann = req.getParameter(CompilationEnvironment.SOURCE_ANNOTATIONS_PROPERTY);
+ if (srcann != null) {
+ props.setProperty(CompilationEnvironment.SOURCE_ANNOTATIONS_PROPERTY, srcann);
+ props.setProperty(CompilationEnvironment.NAME_FUNCTIONS, srcann);
+ props.setProperty(CompilationEnvironment.TRACK_LINES, srcann);
}
}
Modified: openlaszlo/trunk/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/embednew.js 2008-11-12 20:51:05 UTC (rev 11735)
+++ openlaszlo/trunk/lps/includes/source/embednew.js 2008-11-12 20:51:47 UTC (rev 11736)
@@ -275,7 +275,7 @@
|| i == 'debug' || i == 'profile' || i == 'lzbacktrace' || i =='lzconsoledebug'
|| i == 'lzdebug' || i == 'lzkrank' || i == 'lzprofile'
|| i == 'fb' || i == 'sourcelocators' || i == '_canvas_debug'
- || i == 'hdebug') {
+ || i == 'lzsourceannotations') {
query += i + '=' + v + '&';
}
More information about the Laszlo-checkins
mailing list