Author: cziegeler
Date: Thu Oct 21 12:31:56 2004
New Revision: 55252
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/build.properties
cocoon/trunk/tools/targets/compile-build.xml
cocoon/trunk/tools/targets/ide-build.xml
Log:
Update build system
Modified: cocoon/trunk/blocks.properties
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Thu Oct 21 12:31:56 2004
@@ -14,6 +14,26 @@
# limitations under the License.
#
+# NOTICE - we have to exclude the following blocks until all
+# of the code is migrated to the new container
+include.block.databases=false
+include.block.hsqldb=false
+include.block.php=false
+include.block.python=false
+include.block.xmldb=false
+include.block.xsp=false
+include.block.eventcache=false
+include.block.javaflow=false
+include.block.jms=false
+include.block.ojb=false
+include.block.petstore=false
+include.block.repository=false
+include.block.scratchpad=false
+include.block.slide=false
+include.block.webdav=false
+# END NOTICE
+
+
#------------------------------------------------------------------------------#
# Cocoon Blocks
#
#------------------------------------------------------------------------------#
Modified: cocoon/trunk/build.properties
==============================================================================
--- cocoon/trunk/build.properties (original)
+++ cocoon/trunk/build.properties Thu Oct 21 12:31:56 2004
@@ -133,6 +133,7 @@
# Directory Layout
src=src
+src.core=${src}/core/java
java=${src}/java
mocks=${src}/mocks
test=${src}/test
Modified: cocoon/trunk/tools/targets/compile-build.xml
==============================================================================
--- cocoon/trunk/tools/targets/compile-build.xml (original)
+++ cocoon/trunk/tools/targets/compile-build.xml Thu Oct 21 12:31:56 2004
@@ -36,6 +36,20 @@
</fileset>
</copy>
+ <!-- compile core classes
+ <echo message="Compiling Cocoon Core"/>
+ <javac srcdir="${src.core}"
+ destdir="${build.dest}"
+ debug="${compiler.debug}"
+ optimize="${compiler.optimize}"
+ deprecation="${compiler.deprecation}"
+ target="${target.vm}"
+ source="${source.vm}"
+ nowarn="${compiler.nowarn}"
+ compiler="${compiler}"
+ classpathref="classpath"/>
+ -->
+
<!-- compile mock classes -->
<mkdir dir="${build.mocks}"/>
<javac srcdir="${mocks}"
@@ -59,7 +73,11 @@
source="${source.vm}"
nowarn="${compiler.nowarn}"
compiler="${compiler}"
- classpathref="classpath"/>
+ classpathref="classpath">
+ <src path="${src.core}"/>
+ <src path="${java}"/>
+ </javac>
+
</target>
<!-- compiles deprecated code -->
Modified: cocoon/trunk/tools/targets/ide-build.xml
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml (original)
+++ cocoon/trunk/tools/targets/ide-build.xml Thu Oct 21 12:31:56 2004
@@ -46,7 +46,8 @@
<!-- prepare the various paths that will form the project -->
<path id="srcs">
<!-- main source dir -->
- <pathelement path="${src}/java"/>
+ <pathelement path="${src.core}"/>
+ <pathelement path="${java}"/>
<!-- samples source dir -->
<pathelement path="${src}/samples"/>
<!-- deprecated source dir -->
