You need to resolve the changes to build.xml and send again.
On 8/20/10 3:34 PM, Henry Minsky wrote:
svn updated, resolved conflict with stale file Change 20100817-hqm-8 by [email protected] on 2010-08-17 11:46:24 EDT in /Users/hqm/openlaszlo/trunk-clean for http://svn.openlaszlo.org/openlaszlo/trunk Summary: add unified 'lzoptions' support New Features: Bugs Fixed: LPP-3479 Technical Reviewer: ptw QA Reviewer: max Doc Reviewer: (pending) Documentation: Release Notes: Overview: + Added "flexversion" compiler option to select between flash 10.0 and 10.1 + Added support for passing compiler options in unified "lzoptions" string + modified "lzc" command line interpreter to accept 'flexversion' arg Details: WEB-INF/lps/lfc/kernel/swf/LzBrowserKernel.lzs WEB-INF/lps/lfc/kernel/swf9/LzBrowserKernel.lzs getInitArg() looks for arg in lzoptions value, if present, and prefer that value over regular query args WEB-INF/lps/lfc/kernel/LzKernelUtils.lzs Added routine to parse lzoptions string WEB-INF/lps/lfc/debugger/platform/swf/LzDebug.as WEB-INF/lps/lfc/debugger/platform/swf9/LzDebug.as checks for the presence of 'lzconsoledebug' using getInitArg, so that it can see if the value is in lzoptions WEB-INF/lps/config/lps.properties add default value for flex version = 10.0 WEB-INF/lps/server/src/org/openlaszlo/utils/LZHttpUtils.java for back compatibility treat "runtime" as a synonym for "lzr" in lzoptions WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java pass "flex_version" option to flex compiler (targets 10.0 vs 10.1) WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java Add "flexversion" constant WEB-INF/lps/server/src/org/openlaszlo/server/LPS.java add method to return default value for flex version WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java use accessor LZHttpUtils.getLzOption to get arg values instead of request.getParameter WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderAPP_CONSOLE.java formats the lzoptions values into the XML data format used by the dev-console.lzx app WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java WEB-INF/lps/server/src/org/openlaszlo/compiler/SWF9Writer.java add support for 'flex version' arg lps/includes/source/embednew.js lps/includes/source/build.xml add parser for lzoptions string lps/admin/dev-console.lzx generate a URL string for the app being loaded that encodes args into lzoptions format + I did not modify "lzc" command line processor to accept the new lzoptions format yet. It still requires the old style discrete flags. Tests: smokecheck in swf10 test/lfc/data in swf10 TLF bidi tests test/tlf/text-test.lzx?lzr=swf10 test/tlf/focus-input.lzx?lzr=swf10 fetching test/hello.lzx using lzoptions http://127.0.0.1:8080/trunk-clean/test/hello.lzx?lzoptions=lzr(swf10),flexversion(10.1) http://127.0.0.1:8080/trunk3/test/hello.lzx?lzoptions=runtime(swf8),debug http://127.0.0.1:8080/trunk3/test/hello.lzx?lzoptions=runtime(dhtml),debug,lzbacktrace verify that dev-console displays correct button and checkbox settings for the selected options (e.g., runtime and debug/backtrace flags, remote console debug) confirm by inspection of as files in compiler apache temp build directory 'lzswf9', that flex compiler is getting passed the arg "-target-player=10.1": /openlaszlo/lib/apache-tomcat-5.5.29/temp/lzswf9/Users/hqm/openlaszlo/trunk-clean/test/build/hello/build.sh Files: M WEB-INF/lps/lfc/kernel/swf/LzBrowserKernel.lzs M WEB-INF/lps/lfc/kernel/swf9/LzBrowserKernel.lzs M WEB-INF/lps/lfc/kernel/LzKernelUtils.lzs M WEB-INF/lps/lfc/debugger/platform/swf/LzDebug.as M WEB-INF/lps/lfc/debugger/platform/swf9/LzDebug.as M WEB-INF/lps/config/lps.properties M WEB-INF/lps/server/src/org/openlaszlo/utils/LZHttpUtils.java M WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java M WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java M WEB-INF/lps/server/src/org/openlaszlo/server/LPS.java M WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderCompile.java M WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderAPP_CONSOLE.java M WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderOBJECT.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/SWF9Writer.java M lps/includes/source/embednew.js M lps/includes/source/build.xml M lps/admin/dev-console.lzx.swf M lps/admin/dev-console.lzx M lps/admin/lps/includes/lfc/LFCdhtml.js M lps/admin/dev-console.lzx.js Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20100817-hqm-8.tar
-- Regards, Max Carlson OpenLaszlo.org
