[jboss-cvs] JBossCache ...
Ben Wang
bwang at jboss.com
Wed Sep 20 06:45:45 EDT 2006
User: bwang
Date: 06/09/20 06:45:45
Modified: JBossCache build.xml
Log:
First update to repackage the distro into core, pojo, and all.
Revision Changes Path
1.135 +82 -94 JBossCache/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- build.xml 14 Sep 2006 10:17:55 -0000 1.134
+++ build.xml 20 Sep 2006 10:45:45 -0000 1.135
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml,v 1.134 2006/09/14 10:17:55 bwang Exp $ -->
+<!-- $Id: build.xml,v 1.135 2006/09/20 10:45:45 bwang Exp $ -->
<project default="compile" name="JBossCache">
@@ -25,7 +25,7 @@
<property name="tmp.dir" value="${root.dir}/tmp"/>
<property name="output.dir" value="${root.dir}/output"/>
<property name="output.etc.dir" value="${output.dir}/etc"/>
- <property name="output.resources.dir" value="${resources.dir}"/>
+ <property name="output.resources.dir" value="${output.etc.dir}"/>
<property name="output.interop.dir" value="${output.dir}/interop"/>
<property name="compile.dir" value="${output.dir}/classes"/>
<property name="compiletest.dir" value="${output.dir}/test-classes"/>
@@ -48,14 +48,10 @@
<property name="manifest.file" value="${dist.lib}/default.mf"/>
<property name="src.dir.50" value="${root.dir}/src-50"/>
<property name="tests.dir.50" value="${root.dir}/tests-50"/>
- <property name="compile.dir.50" value="${output.dir}/classes-50"/>
- <property name="compiletest.dir.50" value="${output.dir}/test-classes-50"/>
- <property name="output.resources.dir.50" value="${output.dir}/resources-50"/>
+ <property name="output.resources.dir" value="${output.dir}/resources"/>
<property name="functional.tests.dir.50" value="${tests.dir.50}/functional"/>
<property name="perf.tests.dir.50" value="${tests.dir.50}/perf"/>
<property name="resources.dir.50" value="${src.dir.50}/resources"/>
- <property name="lib.dir.50" value="${root.dir}/lib-50"/>
- <property name="dist.lib.50" value="${dist.dir}/lib-50"/>
<property name="deprecation" value="off"/>
@@ -99,22 +95,7 @@
<pathelement location="${compile.dir}"/>
<pathelement location="${output.etc.dir}"/>
<pathelement location="${compiletest.dir}"/>
- </path>
-
- <path id="output.classpath.50">
- <pathelement location="${compile.dir.50}"/>
- <pathelement location="${compile.dir}"/>
- <pathelement location="${output.etc.dir}"/>
-
- <!-- NOTE: Order of compiletest.dir.50 and compile.test.dir is IMPORTANT here!!!
- This is because we want to use the test/*.class under JDK50 first here!!!
- -->
- <dirset dir="${compiletest.dir.50}">
- </dirset>
-
- <dirset dir="${compiletest.dir}">
- </dirset>
-
+ <pathelement location="${output.resources.dir}"/>
</path>
<path id="previous.version.classpath">
@@ -143,10 +124,10 @@
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
- <target name="compile" depends="compile-classes14, compile-classes50" description="Compiles all Java files">
+ <target name="compile" depends="compile-cache, compile-pojocache" description="Compiles all Java files">
</target>
- <target name="compile-classes14" description="Compiles all Java files">
+ <target name="compile-cache" description="Compiles all Java files">
<mkdir dir="${compile.dir}"/>
<mkdir dir="${compiletest.dir}"/>
@@ -183,13 +164,13 @@
<classpath refid="library.classpath"/>
<exclude name="**/obsolete/**"/>
<exclude name="**/*1_4*"/>
+ <exclude name="**/aop/**"/>
</javac>
<copy todir="${output.etc.dir}" filtering="no" overwrite="yes">
<fileset dir="${etc.dir}">
<include name="META-INF/*.xml"/>
<include name="log4j.xml"/>
- <include name="jboss-aop.xml"/>
<!-- The following copies the cache-jdbc.properties file for
running jdbc cache loader test against different DBMS -->
<include name="cache-jdbc.properties"/>
@@ -203,27 +184,27 @@
</copy>
</target>
- <target name="compile-classes50" depends="aopc-pojocache">
+ <target name="compile-pojocache" depends="aopc-pojocache">
</target>
- <target name="aopc-pojocache" depends="compile-classes50-1"
+ <target name="aopc-pojocache" depends="compile-pojocache-1"
description="Precompile aop classes">
<aopc compilerclasspathref="library.classpath" verbose="false">
- <src path="${compile.dir.50}"/>
+ <src path="${compile.dir}"/>
<include name="org/jboss/cache/pojo/impl/*.class"/>
<include name="org/jboss/cache/pojo/collection/*.class"/>
<aoppath path="${output.resources.dir}/jboss-aop.xml"/>
<classpath>
- <path refid="output.classpath.50"/>
+ <path refid="output.classpath"/>
</classpath>
</aopc>
</target>
- <target name="compile-classes50-1">
- <mkdir dir="${compile.dir.50}"/>
- <mkdir dir="${compiletest.dir.50}"/>
+ <target name="compile-pojocache-1">
+ <mkdir dir="${compile.dir}"/>
+ <mkdir dir="${compiletest.dir}"/>
- <javac destdir="${compile.dir.50}"
+ <javac destdir="${compile.dir}"
optimize="off"
target="1.5"
source="1.5"
@@ -235,7 +216,7 @@
<classpath path="${compile.dir}"/>
</javac>
<!-- compile test classes -->
- <javac destdir="${compiletest.dir.50}"
+ <javac destdir="${compiletest.dir}"
debug="on"
deprecation="${deprecation}"
optimize="off"
@@ -245,9 +226,9 @@
failonerror="true">
<src path="${functional.tests.dir.50}"/>
<!-- src path="${perf.tests.dir.50}"/ -->
- <classpath path="${compile.dir.50}"/>
<classpath path="${compile.dir}"/>
<classpath refid="library.classpath"/>
+ <exclude name="**/aop/**"/>
</javac>
</target>
@@ -259,14 +240,16 @@
<!-- ================================================================== -->
<!-- Create jboss-cache.jar -->
<!-- ================================================================== -->
- <target name="jar" description="Builds jboss-cache.jar" depends="compile, manifest, jar-14, jar-50">
+ <target name="jar" description="Builds jboss-cache.jar" depends="compile, manifest, jar-cache, jar-pojocache">
</target>
- <target name="jar-14" depends="compile-classes14, manifest" description="Builds jboss-cache.jar">
+ <target name="jar-cache" depends="compile-cache, manifest" description="Builds core jboss-cache.jar">
<mkdir dir="${dist.lib}"/>
<jar jarfile="${dist.lib}/jboss-cache.jar" manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/cache/**"/>
+ <exclude name="org/jboss/cache/aop/**"/>
+ <exclude name="org/jboss/cache/pojo/**"/>
<!-- this exclude is now unnecessary since tests are compiled to a separate output dir -->
<!-- <exclude name="org/jboss/cache/**/*Test*"/> -->
</fileset>
@@ -276,20 +259,17 @@
</jar>
</target>
- <target name="jar-50" depends="compile-classes50, manifest" description="Builds jboss-cache.jar">
- <mkdir dir="${dist.lib.50}"/>
- <jar jarfile="${dist.lib.50}/jboss-cache-jdk50.jar" manifest="${manifest.file}">
+ <target name="jar-pojocache" depends="compile-pojocache, manifest-pc" description="Builds pojocache.jar">
+ <mkdir dir="${dist.lib}"/>
+ <jar jarfile="${dist.lib}/pojocache.jar" manifest="${manifest.file}">
<fileset dir="${compile.dir}">
- <include name="org/jboss/cache/**"/>
- <exclude name="org/jboss/cache/aop/AopMarker.class"/>
- <exclude name="org/jboss/cache/aop/InstanceOfAopMarker.class"/>
- <exclude name="org/jboss/cache/aop/annotation/*.class"/>
+ <include name="org/jboss/cache/pojo/**"/>
+ <!--exclude name="org/jboss/cache/aop/AopMarker.class"/-->
+ <!--exclude name="org/jboss/cache/aop/InstanceOfAopMarker.class"/-->
+ <!--exclude name="org/jboss/cache/aop/annotation/*.class"/-->
<!-- this exclude is now unnecessary since tests are compiled to a separate output dir -->
<!-- <exclude name="org/jboss/cache/**/*Test*"/> -->
</fileset>
- <fileset dir="${compile.dir.50}">
- <include name="org/jboss/cache/aop/**"/>
- </fileset>
<fileset dir="${etc.dir}">
<include name="${dependencies}"/>
</fileset>
@@ -312,6 +292,22 @@
</manifest>
</target>
+ <target name="manifest-pc">
+ <tstamp/>
+ <mkdir dir="${dist.lib}"/>
+ <manifest file="${manifest.file}">
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Created-On" value="${TODAY}"/>
+ <attribute name="Main-Class" value="org.jboss.cache.Version"/>
+ <attribute name="Specification-Title" value="JBossCache-Pojo"/>
+ <attribute name="Specification-Version" value="${module.version}"/>
+ <attribute name="Specification-Vendor" value="JBoss Inc."/>
+ <attribute name="Implementation-Title" value="${module.name}"/>
+ <attribute name="Implementation-Version" value="${module.version}"/>
+ <attribute name="Implementation-Vendor" value="JBoss Inc."/>
+ </manifest>
+ </target>
+
<!-- ================================================================== -->
<!-- Documentation -->
@@ -427,7 +423,7 @@
<!--
<jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/>
-->
- <jvmarg value="-javaagent:${lib.dir.50}/jboss-aop-jdk50.jar"/>
+ <jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
<classpath refid="output.classpath.50"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
@@ -611,7 +607,7 @@
<target name="functionalAopTests50" depends="compile, unittests-init" description="Runs all AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
- <jvmarg value="-javaagent:${lib.dir.50}/jboss-aop-jdk50.jar"/>
+ <jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
<classpath refid="output.classpath.50"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
@@ -635,8 +631,8 @@
description="Runs all PojoCache2.x functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
- <jvmarg value="-javaagent:${lib.dir.50}/jboss-aop-jdk50.jar"/>
- <classpath refid="output.classpath.50"/>
+ <jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
+ <classpath refid="output.classpath"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
@@ -936,9 +932,8 @@
<!-- Install & Release -->
<!-- ================================================================== -->
- <target name="dist" description="Creates a full standalone distribution" depends="dist50"/>
-
- <target name="dist50" description="Creates a full standalone distribution" depends="jar, docs, javadocs, javadocs50">
+ <!--target name="dist" description="Creates a full standalone distribution" depends="jar, docs, javadocs, javadocs50"-->
+ <target name="dist" description="Creates a full standalone distribution" depends="jar">
<!-- Now make temp dirs, copy files and create the zip files -->
<mkdir dir="${tmp.dir}"/>
@@ -955,8 +950,6 @@
<mkdir dir="${tmp.dir}/docs/PojoCache"/>
<mkdir dir="${tmp.dir}/ant-dist"/>
<mkdir dir="${tmp.dir}/src"/>
- <mkdir dir="${tmp.dir}/lib-50"/>
- <mkdir dir="${tmp.dir}/tests-50"/>
<copy todir="${tmp.dir}/ant-dist" filtering="no">
<fileset dir="${ant.dir}"/>
@@ -990,7 +983,6 @@
<copy todir="${tmp.dir}/etc" filtering="no">
<fileset dir="${etc.dir}">
<include name="log4j.xml"/>
- <include name="jboss-aop.xml"/>
<include name="META-INF/*.xml"/>
<include name="cache-jdbc.properties"/>
</fileset>
@@ -1000,12 +992,14 @@
<fileset dir="${functional.tests.dir}">
<include name="**/*.java"/>
<exclude name="**/loader/Bdbje*.java"/>
+ <exclude name="**/aop/**"/>
</fileset>
</copy>
- <copy todir="${tmp.dir}/tests-50" filtering="no">
+ <copy todir="${tmp.dir}/tests" filtering="no">
<fileset dir="${functional.tests.dir.50}">
<include name="**/*.java"/>
+ <exclude name="**/aop/**"/>
</fileset>
</copy>
@@ -1027,16 +1021,7 @@
</fileset>
<fileset dir="${dist.lib}">
<include name="jboss-cache.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${tmp.dir}/lib-50" filtering="no">
- <fileset dir="${lib.dir.50}">
- <include name="*.jar"/>
- <include name="**/licenses/*"/>
- </fileset>
- <fileset dir="${dist.lib.50}">
- <include name="jboss-cache-jdk50.jar"/>
+ <include name="pojocache.jar"/>
</fileset>
</copy>
@@ -1074,8 +1059,9 @@
</fileset>
</copy>
- <delete file="${dist.dir}/jboss-cache-dist-${module.version}.zip"/>
- <delete file="${dist.dir}/jboss-cache-minimal-dist-${module.version}.zip"/>
+ <delete file="${dist.dir}/jboss-cache-core-${module.version}.zip"/>
+ <delete file="${dist.dir}/jboss-cache-pojo-${module.version}.zip"/>
+ <delete file="${dist.dir}/jboss-cache-all-${module.version}.zip"/>
<delete file="${dist.dir}/bdbje-for-jbosscache-${module.version}.zip"/>
<chmod perm="+x">
@@ -1086,36 +1072,38 @@
</fileset>
</chmod>
- <zip zipfile="${dist.dir}/jboss-cache-srcOnly-${module.version}.zip">
+ <zip zipfile="${dist.dir}/jboss-cache-all-${module.version}.zip">
<zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
- <include name="src/**"/>
+ <include name="**/**"/>
</zipfileset>
</zip>
- <zip zipfile="${dist.dir}/jboss-cache-dist-${module.version}.zip">
+ <zip zipfile="${dist.dir}/jboss-cache-core-${module.version}.zip">
<zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
<include name="**/*"/>
+ <include name="org/jboss/cache/**"/>
+ <exclude name="org/jboss/cache/pojo/**"/>
<exclude name="src/**"/>
+ <exclude name="lib/pojocache.jar"/>
+ <exclude name="lib/jboss-aop*.jar"/>
+ <exclude name="lib/trove.jar"/>
+ <exclude name="lib/qdox.jar"/>
+ <exclude name="lib/javassist.jar"/>
+ <exclude name="examples/**"/>
+ <exclude name="resources/**"/>
+ <exclude name="docs/javadocs/**"/>
+ <exclude name="docs/javadocs/Pojocache/**"/>
+ <exclude name="docs/javadocs/tutorial/**"/>
+ <exclude name="test/org/jboss/cache/pojo/**"/>
</zipfileset>
</zip>
- <!-- now remove stuff to make a minimal zip -->
- <delete dir="${tmp.dir}/docs"/>
- <delete dir="${tmp.dir}/examples"/>
- <delete dir="${tmp.dir}/tests"/>
- <delete dir="${tmp.dir}/ant-dist"/>
- <delete dir="${tmp.dir}/src"/>
- <delete>
- <fileset dir="${tmp.dir}" includes="**/*.bsh"/>
- <fileset dir="${tmp.dir}" includes="**/junit.jar"/>
- <fileset dir="${tmp.dir}" includes="**/runShellDemo.*"/>
- <fileset dir="${tmp.dir}" includes="**/bsh*.jar"/>
- <fileset dir="${tmp.dir}" includes="**/build.*"/>
- </delete>
-
- <zip zipfile="${dist.dir}/jboss-cache-minimal-dist-${module.version}.zip">
+ <zip zipfile="${dist.dir}/jboss-cache-pojo-${module.version}.zip">
<zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
- <include name="**/*"/>
+ <exclude name="src/**"/>
+ <exclude name="docs/javadocs/**"/>
+ <exclude name="docs/javadocs/TreeCache/**"/>
+ <exclude name="docs/javadocs/tutorial/**"/>
</zipfileset>
</zip>
@@ -1129,13 +1117,13 @@
<delete dir="${tmp.dir}"/>
<!-- build checksums -->
- <checksum file="${dist.dir}/jboss-cache-srcOnly-${module.version}.zip"/>
- <checksum file="${dist.dir}/jboss-cache-dist-${module.version}.zip"/>
- <checksum file="${dist.dir}/jboss-cache-minimal-dist-${module.version}.zip"/>
+ <checksum file="${dist.dir}/jboss-cache-all-${module.version}.zip"/>
+ <checksum file="${dist.dir}/jboss-cache-core-${module.version}.zip"/>
+ <checksum file="${dist.dir}/jboss-cache-pojo-${module.version}.zip"/>
<checksum file="${dist.dir}/bdbje-for-jbosscache-${module.version}.zip"/>
</target>
- <target name="perfTestJar" depends="compile-classes14, manifest" description="Builds jar file for the perf test">
+ <target name="perfTestJar" depends="compile-cache, manifest" description="Builds jar file for the perf test">
<jar jarfile="${output.dir}/perfTest.jar">
<fileset dir="${compiletest.dir}">
<include name="org/jboss/cache/data/**"/>
More information about the jboss-cvs-commits
mailing list