[Laszlo-checkins] r8479 - openlaszlo/trunk/WEB-INF/lps/lfc

[dda@openlaszlo.org]

Author: dda
Date: 2008-03-30 17:36:33 -0700 (Sun, 30 Mar 2008)
New Revision: 8479

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/build.xml
Log:
Change 20080328-dda-x by dda at lester.local on 2008-03-28 15:59:39 EDT
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-a
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Issue a warning when building the LFC and FLEX_HOME is not set

New Features:

Bugs Fixed: LPP-5683

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

Documentation:

Release Notes:

Details:
    Fixed in build.xml file.
    Needed to enable environment variables in the build file.

Tests:
    built LFCs with FLEX_HOME set,
    built LFCs without FLEX_HOME set.
      (unix only)

    needs to be tried on Windows!



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/build.xml
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/build.xml	2008-03-30 22:29:09 UTC (rev 8478)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/build.xml	2008-03-31 00:36:33 UTC (rev 8479)
@@ -17,6 +17,8 @@
 
   &build_opt;
 
+  <property environment="env" />
+
   <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"/>
 
   <!-- Local locations for public DTDs, so that the build doesn't
@@ -61,6 +63,8 @@
   
     <property name="sc.dir"     value="${server.dir}/sc" />
 
+    <property name="env.FLEX_HOME"  value="" />
+
     <!-- Whether the preloader is up to date -->
     <uptodate property="preloader.uptodate" >
       <srcfiles dir="." includes="**/*" excludes="*.lzl" />
@@ -217,6 +221,16 @@
 
       // Check whether the options tell us to build this runtime at all
       var buildThisRuntime = lfc.getProperty("build.lfc.runtime.swf" + v);
+
+      // If FLEX_HOME is not set, just issue a warning, but do not build SWF9
+      if (v == 9) {
+         if (lfc.getProperty("env.FLEX_HOME") == "") {
+             var echo = lfc.createTask("echo");
+             echo.setMessage("WARNING: $FLEX_HOME is not set, skipping build of SWF9 libraries");
+             echo.execute();
+             buildThisRuntime = null;
+         }
+      }
       if (buildThisRuntime != null) {
         var plain = LFCdir + "LFC" + v + ext;
         if (!(new File(plain)).exists()) {