Skip to content

Commit

Permalink
pass 1 of getting ant build to work after refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@aharui
aharui committed Dec 28, 2015
1 parent bf2e1dc commit 03810ab
Show file tree
Hide file tree
Showing 10 changed files with 229 additions and 336 deletions.
5 changes: 3 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,9 @@ frameworks/mxml-manifest.xml
frameworks/spark-manifest.xml
frameworks/tests/
frameworks/themes/
modules/core/classes/
modules/core/src/ExcludeDoclet.java
remoting/classes/
core/classes/
core/src/ExcludeDoclet.java
qa/resources/config/air-config.xml
qa/resources/config/flex-config.xml
resources/security/tomcat/TomcatValve.java
Expand Down
24 changes: 14 additions & 10 deletions build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,20 @@
src.depend=true
src.debug=on

blazeds.dir=${basedir}
qa.dir=${basedir}/qa
appserver.dir=${basedir}/servers/apache-tomcat-6.0.29
blazeds.dir=${basedir}

servlet.version=2.5
activemq.version=5.7.0
codec.version=1.6
collections.version=3.2.1
httpclient.version=3.0.1
logging.version=1.1.1
log4j.version=1.2.14
spring.version=3.0.7
xalan.version=2.6.0
catalina.version=6.0.26
catalina7.version=7.0.8
catalina4.version=4.0.6

local.sdk.lib.dir=./modules/sdk/lib
local.sdk.frameworks.dir=./frameworks
Expand Down Expand Up @@ -59,13 +70,6 @@ jgroups.jars=jgroups-core-2.9.0GA.jar,log4j.jar
# See the readme.txt file in the local-swcs directory for more information.
use.local.swcs=false

servlet.jar=${blazeds.dir}/servers/apache-tomcat-6.0.29/lib/servlet-api.jar
jms.jar=${blazeds.dir}/lib/jms.jar
jta.jar=${blazeds.dir}/lib/jta.jar
jmxri.jar=${blazeds.dir}/lib/jmxri.jar
hsqldb.jar=${blazeds.dir}/lib/hsqldb/hsqldb.jar
junit.jar=${ant.home}/lib/junit.jar

#player uninstaller file names
uninstaller.exe=uninstall_flash_player.exe

Expand Down
138 changes: 58 additions & 80 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,51 @@ Each of the main targets for the modules will call clean themselves before proce

<!-- properties -->
<property file="${basedir}/build.properties" />

