flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - get falcon to work with new installer
Date Thu, 16 Jan 2014 20:50:01 GMT
Updated Branches:
  refs/heads/develop c9ead9824 -> 765968e81


get falcon to work with new installer


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/765968e8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/765968e8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/765968e8

Branch: refs/heads/develop
Commit: 765968e81b0b0a83d9b327441b453c961878c798
Parents: c9ead98
Author: Alex Harui <aharui@apache.org>
Authored: Thu Jan 16 12:49:14 2014 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Jan 16 12:49:14 2014 -0800

----------------------------------------------------------------------
 apache-flex-falcon-installer-config.xml   |  94 +++++++++++++++++++++++
 apache-flex-falconjx-installer-config.xml | 101 +++++++++++++++++++++++++
 build.xml                                 |   9 +++
 installer.xml                             |  19 +++--
 4 files changed, 216 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/apache-flex-falcon-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-falcon-installer-config.xml b/apache-flex-falcon-installer-config.xml
new file mode 100644
index 0000000..0f88fa6
--- /dev/null
+++ b/apache-flex-falcon-installer-config.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<config>
+    <!--<progressLabels>
+        <en_US>
+            <Copy>Copying %1 of %2</Copy>
+            <Get>Downloading bytes %1 of %2</Get>
+            <Checksum>Computing checksum: bytes %1 of %2</Checksum>
+        </en_US>
+    </progressLabels>
+     -->
+    <strings description="override default installer strings here">
+        <string id="INFO_DOWNLOADING_FLEX_SDK">
+            <el_GR>Γίνεται λήψη του Apache Flex Falcon Compiler από:</el_GR>
+            <en_US>Downloading Apache Flex Falcon Compiler from: </en_US>
+        </string>
+        <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
+            <el_GR>Παρακαλώ εισάγετε μια έγκυρη διαδρομή
καταλόγου για το Flex SDK</el_GR>
+            <en_US>Please enter valid directory path for a Flex or FlexJS SDK</en_US>
+        </string>
+        <string id="INFO_SELECT_DIRECTORY">
+            <el_GR>Επιλέξτε τον κατάλογο στον οποίο θέλετε
να εγκαταστήσετε το Flex Falcon</el_GR>
+            <en_US>Select the directory where you want to install the Flex Falcon Compiler</en_US>
+        </string>
+        <string id="INFO_VERIFY_FLEX_SDK_DONE">
+            <el_GR>Η επαλήθευση των ληφθέντων αρχείων
είναι επιτυχής.</el_GR>
+            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files matches
the reference. The file is valid.</en_US>
+        </string>
+        <string id="SELECT_PATH_PROMPT">
+            <el_GR>Πληκτρολογήστε η επιλέξτε μια έγκυρη
διαδρομή για το Flex Falcon Compiler</el_GR>
+            <en_US>Where do you want to install the Apache Flex Falcon Compiler?</en_US>
+        </string>
+        <string id="ERROR_VERIFY_FLEX_SDK">
+            <el_GR>Η επαλήθευση των ληφθέντων αρχείων
απέτυχε. Η εγκατάσταση σταμάτησε.</el_GR>
+            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files does
not match the reference value. The file is invalid, installation is aborted.</en_US>
+        </string>
+        <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
+            <el_GR>ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEX FALCON</el_GR>
+            <en_US>OPEN APACHE FLEX FALCON FOLDER</en_US>
+        </string>
+        <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
+            <el_GR>Λήψη Apache Flex Falcon Compiler</el_GR>
+            <en_US>Apache Flex Falcon Compiler (Required)</en_US>
+        </string>
+        <string id="STEP_VERIFY_FLEX_SDK">
+            <el_GR>Γίνεται επαλήθευση του Apache Flex Falcon MD5
Signature</el_GR>
+            <en_US>Verifying Apache Flex Falcon MD5 Signature</en_US>
+        </string>
+        <string id="STEP_UNZIP_FLEX_SDK">
+            <el_GR>Αποσυμπίεση του Apache Flex Falcon Compiler</el_GR>
+            <en_US>Uncompress Apache Flex Falcon Compiler</en_US>
+        </string>
+    </strings>
+    <steps description="targets that should have a 'step' in the GUI progress indicator,
in order of appearance.">
+        <step id="download">
+            <el_GR></el_GR>
+            <en_US>Download Falcon dependencies</en_US>
+        </step>
+        <step id="copyfiles">
+            <el_GR></el_GR>
+            <en_US>Copy Falcon Compiler files</en_US>
+        </step>
+    </steps>
+    <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexfalcon.install">
+        <el_GR>
+            <label>Apache Flex Falcon (Απαιτούμενο)</label>
+            <message>Για το Apache Flex Falcon ισχύει η συμφωνία
χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache
Flex Falcon;</message>
+        </el_GR>
+        <en_US>
+            <label>Apache Flex Falcon (Required)</label>
+            <message>The Apache License V2 applies to the Apache Flex Falcon Compiler.
 Do you want to install the Apache Flex Falcon Compiler?</message>
