Author: dda
Date: 2008-01-18 16:22:18 -0800 (Fri, 18 Jan 2008)
New Revision: 7858
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/config/lps.properties
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
Log:
Change 20080118-dda-h by [EMAIL PROTECTED] on 2008-01-18 19:16:20 EST
in /Users/dda/laszlo/src/svn/openlaszlo/branches/devildog/WEB-INF/lps/config
for
http://svn.openlaszlo.org/openlaszlo/branches/devildog/WEB-INF/lps/config
Summary: SWF9: Addendum to last commit: Fix calls to mxmlc.
New Features:
Bugs Fixed: LPP-5234
Technical Reviewer: ptw (pending)
QA Reviewer: hminsky (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
The previous commit was flawed - we do have to call mxmlc to build
and app after all. With this commit, Henry's hello app works using
both the flex 2.x and 3.0.0 beta sdks.
Tests:
test/swf9/hello.zx
Modified: openlaszlo/branches/devildog/WEB-INF/lps/config/lps.properties
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/config/lps.properties
2008-01-19 00:21:38 UTC (rev 7857)
+++ openlaszlo/branches/devildog/WEB-INF/lps/config/lps.properties
2008-01-19 00:22:18 UTC (rev 7858)
@@ -164,7 +164,7 @@
# Where the SWF9 external library compiler lives (relative to HOME, or
absolute)
compiler.swf9.lib.builder=../../flex2/bin/compc
# Where the SWF9 external application compiler lives (relative to HOME, or
absolute)
-compiler.swf9.app.builder=../../flex2/bin/compc
+compiler.swf9.app.builder=../../flex2/bin/mxmlc
# Tell extern compiler to issue warnings.
compiler.swf9.warnings=false
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
===================================================================
---
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
2008-01-19 00:21:38 UTC (rev 7857)
+++
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
2008-01-19 00:22:18 UTC (rev 7858)
@@ -814,24 +814,39 @@
List cmd = new ArrayList();
cmd.add(builderCmd);
- if (!swf9Warnings)
+ if (!swf9Warnings) {
cmd.add("-compiler.show-actionscript-warnings=false");
+ }
+
+ cmd.add("-compiler.source-path+=.");
+ if (USE_COMPILER_DEBUG_FLAG) {
+ cmd.add("-debug=true");
+ }
+ cmd.add("-output");
+ cmd.add(outfilebase);
+
if (!buildSharedLibrary) {
cmd.add("-default-size");
cmd.add(options.get(Compiler.CANVAS_WIDTH, "800"));
cmd.add(options.get(Compiler.CANVAS_HEIGHT));
cmd.add("-library-path+=" + getLFCLibrary());
}
- cmd.add("-compiler.source-path+=.");
- if (USE_COMPILER_DEBUG_FLAG)
- cmd.add("-debug=true");
- cmd.add("-output");
- cmd.add(outfilebase);
- cmd.add("-include-classes");
+ else {
+ // must be last before list of classes to follow.
+ cmd.add("-include-classes");
+ }
+
for (Iterator iter = tunits.iterator(); iter.hasNext(); ) {
TranslationUnit tunit = (TranslationUnit)iter.next();
- // The application main is built in a final step after this.
- if (buildSharedLibrary || tunit.isMainTranslationUnit()) {
+
+ // For the application, we just list the main .as file
+ // For a library, we list all the classes.
+ if (!buildSharedLibrary) {
+ if (tunit.isMainTranslationUnit()) {
+ cmd.add(tunit.getName()+".as");
+ }
+ }
+ else {
cmd.add(tunit.getName());
}
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
