Skip to content
Permalink
Browse files
Merge branch 'apache-tour-de-flex-1.2'
Conflicts:
	installer/src/InstallApacheFlex.mxml
  • Loading branch information
justinmclean committed Mar 30, 2016
2 parents 4f128cc + 8cf18f3 commit 48905dd2f5020537da09877f03d00976e0c3d41d
Showing 20 changed files with 3,423 additions and 3,680 deletions.
@@ -1,6 +1,11 @@
The following volunteers have contributed code, documentation, testing and/or
support to the Apache Flex Tour De Flex.

Apache Flex Tour De Flex 1.2
----------------------------
Alex Harui, Eric De Bruin, Gowtham S, Jake Knerr, Justin Mclean, Neil Madsen,
OmPrakash Muppirala

Apache Flex Tour De Flex 1.1
----------------------------
Alex Harui, Andrew Wetmore, Alex Harui, Chris Martin, Christofer Dutz,
@@ -218,6 +218,9 @@ The summaries of each version of Apache Flex in TourDeFlex3/apache are
licensed under Creative Commons Attribution-ShareAlike 3.0 Unported
License (CC BY-SA 3.0).

/src/swfobject.js from SWFObject 2.2, is available under a MIT license.
For details, see https://code.google.com/p/swfobject.




@@ -1,4 +1,4 @@
Apache Flex
Apache Flex Tour De Flex
Copyright 2014 The Apache Software Foundation

This product includes software developed at
@@ -13,5 +13,5 @@ was created by CameronMusic. The original file can be found here:
http://www.freesound.org/people/cameronmusic/sounds/138420/

The text used in the summaries of each version of Apache Flex
in TourDeFlex3/apache can be found here:
http://www.freesound.org/people/cameronmusic/sounds/138420/
in TourDeFlex can be found here:
http://en.wikipedia.org/wiki/Apache_Flex
@@ -18,7 +18,7 @@ Bugs fixed and improvements:
FLEX-34505 Add squiggly example to Tour De Flex
FLEX-34501 Allow 3rd parties to provide examples for inclusion in TourDeFlex
FLEX-34596 Tour De Flex linking is broken
FLEX-34493 Loading bar not centred in panel
FLEX-34493 Loading bar not centered in panel
FLEX-34485 Improve TourDeFlex consistency and design

------------------------------------------------
@@ -26,7 +26,7 @@
<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
<isset property="env.FLEX_HOME" />
</condition>
<property name="version" value="1.1" />
<property name="version" value="1.2" />

<!-- additional tasks - mxmlc tag -->
<path id="flexTasks.path">
@@ -67,16 +67,36 @@
</sequential>
</macrodef>

<macrodef name="compile-mxml-libs">
<macrodef name="compile-mxml-squiggly-mx-libs">
<attribute name="example"/>

<sequential>
<mxmlc file="${basedir}/src/@{example}.mxml"
output="${basedir}/src/@{example}.swf" fork="true" failonerror="true">
<load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
<compiler.library-path dir="${basedir}/libs" append="true">
<include name="*.swc" />
</compiler.library-path>
<compiler.include-libraries dir="${basedir}/libs" append="true">
<include name="ApacheFlexLinguisticUtils.swc" />
<include name="ApacheFlexSpellingEngine.swc" />
<include name="ApacheFlexSpellingFramework.swc" />
<include name="ApacheFlexSpellingUI.swc" />
</compiler.include-libraries>
</mxmlc>
</sequential>
</macrodef>

<macrodef name="compile-mxml-squiggly-spark-libs">
<attribute name="example"/>

