[Laszlo-checkins] r10879 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-09-04 17:38:35 -0700 (Thu, 04 Sep 2008)
New Revision: 10879

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java
Log:
Change 20080904-hqm-i by hqm at badtzmaru.home on 2008-09-04 20:37:16 EDT
    in /Users/hqm/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: small fixup in call to flex compiler

New Features:

Bugs Fixed:

Technical Reviewer: dda
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:

make sure to print out the proper command string for the developer if they want to run
the flex compiler manually    

Tests:

compile lzpix from lps server for swf9
compile lzpix from lzc command line script for swf9



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java	2008-09-04 23:21:32 UTC (rev 10878)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java	2008-09-05 00:38:35 UTC (rev 10879)
@@ -455,6 +455,7 @@
                                  String outfileName)
     throws IOException          // TODO: [2007-11-20 dda] clean up, why catch only some exceptions?
   {
+    String compilerClass = (String) cmd.remove(0);
     String[] cmdstr = (String[])cmd.toArray(new String[0]);
     String prettycmd = prettyCommand(cmd);
     System.err.println("Executing compiler: (cd " + dir + "; " + prettycmd + ")");
@@ -594,6 +595,9 @@
     String buildfn = isWindows() ? "build.bat" : "build.sh";
     Compiler.emitFile(workDirectoryName(buildfn), buildsh);
 
+    // Remove the shell script executable path from beginning of cmd arg list
+    cmd.remove(0);
+
     // Save original System.err, System.out
     PrintStream sout = System.out;
     PrintStream serr = System.err;
@@ -792,14 +796,12 @@
     if (buildSharedLibrary) {
       outfilebase = "app.swc";
       cmd.add("compc");
-      // cmd.add(getFlexPathname("bin" + File.separator + "compc" + exeSuffix));
-
+      cmd.add(getFlexPathname("bin" + File.separator + "compc" + exeSuffix));
     }
     else {
       outfilebase = "app.swf";
       cmd.add("mxmlc");
-      // cmd.add(getFlexPathname("bin" + File.separator + "mxmlc" + exeSuffix));
-
+      cmd.add(getFlexPathname("bin" + File.separator + "mxmlc" + exeSuffix));
     }
 
     // Path to the flex compiler config file