+            <license>Apache V2 License</license>
+            <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
+        </en_US>
+    </component>
+</config>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/apache-flex-falconjx-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-falconjx-installer-config.xml b/apache-flex-falconjx-installer-config.xml
new file mode 100644
index 0000000..68baa27
--- /dev/null
+++ b/apache-flex-falconjx-installer-config.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<config>
+    <!--<progressLabels>
+        <en_US>
+            <Copy>Copying %1 of %2</Copy>
+            <Get>Downloading bytes %1 of %2</Get>
+            <Checksum>Computing checksum: bytes %1 of %2</Checksum>
+        </en_US>
+    </progressLabels>
+     -->
+    <strings description="override default installer strings here">
+        <string id="INFO_DOWNLOADING_FLEX_SDK">
+            <el_GR>Γίνεται λήψη του Apache Flex FalconJX από:</el_GR>
+            <en_US>Downloading Apache Flex FalconJX Compiler from: </en_US>
+        </string>
+        <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
+            <el_GR>Παρακαλώ εισάγετε μια έγκυρη διαδρομή
καταλόγου για το Flex SDK</el_GR>
+            <en_US>Please enter valid directory path for a Flex or FlexJS SDK</en_US>
+        </string>
+        <string id="INFO_SELECT_DIRECTORY">
+            <el_GR>Επιλέξτε τον κατάλογο στον οποίο θέλετε
να εγκαταστήσετε το Flex Falcon</el_GR>
+            <en_US>Select the directory where you want to install the Flex FalconJX
Compiler</en_US>
+        </string>
+        <string id="INFO_VERIFY_FLEX_SDK_DONE">
+            <el_GR>Η επαλήθευση των ληφθέντων αρχείων
είναι επιτυχής.</el_GR>
+            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files matches
the reference. The file is valid.</en_US>
+        </string>
+        <string id="SELECT_PATH_PROMPT">
+            <el_GR>Πληκτρολογήστε η επιλέξτε μια έγκυρη
διαδρομή για το Flex Falcon Compiler</el_GR>
+            <en_US>Where do you want to install the Apache Flex Falcon Compiler?</en_US>
+        </string>
+        <string id="ERROR_VERIFY_FLEX_SDK">
+            <el_GR>Η επαλήθευση των ληφθέντων αρχείων
απέτυχε. Η εγκατάσταση σταμάτησε.</el_GR>
+            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files does
not match the reference value. The file is invalid, installation is aborted.</en_US>
+        </string>
+        <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
+            <el_GR>ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEX FALCONJX</el_GR>
+            <en_US>OPEN APACHE FLEX FALCONJX FOLDER</en_US>
+        </string>
+        <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
+            <el_GR>Λήψη Apache Flex Falcon Compiler</el_GR>
+            <en_US>Apache Flex Falcon Compiler (Required)</en_US>
+        </string>
+        <string id="STEP_VERIFY_FLEX_SDK">
+            <el_GR>Γίνεται επαλήθευση του Apache Flex Falcon MD5
Signature</el_GR>
+            <en_US>Verifying Apache Flex Falcon MD5 Signature</en_US>
+        </string>
+        <string id="STEP_UNZIP_FLEX_SDK">
+            <el_GR>Αποσυμπίεση του Apache Flex Falcon Compiler</el_GR>
+            <en_US>Uncompress Apache Flex Falcon Compiler</en_US>
+        </string>
+    </strings>
+    <steps description="targets that should have a 'step' in the GUI progress indicator,
in order of appearance.">
+        <step id="download">
+            <el_GR></el_GR>
+            <en_US>Download Falcon dependencies</en_US>
+        </step>
+        <step id="copyfiles">
+            <el_GR></el_GR>
+            <en_US>Copy Falcon SDK files</en_US>
+        </step>
+        <step id="download.jx">
+            <en_US>Download FalconJX Dependencies</en_US>
+        </step>
+        <step id="copyfiles.jx">
+            <el_GR></el_GR>
+            <en_US>Copy FalconJX SDK files</en_US>
+        </step>
+    </steps>
+    <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexjs.install">
+        <el_GR>
+            <label>Apache Flex Falcon (Απαιτούμενο)</label>
+            <message>Για το Apache Flex FalconJX ισχύει η συμφωνία
χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache
Flex FalconJX;</message>
+        </el_GR>
+        <en_US>
+            <label>Apache Flex FalconJX (Required)</label>
+            <message>The Apache License V2 applies to the Apache Flex FalconJX Compiler.
 Do you want to install the Apache Flex FalconJX Compiler?</message>