<sequential>
<mxmlc file="${basedir}/src/@{example}.mxml"
output="${basedir}/src/@{example}.swf" fork="true" failonerror="true">
<load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
<compiler.include-libraries dir="${basedir}/libs" append="true">
<include name="ApacheFlexLinguisticUtils.swc" />
<include name="ApacheFlexSpellingEngine.swc" />
<include name="ApacheFlexSpellingFramework.swc" />
<include name="ApacheFlexSpellingUIEx.swc" />
</compiler.include-libraries>
</mxmlc>
</sequential>
</macrodef>
@@ -441,28 +461,69 @@
<property name="download.dir" value="temp"/>
<property name="unpack.dir" value="squiggly"/>
<property name="mirror.url" value="http://flex.apache.org/single-mirror-url.cgi" />
<property name="squiggly.folder" value="flex/squiggly/1.0" />
<property name="squiggly.folder" value="flex/squiggly/1.1" />

<condition property="squiggly.file" value="apache-flex-squiggly-1.0-bin.zip">
<condition property="isWindows" value="true">
<os family="windows" />
</condition>

<condition property="squiggly.file" value="apache-flex-squiggly-1.1-bin.zip">
<os family="windows" />
</condition>

<condition property="squiggly.file" value="apache-flex-squiggly-1.0-bin.tar.gz">
<condition property="squiggly.file" value="apache-flex-squiggly-1.1-bin.tar.gz">
<or>
<os family="mac" />
<os family="unix" />
</or>
</condition>

<target name="compile-squiggly" description="compile apache squiggly examples" depends="squiggly-download">
<compile-mxml-libs example="/apache/squiggly/SpellingExample"/>
<compile-mxml-libs example="/apache/squiggly/SpellingExExample"/>
<compile-mxml example="/apache/Squiggly1_1"/>
<compile-mxml-squiggly-mx-libs example="/apache/squiggly/SpellingExample"/>
<compile-mxml-squiggly-spark-libs example="/apache/squiggly/SpellingExExample"/>
</target>

<target name="squiggly-check" description="Checks if Squiggly has been downloaded.">
<available file="${basedir}/libs/ApacheflexSpellingEngine.swc" property="sqigggly.present"/>
<available file="${basedir}/libs/ApacheFlexSpellingEngine.swc" property="sqigggly.present"/>
</target>


<target name="squiggly-untar" unless="isWindows">
<mkdir dir="${unpack.dir}"/>
<untar dest="${unpack.dir}" src="${download.dir}/${squiggly.file}" compression="gzip" />
</target>

<target name="squiggly-unzip" if="isWindows">
<mkdir dir="${unpack.dir}"/>
<unzip dest="${unpack.dir}" src="${download.dir}/${squiggly.file}" />
</target>

<target name="copy-squiggly-dicts">
<!-- So squiggly works in Tour De Flex app -->
<mkdir dir="${basedir}/dictionaries"/>
<copy todir="${basedir}/dictionaries">
<fileset dir="${unpack.dir}/dictionaries/">
<include name="**" />
</fileset>
</copy>

<!-- So squiggly works in nightly builds of Tour De Flex app -->
<mkdir dir="${basedir}/src/dictionaries"/>
<copy todir="${basedir}/src/dictionaries">
<fileset dir="${unpack.dir}/dictionaries/">
<include name="**" />
</fileset>
</copy>

<!-- So squiggly works stand alone -->
<mkdir dir="${basedir}/src/apache/squiggly/dictionaries"/>
<copy todir="${basedir}/src/apache/squiggly/dictionaries/">
<fileset dir="${unpack.dir}/dictionaries/">
<include name="**" />
</fileset>
</copy>
</target>

<target name="squiggly-download" depends="squiggly-check" unless="sqigggly.present" description="Downloads squiggly SDK">

<mkdir dir="${download.dir}"/>
@@ -476,10 +537,9 @@
<get src="${squiggly.url}/${squiggly.folder}/${squiggly.file}"
dest="${download.dir}/${squiggly.file}"
verbose="true"/>

<!-- TOSO upzip on windows -->
<mkdir dir="${unpack.dir}"/>
<untar dest="${unpack.dir}" src="${download.dir}/${squiggly.file}" compression="gzip" />

<ant target="squiggly-untar" />
<ant target="squiggly-unzip" />

