fix scripts after moving files to top-level
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/81fc9158 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/81fc9158 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/81fc9158 Branch: refs/heads/develop Commit: 81fc9158bdc6869b62a35281d087ddc6021f1b2b Parents: 930ffc9 Author: Alex Harui <[email protected]> Authored: Thu Jun 18 10:14:39 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Thu Jun 18 10:14:39 2015 -0700 ---------------------------------------------------------------------- flex-installer/ApproveInstaller.xml | 4 ++-- flex-installer/build.properties | 10 +++++----- flex-installer/build.xml | 33 +++++++++++++++++--------------- 3 files changed, 25 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/81fc9158/flex-installer/ApproveInstaller.xml ---------------------------------------------------------------------- diff --git a/flex-installer/ApproveInstaller.xml b/flex-installer/ApproveInstaller.xml index eb3091f..4e955fa 100644 --- a/flex-installer/ApproveInstaller.xml +++ b/flex-installer/ApproveInstaller.xml @@ -226,7 +226,7 @@ <exclude name="**/*.jpg"/> <exclude name="**/*.mp3"/> <exclude name="**/*.flv"/> - <exclude name="installer/build.number"/> + <exclude name="build.number"/> </fileset> </rat:report> <antcall target="display-text" > @@ -322,7 +322,7 @@ validargs="y" defaultvalue="y" /> <ant dir="${basedir}/${package.url.name}/ant_on_air" target="main" /> - <ant dir="${basedir}/${package.url.name}/installer" target="build" /> + <ant dir="${basedir}/${package.url.name}" target="build" /> </target> <target name="copy.downloads" if="${do.copy.downloads}" description="instead of actually downloading all of the dependencies, you can save lots of time by just copying from some other folder in some other SDK."> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/81fc9158/flex-installer/build.properties ---------------------------------------------------------------------- diff --git a/flex-installer/build.properties b/flex-installer/build.properties index a4f96b8..494be76 100644 --- a/flex-installer/build.properties +++ b/flex-installer/build.properties @@ -36,17 +36,17 @@ AIR_HOME_MAC=${FLEX_HOME_MAC} APP_NAME=InstallApacheFlex APP_EXTENSION=mxml APP_CONFIG_XML_NAME=installer/sdk-installer-config-4.0 -SOURCE_DIR=${basedir}/src -ASSETS_DIR=${basedir}/src/assets -LIBRARY_DIR=${basedir}/libs +SOURCE_DIR=${basedir}/installer/src +ASSETS_DIR=${basedir}/installer/src/assets +LIBRARY_DIR=${basedir}/installer/libs RELEASE_DIR=${basedir}/release DEPS_DIR=${basedir}/deps BUILD_DIR=${basedir}/build INSTALLER_PROJECT_NAME=installer COMMON_PROJECT_NAME=common -COMMON_PROJECT_DIR=${basedir}/../${COMMON_PROJECT_NAME} +COMMON_PROJECT_DIR=${basedir}/${COMMON_PROJECT_NAME} COMMON_SOURCE_DIR=${COMMON_PROJECT_DIR}/src -ANT_ON_AIR_DIR=${basedir}/../ant_on_air/bin +ANT_ON_AIR_DIR=${basedir}/ant_on_air/bin #Etc Settings DEBUG_FLAG=false http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/81fc9158/flex-installer/build.xml ---------------------------------------------------------------------- diff --git a/flex-installer/build.xml b/flex-installer/build.xml index 777ee60..6112a0c 100644 --- a/flex-installer/build.xml +++ b/flex-installer/build.xml @@ -434,27 +434,27 @@ </copy> <copy todir="${BUILD_DIR}/temp/ant_on_air" includeEmptyDirs="false"> - <fileset dir="${basedir}/../ant_on_air"> + <fileset dir="${basedir}/ant_on_air"> <include name="build.properties" /> <include name="build.xml" /> </fileset> </copy> <copy todir="${BUILD_DIR}/temp/ant_on_air/src" includeEmptyDirs="false"> - <fileset dir="${basedir}/../ant_on_air/src"> + <fileset dir="${basedir}/ant_on_air/src"> </fileset> </copy> <copy todir="${BUILD_DIR}/temp/ant_on_air/locale" includeEmptyDirs="false"> - <fileset dir="${basedir}/../ant_on_air/locale"> + <fileset dir="${basedir}/ant_on_air/locale"> </fileset> </copy> <copy todir="${BUILD_DIR}/temp/ant_on_air/tests" includeEmptyDirs="false"> - <fileset dir="${basedir}/../ant_on_air/tests"> + <fileset dir="${basedir}/ant_on_air/tests"> <exclude name="*.swf" /> </fileset> </copy> <copy todir="${BUILD_DIR}/temp/${INSTALLER_PROJECT_NAME}" includeEmptyDirs="false"> - <fileset dir="${basedir}"> + <fileset dir="${basedir}/${INSTALLER_PROJECT_NAME}"> <exclude name="*.p12"/> <exclude name="*.password"/> <exclude name="rat.report"/> @@ -470,27 +470,30 @@ <exclude name="**/.flexLibProperties"/> <exclude name="**/.project"/> <exclude name="**/.idea/**"/> - <exclude name="local.properties"/> - <!-- These are bumped up to the top-level release directory. --> - <exclude name="DISCLAIMER"/> - <exclude name="LICENSE"/> - <exclude name="NOTICE"/> - <exclude name="README"/> - <exclude name="RELEASE_GUIDE"/> - <exclude name="RELEASE_NOTES"/> </fileset> </copy> <!-- Bump these up to the top-level release directory. --> <copy todir="${BUILD_DIR}/temp" includeEmptyDirs="false"> <fileset dir="${basedir}"> - <include name="DISCLAIMER"/> + <include name="build.*"/> + <include name="binary_license/LICENSE"/> <include name="LICENSE"/> <include name="NOTICE"/> <include name="README"/> <include name="RELEASE_GUIDE"/> <include name="RELEASE_NOTES"/> - </fileset> + <exclude name="installerBadge/**" /> + <exclude name="installerLocaleEditor/**" /> + <exclude name="common/**" /> + <exclude name="ant_on_air/**" /> + <exclude name="*.p12"/> + <exclude name="*.password"/> + <exclude name="rat.report"/> + <exclude name="build/**"/> + <exclude name="release/**"/> + <exclude name="local.properties"/> + </fileset> </copy> <fixcrlf srcdir="${BUILD_DIR}/temp" eol="crlf" encoding="UTF8" excludes="**/assets/**,**/*.ttf,**/*.png" fixlast="false"/>
