Author: cframpton
Date: Fri Jul 20 14:16:28 2012
New Revision: 1363792
URL: http://svn.apache.org/viewvc?rev=1363792&view=rev
Log:
Fix build script so it doesn't create a new certificate each time - this will
allow a reinstall without the "This application can not be installed because
this installer has been misconfigured. Please contact the application author
for assistance" error. Ignore the release and build directories.
Modified:
incubator/flex/utilities/InstallApacheFlex/ (props changed)
incubator/flex/utilities/InstallApacheFlex/build.properties
incubator/flex/utilities/InstallApacheFlex/build.xml
Propchange: incubator/flex/utilities/InstallApacheFlex/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 20 14:16:28 2012
@@ -0,0 +1,2 @@
+release
+build
Modified: incubator/flex/utilities/InstallApacheFlex/build.properties
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/build.properties?rev=1363792&r1=1363791&r2=1363792&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/build.properties (original)
+++ incubator/flex/utilities/InstallApacheFlex/build.properties Fri Jul 20
14:16:28 2012
@@ -20,16 +20,13 @@
#Flex Locations
//FLEX_HOME=../ApacheFlex
-FLEX_HOME=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/4.6.0
-FLEX_TASKS=${FLEX_HOME}/ant/lib/flexTasks.jar
+FLEX_HOME_WIN=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/4.6.0
+FLEX_HOME_MAC=/Applications/Adobe Flash Builder 4.6/sdks/4.6.0/
#AIR Locations
//env.AIR_HOME=../../AdobeAIRSDK
-env.AIR_HOME=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/4.6.0
-
-#Compilers
-ADL=${env.AIR_HOME}/bin/adl
-ADT=${env.AIR_HOME}/lib/adt.jar
+AIR_HOME_WIN=${FLEX_HOME_WIN}
+AIR_HOME_MAC=${FLEX_HOME_MAC}
#App Settings
APP_NAME=InstallApacheFlex
Modified: incubator/flex/utilities/InstallApacheFlex/build.xml
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/build.xml?rev=1363792&r1=1363791&r2=1363792&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/build.xml (original)
+++ incubator/flex/utilities/InstallApacheFlex/build.xml Fri Jul 20 14:16:28
2012
@@ -26,6 +26,21 @@
<!--location of property file -->
<property file="${basedir}/build.properties" description="Properties for
MakeApacheFlexForFlashBuilder project" />
+ <!-- properties are immutable so value frozen first time property is set
-->
+ <condition property="FLEX_HOME" value="${FLEX_HOME_WIN}">
+ <os family="windows"/>
+ </condition>
+ <property name="FLEX_HOME" value="${FLEX_HOME_MAC}"/>
+
+ <condition property="env.AIR_HOME" value="${AIR_HOME_WIN}">
+ <os family="windows"/>
+ </condition>
+ <property name="env.AIR_HOME" value="${AIR_HOME_MAC}"/>
+
+ <!-- compilers -->
+ <property name="ADL" value="${env.AIR_HOME}/bin/adl"/>
+ <property name="ADT" value="${env.AIR_HOME}/lib/adt.jar"/>
+
<!-- additional tasks - mxmlc tag -->
<path id="flexTasks.path">
<fileset dir="${FLEX_HOME}">
@@ -35,17 +50,10 @@
</path>
<taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
- <target name="build" description="compiles application">
- <antcall target="init"/>
- <antcall target="cleanup"/>
- </target>
-
- <target name="init" depends="determineOS, clean,createDirs"
description="Creates the deploy folders and sets app extension">
- <available file="${KEYSTORE}" property="CERTIFICATE_FLAG"/>
- <antcall target="packagenative"/>
- <antcall target="abortBuild"/>
- </target>
+ <target name="build" depends="init,packagenative,abortBuild,cleanup"
description="compiles application"/>
+ <target name="init" depends="determineOS,clean,createDirs"
description="Creates the deploy folders and sets app extension"/>
+
<target name="createDirs" unless="unsupportedOS">
<mkdir dir="${BUILD_DIR}"/>
<mkdir dir="${RELEASE_DIR}"/>
@@ -68,7 +76,7 @@
</condition>
</target>
- <target name="packagenative" depends="compile, certificate, packageair"
unless="unsupportedOS"
+ <target name="packagenative" depends="compile,certificate,packageair"
unless="unsupportedOS"
description="Packages the AIR file from the build directory to create a
native installer (exe/dmg) file">
<java jar="${ADT}" fork="true"
failonerror="true"
@@ -89,7 +97,7 @@
</echo>
</target>
- <target name="compile" unless="unsupportedOS"
+ <target name="compile" unless="unsupportedOS"
description="Compiles the AIR application to a SWF file and places SWF
in a temp directory to be packaged.">
<mxmlc file="${SOURCE_DIR}/${APP_NAME}.${APP_EXTENSION}"
output="${BUILD_DIR}/${APP_NAME}.swf"
@@ -106,7 +114,13 @@
</mxmlc>
</target>
- <target name="certificate" unless="CERTIFICATE_FLAG,unsupportedOS">
+ <!-- Make sure to use the same certificate each time so we can update the
app. -->
+ <target name="certificate" unless="unsupportedOS">
+ <available file="${KEYSTORE}" property="certificate.exists"/>
+ <antcall target="generate-certificate"/>
+ </target>
+
+ <target name="generate-certificate" unless="certificate.exists">
<java jar="${ADT}" fork="true"
failonerror="true">
<arg value="-certificate"/>