<property name="modules.core.dir" value="${basedir}/core"/>
<property name="download.dir" value="${basedir}/in"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="servlet.dir" value="${lib.dir}/javax/servlet/servlet-api/${servlet.version}"/>
<property name="activemq.dir" value="${lib.dir}/org/apache/activemq"/>
<property name="activemq.zip.file" value="${basedir}/in/apache-activemq-${activemq.version}-bin.zip"/>
<property name="codec.dir" value="${lib.dir}/commons-codec/commons-codec/${codec.version}"/>
<property name="codec.zip.file" value="${basedir}/in/apache-codec-${codec.version}-bin.zip"/>
<property name="collections.dir" value="${lib.dir}/commons-collections/commons-collections/${collections.version}"/>
<property name="collections.zip.file" value="${basedir}/in/apache-collections-${collections.version}-bin.zip"/>
<!-- needed?
<property name="fileupload.zip.file" value="${basedir}/in/apache-fileupload-1.1.zip"/>
-->
<property name="httpclient.dir" value="${lib.dir}/commons-httpclient/commons-httpclient/${httpclient.version}"/>
<property name="httpclient.zip.file" value="${basedir}/in/apache-httpclient-${httpclient.version}-bin.zip"/>
<property name="logging.dir" value="${lib.dir}/commons-logging/commons-logging/${logging.version}"/>
<property name="logging.zip.file" value="${basedir}/in/apache-logging-1.1.1-bin.zip"/>
<!--
<property name="hsqldb.zip.file" value="${basedir}/in/hsqldb_1_8_0_10.zip"/>
<property name="jms.zip.file" value="${basedir}/in/openjms-0.7.6.1.zip"/>
-->
<property name="jms.jar" value="geronimo-jms_1.1_spec-1.1.1.jar" />
<property name="jms.dir" value="${lib.dir}/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1"/>
<property name="log4j.dir" value="${lib.dir}/log4j/log4j/${log4j.version}"/>
<property name="log4j.zip.file" value="${basedir}/in/logging-log4j-${log4j.version}.zip"/>
<property name="spring.dir" value="${lib.dir}/org/springframework/spring-core/${spring-version}.RELEASE"/>
<property name="spring.zip.file" value="${basedir}/in/spring-framework-${spring.version}.RELEASE.zip"/>
<property name="springsecurity.zip.file" value="${basedir}/in/spring-security-3.0.3.RELEASE.zip"/>
<!--
<property name="springflex.jar.file" value="${basedir}/lib/spring/spring-flex-core-1.5.2.RELEASE.jar"/>
<property name="taglibs.zip.file" value="${basedir}/in/jakarta-taglibs-standard-1.1.2.zip"/>
<property name="aopalliance.zip.file" value="${basedir}/in/aopalliance.zip"/>
<property name="backport.zip.file" value="${basedir}/in/backport-util-concurrent.zip"/>
<property name="cglib.jar.file" value="${basedir}/lib/spring/cglib-nodep-2.1_3.jar"/>
<property name="jackson.jar.file" value="${basedir}/lib/spring/jackson-core-asl-1.0.0.jar"/>
<property name="axis.zip.file" value="${basedir}/in/axis.zip"/>
-->
<property name="xalan.dir" value="${lib.dir}/xalan/xalan/${xalan.version}.RELEASE"/>
<property name="xalan.zip.file" value="${basedir}/in/xalan-j_${xalan.version}-bin-2jars.zip"/>
<property name="catalina4.dir" value="${lib.dir}/tomcat/catalina/${catalina4.version}"/>
<property name="catalina4.zip.file" value="${basedir}/in/jakarta-tomcat-${catalina4.version}.zip"/>
<property name="catalina.dir" value="${lib.dir}/org/apache/tomcat/catalina/${catalina.version}"/>
<property name="catalina7.dir" value="${lib.dir}/org/apache/tomcat/tomcat-catalina/${catalina7.version}"/>

<property name="dist.dir" value="${basedir}/dist"/>
<property name="qa.dir" value="${basedir}/qa"/>

Expand Down Expand Up @@ -137,7 +182,7 @@ Each of the main targets for the modules will call clean themselves before proce
<ant antfile="${basedir}/downloads.xml" dir="${basedir}"/>
</target>

<target name="main" depends="check-env,clean,thirdparty-downloads,sdk,webtier,common,core,proxy,remoting,opt,apps,createMMSFile" description="full build">
<target name="main" depends="check-env,clean,thirdparty-downloads,sdk,common,core,proxy,remoting,opt,createMMSFile" description="full build">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
Expand All @@ -150,77 +195,27 @@ Each of the main targets for the modules will call clean themselves before proce

<!-- must be setup before building other targets -->
<target name="sdk" description="get the sdk and add to the server">
<ant antfile="${basedir}/modules/sdk/build.xml"/>
<!--<ant antfile="${basedir}/sdk/build.xml"/> AJH: needed? -->
</target>

<target name="webtier" description="get the webtier corresponding to the SDK used">
<ant antfile="${basedir}/qa/resources/webtier/build.xml"/>
</target>

<target name="common" description="full build of the common module">
<ant antfile="${basedir}/modules/common/build.xml" target="${subproject.target}"/>
<ant antfile="${basedir}/common/build.xml" target="${subproject.target}"/>
</target>

<target name="core" description="full build of the core module">
<ant antfile="${basedir}/modules/core/build.xml" target="${subproject.target}"/>
<ant antfile="${basedir}/core/build.xml" target="${subproject.target}"/>
</target>

<target name="proxy" description="full build of the proxy module">
<ant antfile="${basedir}/modules/proxy/build.xml" target="${subproject.target}"/>
<ant antfile="${basedir}/proxy/build.xml" target="${subproject.target}"/>
</target>

<target name="remoting" description="full build of the remoting module">
<ant antfile="${basedir}/modules/remoting/build.xml" target="${subproject.target}"/>
<ant antfile="${basedir}/remoting/build.xml" target="${subproject.target}"/>
</target>

<target name="opt" description="full build of the opt module">
<ant antfile="${basedir}/modules/opt/build.xml" target="${subproject.target}"/>
</target>