+            <license>Apache V2 License</license>
+            <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
+        </en_US>
+    </component>
+</config>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 241a0c3..f76ea85 100644
--- a/build.xml
+++ b/build.xml
@@ -110,6 +110,8 @@
         <ant dir="compiler.tests" target="wipe"/>
 		<ant dir="compiler.jx" target="super-clean"/>
         <ant dir="compiler.jx.tests" target="wipe"/>
+        <delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
+        <delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
     </target>
 
     <target name="check-flex-home" unless="mxmlc.jar.exists"
@@ -386,6 +388,13 @@
         
         <antcall target="binary-package-jx-zip"/>
         <antcall target="binary-package-jx-tgz"/>
+        
+        <copy todir="${basedir}/out">
+            <fileset dir="${basedir}">
+                <include name="apache-flex-falcon-installer-config.xml"/>
+                <include name="apache-flex-falconjx-installer-config.xml"/>
+            </fileset>
+        </copy>
     </target>
 
     <!--

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 9bba160..7eaae6b 100644
--- a/installer.xml
+++ b/installer.xml
@@ -41,12 +41,17 @@
     <property file="${FALCON_HOME}/installer.properties/${bundle}.properties"/>
     <property file="${FALCON_HOME}/installer.properties/en_US.properties"/>
 
-    <!-- assumes Falcon expanded into the in/falcon folder in a Flex SDK folder -->
+    <!-- assumes Falcon expanded two levels deep in a Flex SDK folder -->
     <condition property="FLEX_HOME" value="${basedir}/../.." >
-        <and>
-            <available file="${basedir}/../../in/falcon" type="dir" />
-            <available file="${basedir}/../../lib/mxmlc.jar" />
-        </and>
+        <available file="${basedir}/../../lib/mxmlc.jar" />
+    </condition>
+    <!-- assumes Falcon expanded into the temp folder in a Flex SDK folder -->
+    <condition property="FLEX_HOME" value="${basedir}/.." >
+        <available file="${basedir}/../lib/mxmlc.jar" />
+    </condition>
+    <!-- assumes Falcon expanded into the temp folder in a Flex SDK folder -->
+    <condition property="install.jx" value="true" >
+        <available file="${basedir}/compiler.jx" type="dir" />
     </condition>
     
     <fail message="FLEX_HOME not specified. Environment variable not used." >
@@ -88,7 +93,7 @@
         <ant dir="${basedir}/compiler" antfile="downloads.xml"/>
     </target>
     
-    <target name="download.jx" description="download FalconJX compiler dependencies">
+    <target name="download.jx" if="install.jx" description="download FalconJX compiler
dependencies">
         <echo>${download.compiler.jx.deps}</echo>
         <property name="FALCONJX_HOME" value="${FLEX_HOME}/js" />
         <property name="closure.download.filename" value="${goog.url.file}" />
@@ -126,7 +131,7 @@
         </copy>
     </target>
     
-    <target name="copyfiles.jx" description="copy FalconJX files into SDK" >
+    <target name="copyfiles.jx" if="install.jx" description="copy FalconJX files into
SDK" >
         <mkdir dir="${FLEX_HOME}/js/bin" />
         <mkdir dir="${FLEX_HOME}/js/lib" />
         <!-- If sdk.branch is set to binary distro flexTasks is in a different place.
-->


Mime
View raw message