Repository: flex-utilities Updated Branches: refs/heads/develop aadfdc97e -> a01855b1c
FLEX-34640: Squiggly: Generate / Package RSLs and deploy with Maven Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/c84f6a9c Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/c84f6a9c Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/c84f6a9c Branch: refs/heads/develop Commit: c84f6a9cbf3430df5062518076673b00821ac386 Parents: aadfdc9 Author: Frédéric Thomas <ftho...@apache.org> Authored: Tue Nov 18 12:10:24 2014 +0100 Committer: Frédéric Thomas <ftho...@apache.org> Committed: Tue Nov 18 12:11:05 2014 +0100 ---------------------------------------------------------------------- Squiggly/build.xml | 2 ++ Squiggly/main/build.xml | 58 ++++++++++++++++++++++++++++++++++++++++++-- Squiggly/main/maven.xml | 5 +++- 3 files changed, 62 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c84f6a9c/Squiggly/build.xml ---------------------------------------------------------------------- diff --git a/Squiggly/build.xml b/Squiggly/build.xml index 026706b..18de5cc 100644 --- a/Squiggly/build.xml +++ b/Squiggly/build.xml @@ -175,6 +175,7 @@ <include name="docs/**" /> <include name="dictionaries/**" /> <include name="**/*.swc" /> + <include name="**/*.swf" /> <exclude name="ane/**" /> <exclude name="main/ASDocExamples/**" /> <exclude name="main/Automation/**" /> @@ -206,6 +207,7 @@ <include name="docs/**" /> <include name="dictionaries/**" /> <include name="**/*.swc" /> + <include name="**/*.swf" /> <exclude name="ane/**" /> <exclude name="main/ASDocExamples/**" /> <exclude name="main/Automation/**" /> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c84f6a9c/Squiggly/main/build.xml ---------------------------------------------------------------------- diff --git a/Squiggly/main/build.xml b/Squiggly/main/build.xml index ae93580..e271ee3 100644 --- a/Squiggly/main/build.xml +++ b/Squiggly/main/build.xml @@ -40,9 +40,63 @@ <property name="COMPC.JAR" value="${FLEX_HOME}/lib/compc.jar"/> <property name="ADL" value="${AIR_HOME}/bin/adl.exe"/> <property name="ADT.JAR" value="${AIR_HOME}/lib/adt.jar"/> - <property name="playerglobal.version" value="14.0" /> + <property name="playerglobal.version" value="15.0" /> <property name="OUTPUT_DIR" value="libs"/> + + <macrodef name="create-rsl"> + <attribute name="rsl-dir"/> + <attribute name="swc-dir"/> + <attribute name="swc-name"/> + <sequential> + <mkdir dir="@{rsl-dir}"/> + <delete> + <fileset dir="@{rsl-dir}"> + <include name="@{swc-name}.swc"/> + </fileset> + </delete> + <unzip src="@{swc-dir}/@{swc-name}.swc" dest="@{rsl-dir}" overwrite="true"> + <patternset> + <include name="library.swf"/> + </patternset> + <mapper type="glob" from="library.swf" to="@{swc-name}.library.swf"/> + </unzip> + <exec executable="${FLEX_HOME}/bin/optimizer.bat" + output="${OUTPUT_DIR}/flex-optimizer-@{swc-name}.log" append="true" osfamily="windows"> + <arg value="-input=@{rsl-dir}/@{swc-name}.library.swf"/> + <arg value="-output=@{rsl-dir}/@{swc-name}.swf"/> + </exec> + <exec executable="${FLEX_HOME}/bin//digest.bat" + output="${OUTPUT_DIR}/flex-optimizer-@{swc-name}.log" append="true" osfamily="windows"> + <arg value="-digest.rsl-file=@{rsl-dir}/@{swc-name}.swf"/> + <arg value="-digest.swc-path=@{swc-dir}/@{swc-name}.swc"/> + </exec> + <delete file="@{rsl-dir}/@{swc-name}.library.swf"/> + </sequential> + </macrodef> + + <!-- To remove along with the condition check in the target "extract-rsls" as soon as "optimize" and "digest" + will be setup and tested on Mac and Unix based OSes, see the MacroDef "create-rsl" --> + <condition property="isWindows"> + <os family="windows" /> + </condition> + + <target name="extract-rsls" if="isWindows"> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexLinguisticUtils"/> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexSpellingEngine"/> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexSpellingFramework"/> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexSpellingUI"/> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexSpellingUIAPI"/> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexSpellingUITLF"/> + <create-rsl rsl-dir="${OUTPUT_DIR}/rsls" swc-dir="${OUTPUT_DIR}" + swc-name="ApacheFlexSpellingUIEx"/> + </target> <target name="init" depends="clean"> <mkdir dir="${OUTPUT_DIR}"/> @@ -220,7 +274,7 @@ </java> </target> - <target name="test" depends="compilelinguistics, compileengine, compileframework, compileui, compileuiapi, compileuitlf, compileuiex"> + <target name="test" depends="compilelinguistics, compileengine, compileframework, compileui, compileuiapi, compileuitlf, compileuiex, extract-rsls"> </target> <target name="clean" description="clean up"> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c84f6a9c/Squiggly/main/maven.xml ---------------------------------------------------------------------- diff --git a/Squiggly/main/maven.xml b/Squiggly/main/maven.xml index 7c8b84b..e758983 100644 --- a/Squiggly/main/maven.xml +++ b/Squiggly/main/maven.xml @@ -19,7 +19,7 @@ --> <project default="install" basedir="."> - <property name="version" value="1.1"/> + <property name="version" value="1.0"/> <!-- Set type to RELEASE in order to deploy to the release repo --> <property name="type" value="SNAPSHOT"/> @@ -199,6 +199,7 @@ </filterchain> </copy> <copy file="libs/ApacheFlex${moduleName}.swc" tofile="generated/maven/${artifactName}.swc"/> + <copy file="libs/rsls/ApacheFlex${moduleName}.swf" tofile="generated/maven/${artifactName}.swf"/> <zip destfile="generated/maven/${artifactName}-sources.jar"> <fileset dir="${moduleName}/src"/> </zip> @@ -218,6 +219,7 @@ <artifact:install> <artifact:pom file="generated/maven/${artifactName}.pom"/> <artifact:artifact file="generated/maven/${artifactName}.swc"/> + <artifact:artifact file="generated/maven/${artifactName}.swf"/> <artifact:artifact file="generated/maven/${artifactName}-sources.jar" classifier="sources"/> </artifact:install> </target> @@ -238,6 +240,7 @@ <artifact:remoterepo id="${maven.repositoryId}" url="${maven.repositoryUrl}"/> <artifact:pom file="generated/maven/${artifactName}.pom"/> <artifact:artifact file="generated/maven/${artifactName}.swc"/> + <artifact:artifact file="generated/maven/${artifactName}.swf"/> <artifact:artifact file="generated/maven/${artifactName}-sources.jar" classifier="sources"/> </artifact:deploy> </target>
