Skip to content
Permalink
Browse files
remove dependency on antcontrib
  • Loading branch information
aharui committed Dec 10, 2014
1 parent 65183f6 commit 6b02b49605876089baf33426490f96a1eb2fa863
Showing 14 changed files with 242 additions and 269 deletions.
@@ -90,9 +90,10 @@
<fileset dir="${classes.dir}" includes="**/*.class"/>
</delete>
<delete quiet="true" file="${dist.dir}/blazeds.war" />
<delete quiet="true" dir="${blazeds.war}/WEB-INF/lib" />
<delete quiet="true" dir="${blazeds.war}/WEB-INF/src" />
<delete quiet="true" file="${blazeds.war}/WEB-INF/flex/version.properties" />
<delete quiet="true" dir="${blazeds.war}/WEB-INF/lib" />
<delete quiet="true" dir="${blazeds.war}/WEB-INF/src" />
<delete quiet="true" file="${blazeds.war}/WEB-INF/flex/version.properties" />
<echo>apps/blazeds clean</echo>
</target>

</project>
@@ -43,8 +43,6 @@
<target name="ds-console" depends="compile,compile-swf"/>

<property environment="env"/>
<property name="ant-contrib.jar" location="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>

<target name="prepare">
<mkdir dir="${ds-console.war}/WEB-INF/src"/>
@@ -143,7 +141,7 @@
</war>
</target>

<target name="clean" description="--> Removes jars and classes">
<target name="clean" description="--> Removes jars and classes">
<delete quiet="true">
<fileset dir="${ds-console.war}/" includes="swfobject.js,index.html,console.swf,expressInstall.swf,history/*"/>
</delete>
@@ -166,10 +164,10 @@
<fileset dir="${classes.dir}" includes="**/*.class"/>
</delete>
<delete quiet="true" file="${dist.dir}/console.war"/>
<delete quiet="true" file="${dist.dir}/ds-console.war"/>
<delete quiet="true" dir="${ds-console.war}/history" />
<delete quiet="true" dir="${ds-console.war}/WEB-INF/lib" />
<delete quiet="true" dir="${ds-console.war}/WEB-INF/classes" />
<delete quiet="true" file="${dist.dir}/ds-console.war"/>
<delete quiet="true" dir="${ds-console.war}/history" />
<delete quiet="true" dir="${ds-console.war}/WEB-INF/lib" />
<delete quiet="true" dir="${ds-console.war}/WEB-INF/classes" />

</target>

@@ -23,22 +23,18 @@
<project name="team.war/build.xml" default="main" basedir="../..">

<property file="${basedir}/build.properties" />
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
<property name="team.war" value="${basedir}/apps/team" />
<property name="dist.dir" value="${basedir}/dist" />
<property name="src.dir" value="${team.war}/WEB-INF/src" />
<property name="classes.dir" value="${team.war}/WEB-INF/classes" />
<if>
<condition property="template.dir" value="client-side-detection-with-history">
<equals arg1="${sdk.version}" arg2="3"/>
<then>
<property name="template.dir" value="client-side-detection-with-history"/>
<property name="war.filename" value="team-sdk3.war"/>
</then>
<else>
<property name="template.dir" value=""/>
<property name="war.filename" value="team.war"/>
</else>
</if>
</condition>
<property name="template.dir" value=""/>
<condition property="war.filename" value="team-sdk3.war">
<equals arg1="${sdk.version}" arg2="3"/>
</condition>
<property name="war.filename" value="team.war"/>

