Author: ptw
Date: 2007-07-12 13:22:15 -0700 (Thu, 12 Jul 2007)
New Revision: 5655
Modified:
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/LibraryWriter.java
openlaszlo/branches/legals/test/smoke/lztext.lzl
Log:
Change 20070712-ptw-B by [EMAIL PROTECTED] on 2007-07-12 15:43:05 EDT
in /Users/ptw/OpenLaszlo/legals
for http://svn.openlaszlo.org/openlaszlo/branches/legals
Summary: Fix mis-merge in binary library compilation
Bugs Fixed:
LPP-4282 ' lzc -c gives null pointer error'
Technical Reviewer: hminsky (Message-ID: <[EMAIL PROTECTED]>)
QA Reviewer: frisco (pending)
Details:
Somehow the initialization of the document root in the
LibraryWriter got dropped in the integration from trunk. Put that
back.
Make lztext.lzl a well-formed library (by listing the includes it
depends on).
Tests:
lzc -c of any library file, e.g., smoke/lztext.lxl
Modified:
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
===================================================================
---
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
2007-07-12 19:48:52 UTC (rev 5654)
+++
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
2007-07-12 20:22:15 UTC (rev 5655)
@@ -208,9 +208,9 @@
}
}
- ObjectWriter createObjectWriter(Properties props, OutputStream ostr,
CompilationEnvironment env) {
+ ObjectWriter createObjectWriter(Properties props, OutputStream ostr,
CompilationEnvironment env, Element root) {
if ("false".equals(props.getProperty(env.LINK_PROPERTY))) {
- return new LibraryWriter(props, ostr, mMediaCache, true, env);
+ return new LibraryWriter(props, ostr, mMediaCache, true, env, root);
}
String runtime = props.getProperty(env.RUNTIME_PROPERTY);
@@ -409,7 +409,7 @@
// better way to ensure that the LFC's constants values match the
app code's.
nprops.put("compileTimeConstants", compileTimeConstants);
- ObjectWriter writer = createObjectWriter(nprops, ostr, env);
+ ObjectWriter writer = createObjectWriter(nprops, ostr, env, root);
env.setObjectWriter(writer);
Modified:
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/LibraryWriter.java
===================================================================
---
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/LibraryWriter.java
2007-07-12 19:48:52 UTC (rev 5654)
+++
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/LibraryWriter.java
2007-07-12 20:22:15 UTC (rev 5655)
@@ -32,7 +32,8 @@
LibraryWriter(Properties props, OutputStream stream,
CompilerMediaCache cache,
boolean importLibrary,
- CompilationEnvironment env) {
+ CompilationEnvironment env,
+ Element root) {
super(props, stream, cache, importLibrary, env);
try {
@@ -40,6 +41,7 @@
} catch (Exception e) {
throw new ChainedException(e);
}
+ this.root = root;
}
Modified: openlaszlo/branches/legals/test/smoke/lztext.lzl
===================================================================
--- openlaszlo/branches/legals/test/smoke/lztext.lzl 2007-07-12 19:48:52 UTC
(rev 5654)
+++ openlaszlo/branches/legals/test/smoke/lztext.lzl 2007-07-12 20:22:15 UTC
(rev 5655)
@@ -3,6 +3,7 @@
* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
+ <include href="lzunit" />
<class name="LzTextTest" extends="TestCase">
<method name="setUp">
<![CDATA[
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
