[Laszlo-checkins] r13164 - in openlaszlo/branches/4.2: . WEB-INF/lps/config WEB-INF/lps/server/src/org/openlaszlo/compiler
ptw@openlaszlo.org
ptw at openlaszlo.org
Wed Mar 4 13:27:23 PST 2009
Author: ptw
Date: 2009-03-04 13:27:18 -0800 (Wed, 04 Mar 2009)
New Revision: 13164
Modified:
openlaszlo/branches/4.2/
openlaszlo/branches/4.2/WEB-INF/lps/config/lps.properties
openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java
Log:
Merged revisions 13158 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r13158 | hqm | 2009-03-04 13:14:19 -0500 (Wed, 04 Mar 2009) | 45 lines
Change 20090304-hqm-l by hqm at badtzmaru.home on 2009-03-04 11:28:03 EST
in /Users/hqm/openlaszlo/trunk6
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: make script cache persistent by default when running lzc
New Features:
Bugs Fixed: LPP-7699
Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
+ script cache is persisted by default when compiling via lzc (compiler/Main.java)
+ removed --keepscriptcache, as it is redundant with --flush-script-cache
+ option boolean arg supported for --flush-script-cache[=true|false]
+ default behavior can be set in lps.properties: compiler.scache.persist=true|false
+ the script cache is (still) unconditionally persisted when compiling via the LPS server
Tests:
compile an an app from command line , timing the execution of the compiler
time lzc demos/calendar/calendar.lzx
then compile again and see if time is significantly less, due to caching in script compiler
then repeat with --flush-script-cache, and see if time goes up to the first compile time
time lzc --flush-script-cache demos/calendar/calendar.lzx
.......
Property changes on: openlaszlo/branches/4.2
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12340-12348,12352,12354-12358,12360-12361,12363,12365-12367,12369-12371,12375-12378,12380-12389,12391,12394-12396,12399-12400,12402-12403,12406-12416,12419-12422,12424-12429,12431-12433,12435,12437-12441,12443,12445,12447,12449-12451,12453-12454,12457-12460,12464,12466-12475,12477-12480,12482-12490,12493-12495,12499-12502,12507-12510,12512,12514-12520,12522,12525-12531,12534-12540,12542,12545,12548-12554,12557-12561,12564,12566-12568,12571,12574-12576,12578,12580,12583-12584,12586-12587,12589,12592-12596,12598-12600,12602-12609,12611-12615,12617,12619-12621,12623,12625,12628-12631,12633-12635,12637,12639,12642,12644,12647-12653,12656,12658,12660,12662-12666,12668-12694,12696,12698-12704,12708-12710,12712-12721,12723-12729,12731-12742,12745-12752,12754-12784,12786-12791,12793-12798,12800-12801,12803,12805-12808,12810-12812,12814,12816-12821,12825-12833,12835-12837,12839-12841,12847,12849-12850,12852-12859,12863-12883,12885-12895,12897-12906,12908-12915,12917-12922,12924-12934,12937-12940,12943-12944,12946-12947,12950-12952,12955-12964,12966-12969,12971,12973-12977,12979-12993,12997-12999,13001-13003,13006-13007,13010-13015,13017-13020,13022-13024,13026-13031,13033,13035-13037,13039-13040,13043,13046-13052,13055-13060,13062-13069,13071-13072,13074,13076-13085,13087-13093,13095-13101,13103-13104,13106,13108-13110,13112,13114-13120,13122,13125-13126,13129,13132-13136,13139-13140,13142,13157
+ /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12340-12348,12352,12354-12358,12360-12361,12363,12365-12367,12369-12371,12375-12378,12380-12389,12391,12394-12396,12399-12400,12402-12403,12406-12416,12419-12422,12424-12429,12431-12433,12435,12437-12441,12443,12445,12447,12449-12451,12453-12454,12457-12460,12464,12466-12475,12477-12480,12482-12490,12493-12495,12499-12502,12507-12510,12512,12514-12520,12522,12525-12531,12534-12540,12542,12545,12548-12554,12557-12561,12564,12566-12568,12571,12574-12576,12578,12580,12583-12584,12586-12587,12589,12592-12596,12598-12600,12602-12609,12611-12615,12617,12619-12621,12623,12625,12628-12631,12633-12635,12637,12639,12642,12644,12647-12653,12656,12658,12660,12662-12666,12668-12694,12696,12698-12704,12708-12710,12712-12721,12723-12729,12731-12742,12745-12752,12754-12784,12786-12791,12793-12798,12800-12801,12803,12805-12808,12810-12812,12814,12816-12821,12825-12833,12835-12837,12839-12841,12847,12849-12850,12852-12859,12863-12883,12885-12895,12897-12906,12908-12915,12917-12922,12924-12934,12937-12940,12943-12944,12946-12947,12950-12952,12955-12964,12966-12969,12971,12973-12977,12979-12993,12997-12999,13001-13003,13006-13007,13010-13015,13017-13020,13022-13024,13026-13031,13033,13035-13037,13039-13040,13043,13046-13052,13055-13060,13062-13069,13071-13072,13074,13076-13085,13087-13093,13095-13101,13103-13104,13106,13108-13110,13112,13114-13120,13122,13125-13126,13129,13132-13136,13139-13140,13142,13157-13158
Modified: openlaszlo/branches/4.2/WEB-INF/lps/config/lps.properties
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/config/lps.properties 2009-03-04 21:01:04 UTC (rev 13163)
+++ openlaszlo/branches/4.2/WEB-INF/lps/config/lps.properties 2009-03-04 21:27:18 UTC (rev 13164)
@@ -168,6 +168,8 @@
#compiler.swf9.catcherrors=true
# Use the incremental compilation feature of swf9 compiler (experimental)
compiler.swf9.incremental=false
+# If true, the script cache persists across invocations of the command line compiler
+compiler.scache.persist=true
#===============================================================================
# i18n locale parameter
Modified: openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java 2009-03-04 21:01:04 UTC (rev 13163)
+++ openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java 2009-03-04 21:27:18 UTC (rev 13164)
@@ -33,8 +33,8 @@
" Action to take on compilation errors. Defaults to warn.",
"--help",
" Prints this message.",
- "--flush-script-cache",
- " Doesn't flush script cache before compiling.",
+ "--flush-script-cache[=true|false]",
+ " Flush script cache before compiling, boolean value optional. System default can be set in lps.properties ",
"--script-cache-dir directory",
" Location of script cache directory (default <lps>/work/scache)",
"--media-cache-dir directory",
@@ -123,7 +123,7 @@
compiler.setProperty(CompilationEnvironment.RUNTIME_PROPERTY,
LPS.getProperty("compiler.runtime.default",
LPS.getRuntimeDefault()));
- boolean flushScriptCache = true;
+ boolean flushScriptCache = "false".equals(LPS.getProperty("compiler.scache.persist", "true"));
Boolean forceTransCode = null;
String outFileArg = null;
boolean saveScriptOption = false;
@@ -147,11 +147,13 @@
LPS.setHome(lhome);
} else if (arg == "--schema") {
compiler.SchemaLogger.setLevel(Level.ALL);
- } else if (arg == "--keepscriptcache") {
- flushScriptCache = false;
- System.err.println("--keepscriptcache is deprecated. This is now the default behavior.");
} else if (arg == "--flush-script-cache") {
flushScriptCache = true;
+ } else if (arg.startsWith("--flush-script-cache=")) {
+ String value = arg.substring("--flush-script-cache=".length());
+ flushScriptCache = "true".equals(value);
+ } else if (arg == "--copy-resources") {
+ compiler.setProperty(CompilationEnvironment.COPY_RESOURCES_LOCAL, "true");
} else if (arg == "-o" || arg == "--output") {
outFileArg = safeArg("-o or --output", args, ++i);
if (outFileArg == null) {
@@ -431,7 +433,7 @@
}
/**
- * @copyright Copyright 2001-2008 Laszlo Systems, Inc. All Rights
+ * @copyright Copyright 2001-2009 Laszlo Systems, Inc. All Rights
* Reserved. Use is subject to license terms.
*/
More information about the Laszlo-checkins
mailing list