<path id="classpath">
<fileset dir="${team.war}/WEB-INF/lib" includes="**/*.jar" />
@@ -146,16 +142,16 @@
<delete quiet="true">
<fileset dir="${team.war}/WEB-INF/lib" includes="${webapp.ce.lib},${webtier.lib},${jgroups.jars}" />
<fileset dir="${team.war}/WEB-INF" includes="web.xml"/>
<fileset dir="${team.war}/WEB-INF/flex">
<include name="*-manifest.xml" />
<include name="air-config.xml"/>
<include name="flex-config.xml"/>
<include name="flex-webtier-config.xml"/>
<include name="flash-unicode-table.xml"/>
<include name="flex-sdk-description.xml" />
<include name="*.ser"/>
<include name="locale/**/*"/>
<include name="themes/**/*"/>
<fileset dir="${team.war}/WEB-INF/flex">
<include name="*-manifest.xml" />
<include name="air-config.xml"/>
<include name="flex-config.xml"/>
<include name="flex-webtier-config.xml"/>
<include name="flash-unicode-table.xml"/>
<include name="flex-sdk-description.xml" />
<include name="*.ser"/>
<include name="locale/**/*"/>
<include name="themes/**/*"/>
</fileset>
</delete>
<delete quiet="true">
@@ -176,13 +172,13 @@
<delete quiet="true" file="${dist.dir}/${war.filename}" />
<delete quiet="true" includeEmptyDirs="true">
<fileset dir="${team.war}/history" includes="**/*"/>
</delete>
<delete quiet="true" dir="${team.war}/history" />
<delete quiet="true" dir="${team.war}/WEB-INF/lib" />
<delete quiet="true" dir="${team.war}/WEB-INF/classes" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/jars" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/libs" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/locale" />
</delete>
<delete quiet="true" dir="${team.war}/history" />
<delete quiet="true" dir="${team.war}/WEB-INF/lib" />
<delete quiet="true" dir="${team.war}/WEB-INF/classes" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/jars" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/libs" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/locale" />
<delete quiet="true" dir="${team.war}/WEB-INF/flex/themes" />
</target>

100 build.xml
@@ -42,9 +42,6 @@ Each of the main targets for the modules will call clean themselves before proce

<property name="server.baseurl" value="http://localhost:8400"/>

<property name="ant-contrib.jar" location="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>

<property name="tmp.dir" value="${basedir}/packagetemp/temp" />
<property name="local.sdk.dir" value="resources/flex_sdk" />

@@ -53,7 +50,30 @@ Each of the main targets for the modules will call clean themselves before proce
<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
<property name="ANT_HOME" value="${env.ANT_HOME}"/>

<target name="check-env"
<condition property="ocx.dir" value="${env.WINDIR}/system32/Macromed/Flash/" >
<isset property="env.WINDIR"/>
</condition>
<condition property="ocx.dir" value="${env.WinDir}/system32/Macromed/Flash/" >
<isset property="env.WinDir"/>
</condition>
<property name="ocx.dir" value="${env.windir}/system32/Macromed/Flash/" />

<condition property="isFlex3" value="true">
<equals arg1="${sdk.version}" arg2="3"/>
</condition>


<condition property="installer.exe" value="${fp9.installer.exe}">
<equals arg1="${sdk.version}" arg2="3"/>
</condition>
<property name="installer.exe" value="${fp11.installer.exe}"/>

<condition property="installer.plugin.exe" value="${fp9.installer.plugin.exe}">
<equals arg1="${sdk.version}" arg2="3"/>
</condition>
<property name="installer.plugin.exe" value="${fp11.installer.plugin.exe}"/>

<target name="check-env"
depends="check-flex-home, load-more-properties, check-playerglobal-home" />

<target name="check-flex-home" unless="flexhome.exists"
@@ -180,15 +200,13 @@ Each of the main targets for the modules will call clean themselves before proce
</target>

<target name="consoleapp" description="full build of the flex admin app">
<if>
<equals arg1="${sdk.version}" arg2="3"/>
<then>
<echo message="Console app doesn't build with SDK 3, skipping."/>
</then>
<else>
<ant antfile="${basedir}/apps/ds-console/build.xml" target="${subproject.target}"/>
</else>
</if>
<antcall target="build.consoleapp" />
</target>
<target name="build.consoleapp" depends="check.flex3.consoleapp" if="isFlex3">
<ant antfile="${basedir}/apps/ds-console/build.xml" target="${subproject.target}"/>
</target>
<target name="check.flex3.consoleapp" unless="isFlex3" >
<echo message="Console app doesn't build with SDK 3, skipping."/>
</target>