<target name="ajax" description="full build of the fds-ajax bridge">
<ant antfile="${basedir}/resources/fds-ajax-bridge/build.xml" dir="${basedir}/resources/fds-ajax-bridge"/>
</target>

<!-- removing aspectj dependencies
<target name="apps" depends="consoleapp,samplesapp,blazedsapp,blazeds-springapp,samples-springapp,qaapp,qa-manualapp,teamapp" description="full build of all active apps" />-->
<target name="apps" depends="consoleapp,samplesapp,blazedsapp,qaapp,qa-manualapp,teamapp" description="full build of all active apps" />

<target name="samplesapp" description="full build of the samples app">
<ant antfile="${basedir}/apps/samples/build.xml" target="${subproject.target}"/>
</target>

<target name="samples-springapp" description="full build of the spring-samples app">
<ant antfile="${basedir}/apps/samples-spring/build.xml" target="${subproject.target}"/>
</target>

<target name="blazedsapp" description="full build of the blazeds app">
<ant antfile="${basedir}/apps/blazeds/build.xml" target="${subproject.target}"/>
</target>

<target name="blazeds-springapp" description="full build of the blazeds-spring app">
<ant antfile="${basedir}/apps/blazeds-spring/build.xml" target="${subproject.target}"/>
</target>

<target name="consoleapp" description="full build of the flex admin app">
<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">
<ant antfile="${qa.dir}/apps/qa-regress/build.xml" dir="${qa.dir}"/>
</target>

<target name="qa-manualapp" description="full build of the qa manual testing app">
<ant antfile="${qa.dir}/apps/qa-manual/build.xml" />
</target>

<target name="teamapp" description="full build of the team app">
<ant antfile="${basedir}/apps/team/build.xml" target="${subproject.target}"/>
<ant antfile="${basedir}/opt/build.xml" target="${subproject.target}"/>
</target>

<target name="postbuilds">
Expand Down Expand Up @@ -620,32 +615,15 @@ Each of the main targets for the modules will call clean themselves before proce
</target>

<target name="clean" description="clean">
<ant antfile="${basedir}/modules/sdk/build.xml" target="clean"/>
<ant antfile="${basedir}/modules/remoting/build.xml" target="clean"/>
<ant antfile="${basedir}/modules/proxy/build.xml" target="clean"/>
<ant antfile="${basedir}/modules/common/build.xml" target="clean"/>
<ant antfile="${basedir}/modules/core/build.xml" target="clean"/>
<ant antfile="${basedir}/modules/opt/build.xml" target="clean"/>
<ant antfile="${basedir}/apps/blazeds/build.xml" target="clean"/>
<ant antfile="${basedir}/apps/blazeds-spring/build.xml" target="clean"/>
<ant antfile="${basedir}/apps/ds-console/build.xml" target="clean"/>
<ant antfile="${basedir}/apps/samples/build.xml" target="clean"/>
<ant antfile="${basedir}/apps/samples-spring/build.xml" target="clean"/>
<ant antfile="${basedir}/apps/team/build.xml" target="clean"/>
<ant antfile="${basedir}/resources/fds-ajax-bridge/build.xml" target="clean"/>
<ant antfile="${basedir}/qa/apps/qa-manual/build.xml" target="clean"/>
<ant antfile="${basedir}/qa/apps/qa-regress/build.xml" target="clean"/>
<ant antfile="${basedir}/qa/resources/webtier/build.xml" target="clean"/>
<ant antfile="${basedir}/qa/src/build.xml" target="clean"/>
<ant antfile="${basedir}/sdk/build.xml" target="clean"/>
<ant antfile="${basedir}/remoting/build.xml" target="clean"/>
<ant antfile="${basedir}/proxy/build.xml" target="clean"/>
<ant antfile="${basedir}/common/build.xml" target="clean"/>
<ant antfile="${basedir}/core/build.xml" target="clean"/>
<ant antfile="${basedir}/opt/build.xml" target="clean"/>
<delete>
<fileset dir="." includes="TEST-*.xml"/>
</delete>
<delete quiet="true" dir="${basedir}/dist"/>
<delete quiet="true" dir="${basedir}/sampledb" includes="hsqldb.jar"/>
<delete quiet="true" dir="${basedir}/templates"/>
<delete>
<fileset dir="resources/clustering" includes="{jgroups.jars},jgroups-LICENSE.txt" />
</delete>
</target>

