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

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-07-15 07:22:44 -0700 (Tue, 15 Jul 2008)
New Revision: 10365

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java
Log:
Change 20080714-hqm-I by hqm at badtzmaru.home on 2008-07-14 23:21:04 EDT
    in /Users/hqm/openlaszlo/trunk4
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary:  make flex compiler debug flag follow laszlo compiler debug flag when compiling swf9

New Features:

Bugs Fixed:

Technical Reviewer: ptw
QA Reviewer: pbr
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:

+ set a flag to say whether to assert  the flex compiler debug flag.
  For swf9, all other debugging is disabled in the script compiler, since it
  just causes compilation errors and we don't need it when we use the flex debug flag.

Tests:



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	2008-07-15 14:04:57 UTC (rev 10364)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	2008-07-15 14:22:44 UTC (rev 10365)
@@ -265,6 +265,7 @@
 
     // Disable debug compilation for swf9
     if ("swf9".equals((String)options.get(RUNTIME))) {
+      options.putBoolean(DEBUG_SWF9, options.getBoolean(DEBUG));
       options.putBoolean(DEBUG, false);
       options.putBoolean(DEBUG_BACKTRACE, false);
     }
@@ -454,6 +455,7 @@
   public static String CONSTRAINT_FUNCTION = "constraintFunction";
   public static String DEBUG = "debug";
   public static String DEBUG_BACKTRACE = "debugBacktrace";
+  public static String DEBUG_SWF9 = "debugSWF9";
   public static String DEBUG_SIMPLE = "debugSimple";
   public static String DEBUG_EVAL = "debugEval";
   public static String DUMP_AST_INPUT = "dumpASTInput";

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-07-15 14:04:57 UTC (rev 10364)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java	2008-07-15 14:22:44 UTC (rev 10365)
@@ -35,13 +35,7 @@
   /** Number of errors shown before truncating */
   static public final int MAX_ERRORS_SHOWN = 50;
 
-  // TODO: [2007-12-12 dda] make USE_COMPILER_DEBUG_FLAG a compiler option.
   /**
-   * When set, use the debug flag for the compiler
-   */
-  public static final boolean USE_COMPILER_DEBUG_FLAG = true;
-
-  /**
    * A directory we create under the Java runtime's temp dir,
    * that contains our compilation work directories, one for each compilation.
    */
@@ -609,9 +603,9 @@
     if (!swf9Warnings) {
       cmd.add("-compiler.show-actionscript-warnings=false");
     }
-    
+
     cmd.add("-compiler.source-path+=" + workdir.getPath());
-    if (USE_COMPILER_DEBUG_FLAG) {
+    if (options.getBoolean(Compiler.DEBUG_SWF9)) {
       cmd.add("-debug=true");
     }
     cmd.add("-output");