<target name="qaapp" description="full build of the qa app">
@@ -210,23 +228,6 @@ Each of the main targets for the modules will call clean themselves before proce
<target name="createMMSFile"
description="create mms.cfg in order to enable local shared object access"
if="isWindows">
<if>
<isset property="env.WINDIR"/>
<then>
<property name="ocx.dir" value="${env.WINDIR}/system32/Macromed/Flash/" />
</then>
<else>
<if>
<isset property="env.WinDir"/>
<then>
<property name="ocx.dir" value="${env.WinDir}/system32/Macromed/Flash/" />
</then>
<else>
<property name="ocx.dir" value="${env.windir}/system32/Macromed/Flash/" />
</else>
</if>
</else>
</if>
<!-- Sets the default maximum local shared object storage size to unlimited -->
<echo file="${ocx.dir}/mms.cfg" append="false">LocalStorageLimit=6</echo>
</target>
@@ -756,40 +757,17 @@ Each of the main targets for the modules will call clean themselves before proce
<target name="ocx" description="Update the ActiveX player to the latest. You must CLOSE YOUR BROWSERS for this to work.">
<property name="ant-contrib.jar" location="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>


<if>
<equals arg1="${sdk.version}" arg2="3"/>
<then>
<property name="installer.exe" value="${fp9.installer.exe}"/>
<property name="installer.plugin.exe" value="${fp9.installer.plugin.exe}"/>
</then>
<else>
<property name="installer.exe" value="${fp11.installer.exe}"/>
<property name="installer.plugin.exe" value="${fp11.installer.plugin.exe}"/>
</else>
</if>


<available file="${basedir}/qa/automation/bin/${uninstaller.exe}" property="uninstaller.exists" />

<if>
<condition property="uninstall.fp" value="true">
<and>
<equals arg1="${uninstaller.exists}" arg2="true" />
<not>
<equals arg1="${skip.uninstall}" arg2="true" />
</not>
</and>
<then>
<echo>Uninstalling the old ActiveX and Plugin players.</echo>
<exec dir="${basedir}" executable="${basedir}/qa/automation/bin/${uninstaller.exe}" >
<arg line="-uninstall" />
</exec>
</then>
<else>
<echo>Uninstall was skipped.</echo>
<echo> - skip.uninstall? ${skip.uninstall}</echo>
</else>
</if>
</condition>
<antcall target="actual.uninstall.fp" />

<echo>Installing the new player.</echo>
<exec dir="${basedir}/bin" executable="${basedir}/bin/${installer.exe}">
@@ -800,6 +778,16 @@ Each of the main targets for the modules will call clean themselves before proce
<arg line="-install"/>
</exec>
</target>
<target name="actual.uninstall.fp" depends="check.uninstall.fp" if="uninstall.fp">
<echo>Uninstalling the old ActiveX and Plugin players.</echo>
<exec dir="${basedir}" executable="${basedir}/qa/automation/bin/${uninstaller.exe}" >
<arg line="-uninstall" />
</exec>
</target>
<target name="check.uninstall.fp" unless="uninstall.fp" >
<echo>Uninstall was skipped.</echo>
<echo> - skip.uninstall? ${skip.uninstall}</echo>
</target>

<target name="javadoc">
<delete dir="${basedir}/docs" failonerror="false" includeEmptyDirs="true" />
@@ -36,8 +36,6 @@
<fileset dir="${lib.dir}" includes="**/*.jar"/>
</path>

<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>

<target name="main" depends="clean,prepare,run-depend,jar" description="cleans and runs the full build"/>

<target name="prepare">
@@ -45,8 +45,6 @@
<fileset dir="${tomcat.lib.dir}" erroronmissingdir="false" includes="**/*.jar"/>
</path>

<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>

<target name="main" depends="clean,prepare,run-depend,jar" description="cleans and runs the full build"/>
<target name="dev" depends="prepare,run-depend,jar" description="runs src.depend build for development"/>

@@ -120,6 +118,7 @@
</fileset>
</delete>
<delete dir="${module.classes}" failonerror="false" includeEmptyDirs="true"/>
<echo>modules/core clean</echo>
</target>

<target name="javadoc">

0 comments on commit 6b02b49

Please sign in to comment.