<target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads."/>
Expand Down
6 changes: 3 additions & 3 deletions common/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
limitations under the License.
-->
<project name="modules/common/build.xml" default="main" basedir="../..">
<project name="common/build.xml" default="main" basedir="..">

<!-- properties -->
<property file="${basedir}/build.properties"/>
<property name="lib.dir" value="${basedir}/lib"/>

<property name="module.dir" value="${basedir}/modules/common"/>
<property name="module.dir" value="${basedir}/common"/>
<property name="module.lib.dir" location="${module.dir}/lib"/>
<property name="module.src" value="${module.dir}/src"/>
<property name="module.classes" value="${module.dir}/classes"/>
Expand All @@ -35,7 +35,7 @@

<!-- j2ee apis required to compile -->
<path id="classpath">
<fileset dir="${lib.dir}" includes="**/*.jar"/>
<fileset dir="${xalan.dir}" includes="xalan-${xalan.version}.jar"/>
</path>

<target name="main" depends="clean,prepare,run-depend,jar" description="cleans and runs the full build"/>
Expand Down
24 changes: 13 additions & 11 deletions core/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,34 @@
limitations under the License.
-->
<project name="modules/core/build.xml" default="main" basedir="../..">
<project name="core/build.xml" default="main" basedir="..">

<!-- properties -->
<property file="${basedir}/build.properties"/>
<property name="lib.dir" value="${basedir}/lib"/>

<property name="module.dir" value="${basedir}/modules/core"/>
<property name="module.dir" value="${basedir}/core"/>
<property name="module.lib.dir" location="${module.dir}/lib"/>
<property name="tomcat.lib.dir" location="${basedir}/servers/apache-tomcat-6.0.29/lib" />
<property name="tomcat.lib.dir" location="${lib.dir}" />
<property name="module.src" value="${module.dir}/src"/>
<property name="module.classes" value="${module.dir}/classes"/>
<property name="module.jar" value="${lib.dir}/flex-messaging-core.jar"/>
<property name="module.dist.dir" value="${basedir}/dist/source"/>

<property name="common.src" value="${basedir}/modules/common/src"/>
<property name="remoting.src" value="${basedir}/modules/remoting/src"/>
<property name="proxy.src" value="${basedir}/modules/proxy/src"/>
<property name="opt.src" value="${basedir}/modules/opt/src"/>
<property name="common.src" value="${basedir}/common/src"/>
<property name="remoting.src" value="${basedir}/remoting/src"/>
<property name="proxy.src" value="${basedir}/proxy/src"/>
<property name="opt.src" value="${basedir}/opt/src"/>

<property name="build.number" value=""/>

<!-- j2ee apis required to compile -->
<path id="classpath">
<fileset dir="${lib.dir}" erroronmissingdir="false" includes="**/*.jar"/>
<fileset dir="${module.lib.dir}" erroronmissingdir="false" includes="**/*.jar"/>
<fileset dir="${tomcat.lib.dir}" erroronmissingdir="false" includes="**/*.jar"/>
<fileset dir="${lib.dir}" erroronmissingdir="false" includes="flex-messaging-common.jar"/>
<fileset dir="${xalan.dir}" includes="xalan-${xalan.version}.jar"/>
<fileset dir="${activemq.dir}" erroronmissingdir="false" includes="activemq-core/${activemq.version}/activemq-core-${activemq.version}.jar"/>
<fileset dir="${servlet.dir}" erroronmissingdir="false" includes="servlet-api-${servlet.version}.jar"/>
<fileset dir="${jms.dir}" erroronmissingdir="false" includes="${jms.jar}"/>
</path>

<target name="main" depends="clean,prepare,run-depend,jar" description="cleans and runs the full build"/>
Expand Down Expand Up @@ -124,7 +126,7 @@
<target name="javadoc">
<path id="javadoc.classpath">
<path refid="classpath"/>
<fileset dir="${basedir}/modules/opt/lib" includes="*.jar" excludes="catalina-708.jar"/>
<fileset dir="${basedir}/opt/lib" includes="*.jar" excludes="catalina-708.jar"/>
</path>
<mkdir dir="${basedir}/docs"/>
<mkdir dir="${basedir}/docs/api"/>
Expand Down
Loading

0 comments on commit 03810ab

Please sign in to comment.