Updated Branches: refs/heads/develop 52d350441 -> b4ddb7677
Split 'frameworks' target in two, to allow Jenkins to skip the 'gjslint' and 'jshint' steps (these executables are not available on the build machine). Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b4ddb767 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b4ddb767 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b4ddb767 Branch: refs/heads/develop Commit: b4ddb767739f2f782dac0afce7630c263b617800 Parents: 52d3504 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Mon Nov 25 15:39:27 2013 +0100 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Mon Nov 25 15:39:27 2013 +0100 ---------------------------------------------------------------------- build.xml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4ddb767/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 97c52e6..8ba49f1 100644 --- a/build.xml +++ b/build.xml @@ -72,7 +72,14 @@ Each of the main targets for the modules will call clean themselves before proceeding. --> - <target name="main" depends="prebuild,frameworks,post-build" description="Full build"> + <target name="main" depends="prebuild,frameworks-as,frameworks-js,post-build" description="Full build"> + <tstamp> + <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" /> + </tstamp> + <echo>ant main target completed on ${build.datetime}</echo> + </target> + + <target name="main-jenkins" depends="prebuild,frameworks-as,post-build" description="Full build"> <tstamp> <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" /> </tstamp> @@ -87,6 +94,10 @@ depends="check-compile-env,check-runtime-env,check-falcon-home,check-falconjx-home,source-release,binary-release,rat-check" description="Creates source and binary kits for Apache FlexJS."/> + <target name="release-jenkins" + depends="check-compile-env,check-runtime-env,check-falcon-home,check-falconjx-home,source-release,binary-release-jenkins,rat-check" + description="Creates source and binary kits for Apache FlexJS."/> + <target name="source-release" depends="super-clean,create-description,create-config,source-package" description="Packages the source release kit which is the official Apache release."/> @@ -95,6 +106,10 @@ depends="setup-binary-release,main,sample-themes,checkintests,doc,other.locales,binary-package,additional-packages" description="Builds and packages the binary kit which is provided as a convenience."/> + <target name="binary-release-jenkins" + depends="setup-binary-release,main-jenkins,sample-themes,checkintests,doc,other.locales,binary-package,additional-packages" + description="Builds and packages the binary kit which is provided as a convenience."/> + <target name="source-release-noclean" depends="create-description,create-config,source-package" description="Packages the source release kit which is the official Apache release."/> @@ -364,10 +379,13 @@ Build framework SWCs --> - <target name="frameworks" description="Full build of all framework SWCs, including resource bundles and themes"> + <target name="frameworks-as" description="Full build of all Actionscript framework SWCs, including resource bundles and themes"> <ant dir="${basedir}/frameworks/as"> <property name="locale" value="${locale}"/> </ant> + </target> + + <target name="frameworks-js" description="Full check of all JavaScript framework files, using gsjlint and jshint"> <ant dir="${basedir}/frameworks/js"> <property name="locale" value="${locale}"/> </ant>