<mkdir dir="libs"/>
<copy todir="libs">
@@ -488,12 +548,7 @@
</fileset>
</copy>

<mkdir dir="dictionaries"/>
<copy todir="dictionaries">
<fileset dir="${unpack.dir}/dictionaries">
<include name="*.*" />
</fileset>
</copy>
<ant target="copy-squiggly-dicts" />
</target>

<target name="package" description="package up all source files" depends="package-dir,package-tar,package-zip">
@@ -520,7 +575,7 @@
<include name="src/favicon.ico" />
<include name="src/index.html" />
<include name="src/explorer.xml" />
<include name="src/AC_OETags.js" />
<include name="src/swfobject.js" />
<include name="**/*.mxml" />
<include name="**/*.as" />
<include name="**/*.jpg" />
@@ -533,6 +588,10 @@
<include name="**/*.xml" />
<exclude name="**/*.swf" />
<exclude name="installer.xml" />
<exclude name="squiggly" />
<exclude name="dictionaries" />
<exclude name="src/dictionaries" />
<exclude name="src/apache/squiggly/dictionaries" />
</tarfileset>
</tar>
</target>
@@ -551,7 +610,7 @@
<include name="src/favicon.ico" />
<include name="src/index.html" />
<include name="src/explorer.xml" />
<include name="src/AC_OETags.js" />
<include name="src/swfobject.js" />
<include name="**/*.mxml" />
<include name="**/*.as" />
<include name="**/*.jpg" />
@@ -564,13 +623,27 @@
<include name="**/*.xml" />
<exclude name="**/*.swf" />
<exclude name="installer.xml" />
<exclude name="squiggly" />
<exclude name="dictionaries" />
<exclude name="src/dictionaries" />
<exclude name="src/apache/squiggly/dictionaries" />
</fileset>
</zip>
</target>

<target name="create-md5" >
<echo message="Generating MD5 hashes for release artifacts"/>
<checksum algorithm="md5" file="${basedir}/out/apache-flex-tour-de-flex-component-explorer-${version}-src.tar.gz" forceOverwrite="yes"/>
<checksum algorithm="md5" file="${basedir}/out/apache-flex-tour-de-flex-component-explorer-${version}-src.zip" forceOverwrite="yes"/>
</target>

<target name="clean" description="clean up">
<delete>
<fileset dir="${basedir}" includes="**/*.swf" />
</delete>
<delete dir="${basedir}/squiggly" />
<delete dir="${basedir}/dictionaries" />
<delete dir="${basedir}/src/dictionaries" />
<delete dir="${basedir}/src/apache/squiggly/dictionaries" />
</target>
</project>
@@ -18,10 +18,13 @@

<compTree>
<node label="3rd Party Components">
<node label="Ardisia">
<node thirdParty="true" label="Ardisia Component Library" app="http://www.ardisialabs.com/tourDeFlex/tour-de-flex.jpg" src="" link="http://www.ardisialabs.com/tour-de-flex" />
</node>
<node label="Flexicious">
<node label="Dashboard Framework" app="http://www.flexicious.com/resources/demo/FlexiciousClassic.swf" src="" />
<node label="Ultimate DataGrid" app="http://www.flexicious.com/resources/demo/FlexiciousUltimate.swf" src="" />
<node label="Classic DataGrid" app="http://www.flexicious.com/resources/demo/FlexiciousDashboard.swf" src="" />
<node thirdParty="true" label="Dashboard Framework" app="http://www.flexicious.com/dashboard.jpg" src="" link="http://www.flexicious.com/Home/Dashboard"/>
<node thirdParty="true" label="Ultimate DataGrid" app="http://www.flexicious.com/ultimate.jpg" src="" link="http://www.flexicious.com/Home/Ultimate" />
<node thirdParty="true" label="Classic DataGrid" app="http://www.flexicious.com/classic.jpg" src="" link="http://www.flexicious.com/Home/DemoFlex4"/>
</node>
</node>
</compTree>

0 comments on commit 48905dd

Please sign in to comment.