You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/09/08 18:28:41 UTC
git commit: [flex-asjs] [refs/heads/develop] - more tweaks to build
and approval scripts
Repository: flex-asjs
Updated Branches:
refs/heads/develop d9a8e0741 -> 119c5ce1c
more tweaks to build and approval scripts
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/119c5ce1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/119c5ce1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/119c5ce1
Branch: refs/heads/develop
Commit: 119c5ce1c1793692cee27177ca34c9600cc5bdab
Parents: d9a8e07
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 8 09:28:58 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 8 09:29:08 2015 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 27 ++++++++++++++++-----------
build.xml | 7 +++++++
2 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/119c5ce1/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index 5a3736e..6e18199 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -87,10 +87,10 @@
<available file="${env.FLEX_HOME}"
type="dir"
- property="FLEX_HOME" value="${env.FLEX_HOME}" />
+ property="FLEX_SDK_HOME" value="${env.FLEX_HOME}" />
<fail message="The FLEX_HOME property is not set in environment or command-line."
- unless="FLEX_HOME"/>
+ unless="FLEX_SDK_HOME"/>
<available file="${env.AIR_HOME}"
type="dir"
@@ -148,9 +148,6 @@
<fail message="The release version is not set. Specify -Drelease.version=<release version (e.g. 3.1, 3.2, etc)>"
unless="release.version"/>
- <fail message="The release candidate number is not set. Specify -Drc=<rc number (e.g. 1, 2, 3, etc)>"
- unless="rc"/>
-
<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/flexjs/${release.version}/rc${rc}" />
<property name="package.url.name" value="apache-flex-flexjs-${release.version}-src" />
@@ -227,8 +224,12 @@
dest="${basedir}/${package.url.name}.${package.suffix}" />
<get src="${package.url.path}/${package.url.name}.${package.suffix}.md5"
dest="${basedir}/${package.url.name}.${package.suffix}.md5" />
+ <antcall target="get_asc" />
+ </target>
+
+ <target name="get_asc" if="rc" >
<get src="${package.url.path}/${package.url.name}.${package.suffix}.asc"
- dest="${basedir}/${package.url.name}.${package.suffix}.asc" />
+ dest="${basedir}/${package.url.name}.${package.suffix}.asc" />
</target>
<target name="check-sigs" description="check md5 and gpg sigs">
@@ -241,13 +242,17 @@
</not>
</condition>
<fail message="MD5 checksum did not match" if="MD5Invalid" />
- <exec executable="gpg" failonerror="true">
- <arg value="--verify" />
- <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
- <arg value="${basedir}/${package.url.name}.${package.suffix}" />
- </exec>
+ <antcall target="gpg_check" />
</target>
+ <target name="gpg_check" if="rc">
+ <exec executable="gpg" failonerror="true">
+ <arg value="--verify" />
+ <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
+ <arg value="${basedir}/${package.url.name}.${package.suffix}" />
+ </exec>
+ </target>
+
<target name="uncompress" depends="pre-clean, untar-file, unzip-file" />
<target name="pre-clean" description="remove old uncompressed package" >
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/119c5ce1/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a16002d..bf32096 100644
--- a/build.xml
+++ b/build.xml
@@ -547,6 +547,13 @@
<!-- frameworks -->
<antcall target="stage-framework-as"/>
+ <copy todir="${basedir}/temp/frameworks/js">
+ <fileset dir="${basedir}/frameworks/js" >
+ <include name="jshint.properties"/>
+ <include name=".jshintrc"/>
+ </fileset>
+ </copy>
+
<!-- asdoc -->
<copy todir="${basedir}/temp/asdoc" includeEmptyDirs="false">
<fileset dir="${basedir}/asdoc">