Author: cframpton
Date: Fri Jul 20 19:01:53 2012
New Revision: 1363902
URL: http://svn.apache.org/viewvc?rev=1363902&view=rev
Log:
Create release/version.xml as part of the build, per Om's instructions. The
properties installer.url.win/installer.url.mac still need to be set correctly.
Modified:
incubator/flex/utilities/InstallApacheFlex/build.properties
incubator/flex/utilities/InstallApacheFlex/build.xml
Modified: incubator/flex/utilities/InstallApacheFlex/build.properties
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/build.properties?rev=1363902&r1=1363901&r2=1363902&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/build.properties (original)
+++ incubator/flex/utilities/InstallApacheFlex/build.properties Fri Jul 20
19:01:53 2012
@@ -18,9 +18,13 @@
-->
-# nano version number is added by build script
+#nano version number is added by build script
release.version=0.7
+#The URLs for the IDE Installer Apps
+installer.url.win=TBD_WIN
+installer.url.mac=TBD_MAC
+
#Flex Locations
//FLEX_HOME=../ApacheFlex
FLEX_HOME_WIN=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/4.6.0
Modified: incubator/flex/utilities/InstallApacheFlex/build.xml
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/build.xml?rev=1363902&r1=1363901&r2=1363902&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/build.xml (original)
+++ incubator/flex/utilities/InstallApacheFlex/build.xml Fri Jul 20 19:01:53
2012
@@ -25,6 +25,7 @@
<!--location of property file -->
<property file="${basedir}/build.properties" description="Properties for
MakeApacheFlexForFlashBuilder project" />
+ <property file="${basedir}/build.number"/>
<!-- properties are immutable so value frozen first time property is set
-->
<condition property="FLEX_HOME" value="${FLEX_HOME_WIN}">
@@ -65,9 +66,11 @@
</condition>
<property name="extension" value="dmg"/>
- <target name="build" depends="init,compile,packagenative,cleanup"
description="Compiles and packages application"/>
-
- <target name="init" depends="clean,createDirs" description="Creates the
deploy folders and sets app extension"/>
+ <target name="build" depends="init,compile,packagenative,cleanup"
+ description="Compiles and packages application"/>
+
+ <target name="init" depends="clean,createDirs,create-version-xml"
+ description="Creates the deploy folders and sets app extension"/>
<target name="clean" description="Cleans up old files.">
<delete dir="${BUILD_DIR}" failOnError="false" includeEmptyDirs="true"
/>
@@ -79,20 +82,22 @@
</target>
<target name="createDirs">
- <echo
message="************************************************************************************
- ${line.separator}Execute the update-version target once, and
only once, when you modifiy this app.
- ${line.separatorThis will increment the version number to
allow the app to be updated by the AIR installer.
-
${line.separator}************************************************************************************"/>
+ <echo>
+
************************************************************************************
+ Execute the update-version target once, and only once, when you
modifiy this app.
+ This will increment the version number to allow the app to be updated
by the AIR installer.
+
************************************************************************************
+ </echo>
<mkdir dir="${BUILD_DIR}"/>
<mkdir dir="${RELEASE_DIR}"/>
- <echo message="FLEX_HOME is ${FLEX_HOME}"/>
</target>
<!--
- Run this target once, when you make a change to this app so that the
AIR
- Installer will allow the app to be updated. The build.number property
in the
- file build.property will be read and then incremented and the nano
version number
- in the <version> tag in InstallApacheFlex-app.xml will be updated.
+ Run this target once, and then rebuild, when you make a change to this
app
+ so that the AIR Installer will allow the app to be updated. The
build.number
+ property in the file build.property will be read and then incremented
and the
+ nano version number in the <version> tag in InstallApacheFlex-app.xml
will be
+ updated.
-->
<target name="update-version" description="Update the app version number
so it will be updated.">
<buildnumber/>
@@ -192,4 +197,39 @@
<arg value="${ASSETS_DIR}"/>
</java>
</target>
+
+ <target name="create-version-xml" description="Creates version.xml file
for update">
+ <echo message="version is ${release.version}.${build.number}"/>
+ <echo file="${RELEASE_DIR}/version.xml"><?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.
+
+-->
+<update>
+ <!-- The URL to download the Windows installer from -->
+ <urlWindows>${installer.url.win}</urlWindows>
+ <!-- The URL to download the Mac installer from -->
+ <urlMac>${installer.url.mac}</urlMac>
+ <!-- The version from ${APP_NAME}-app.xml -->
+ <version>${release.version}.${build.number}</version>
+ <description>Latest release</description>
+ <required>true</required>
+</update>
+ </echo>
+ </target>
+
</project>
\ No newline at end of file
