User: user57
Date: 01/07/30 16:52:29
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o creating the correct binary structure for j2ee, naming and server (short
of adding external libraries).
Revision Changes Path
No revision
No revision
1.1.2.10 +134 -8 jboss/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/Attic/build.xml,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- build.xml 2001/07/30 07:20:19 1.1.2.9
+++ build.xml 2001/07/30 23:52:29 1.1.2.10
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.9 2001/07/30 07:20:19 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.10 2001/07/30 23:52:29 user57 Exp $ -->
<project default="main">
@@ -195,7 +195,7 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-classes, compile-rmi, compile-etc, compile-resources"
+ depends="compile-classes, compile-rmi, compile-etc, compile-resources,
compile-bin"
description="Compile all source files."/>
<!-- Compile all class files -->
@@ -272,7 +272,29 @@
</copy>
</target>
+ <!-- Compile bin scripts -->
+ <target name="compile-bin" depends="init">
+ <mkdir dir="${build.bin}"/>
+ <copy todir="${build.bin}" filtering="yes">
+ <fileset dir="${source.bin}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <fixcrlf srcdir="${build.bin}" cr="remove" eof="remove"
+ includes="**/*.sh"/>
+ <fixcrlf srcdir="${build.bin}" cr="add" eof="remove"
+ includes="**/*.bat, **/*.cmd"/>
+
+ <chmod perm="+x">
+ <fileset dir="${build.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+ </target>
+
+
<!-- ================================================================== -->
<!-- Build Jars -->
<!-- ================================================================== -->
@@ -470,7 +492,7 @@
| This target should depend on other docs-* targets for each
| different type of docuementation that is to be generated.
-->
- <target name="docs" depends="docs-api"
+ <target name="docs" depends="docs-api, docs-static"
description="Builds all documentation."/>
<!-- Javadocs is an exception, but provide a docs-api to conform. -->
@@ -516,6 +538,16 @@
</javadoc>
</target>
+ <!-- Compile static documents -->
+ <target name="docs-static" depends="init">
+ <mkdir dir="${build.docs}"/>
+ <copy todir="${build.docs}" filtering="yes">
+ <fileset dir="${source.docs}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ================================================================== -->
<!-- Builds a release distribution. -->
@@ -523,24 +555,118 @@
<target name="release" depends="all"
description="Builds a release distribution.">
- <!-- Copy the generated libraries -->
- <mkdir dir="${release.lib}"/>
- <copy todir="${release.lib}" filtering="no">
+ <!-- Copy the generated libraries (lib/ext) -->
+ <mkdir dir="${release.lib.ext}"/>
+ <copy todir="${release.lib.ext}" filtering="no">
+ <fileset dir="${build.jars}">
+ <include name="jboss.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated libraries (client) -->
+ <mkdir dir="${release.client}"/>
+ <copy todir="${release.client}" filtering="no">
+ <fileset dir="${build.jars}">
+ <include name="*-client.jar"/>
+ <include name="connector.jar"/>
+
+ <!-- Shouldn't these go into bin ? -->
+ <include name="stop.jar"/>
+ <include name="deploy.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Setup the deployment directory (deploy) -->
+ <mkdir dir="${release.deploy}"/>
+ <copy todir="${release.deploy}" filtering="no">
+ <fileset dir="${build.etc}">
+ <include name="deploy.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated deployment libraries (deploy/lib) -->
+ <mkdir dir="${release.deploy.lib}"/>
+ <copy todir="${release.deploy.lib}" filtering="no">
<fileset dir="${build.jars}">
+ <include name="jms-ra.rar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated scripts & runnable jars (bin) -->
+ <mkdir dir="${release.bin}"/>
+ <copy todir="${release.bin}" filtering="no">
+ <fileset dir="${build.bin}">
<include name="**/*"/>
</fileset>
+ <fileset dir="${build.jars}">
+ <include name="run.jar"/>
+ </fileset>
</copy>
+ <!-- since copy does not preserve permissions, do this here (again) -->
+ <chmod perm="+x">
+ <fileset dir="${build.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- Copy the static documents (docs) -->
+ <mkdir dir="${release.docs}"/>
+ <copy todir="${release.docs}" filtering="no">
+ <fileset dir="${build.docs}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
- <!-- Copy the generated javadocs -->
+ <!-- Copy the generated javadocs (docs/api/<module>) -->
<mkdir dir="${release.module.api}"/>
<copy todir="${release.module.api}" filtering="no">
<fileset dir="${build.api}">
<include name="**/*"/>
</fileset>
</copy>
+
+ <!-- Copy the default configuration files (conf) -->
+ <mkdir dir="${release.conf}"/>
+ <copy todir="${release.conf}" filtering="no">
+ <fileset dir="${build.etc}/conf">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
- <!-- Make some directories -->
+ <!-- Setup the database directory (db) -->
+ <mkdir dir="${release.db}"/>
+ <copy todir="${release.db}" filtering="no">
+ <fileset dir="${build.etc}">
+ <include name="db.properties"/>
+ </fileset>
+ </copy>
<mkdir dir="${release.db}/hypersonic"/>
+ <copy todir="${release.db}/hypersonic" filtering="no">
+ <fileset dir="${build.etc}">
+ <include name="hypersonic.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- Setup the log file directory (log) -->
+ <mkdir dir="${release.log}"/>
+ <copy todir="${release.log}" filtering="no">
+ <fileset dir="${build.etc}">
+ <include name="log.properties"/>
+ </fileset>
+ </copy>
+
+ <!-- Setup the temporary file directory (tmp) -->
+ <mkdir dir="${release.tmp}"/>
+ <copy todir="${release.tmp}" filtering="no">
+ <fileset dir="${build.etc}">
+ <include name="tmp.properties"/>
+ </fileset>
+ </copy>
+
+ <!-- TODO: admin ? -->
+
+ <!-- TODO: dependency libraries -->
+
</target>
<target name="release-archive-prepare" depends="release">
1.1.2.8 +27 -5 jboss/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/Attic/config.xml,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- config.xml 2001/07/30 07:20:19 1.1.2.7
+++ config.xml 2001/07/30 23:52:29 1.1.2.8
@@ -7,7 +7,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.7 2001/07/30 07:20:19 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.8 2001/07/30 23:52:29 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -16,7 +16,7 @@
<!-- Module name(s) & version -->
<property name="module.name" value="server"/>
<property name="module.Name" value="JBoss Server"/>
- <property name="module.version" value="${build.number}"/>
+ <property name="module.version" value="2.5alpha"/>
<!-- ================================================================== -->
@@ -156,7 +156,7 @@
<property name="jboss.naming.root" value="${project.root}/naming/output"/>
<property name="jboss.naming.lib" value="${jboss.naming.root}/lib"/>
<path id="jboss.naming.classpath">
- <pathelement path="${jboss.naming.lib}/jboss-naming.jar"/>
+ <pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
</path>
<!-- *HACK* jboss-management (should be moved to a dependent module) -->
@@ -212,6 +212,8 @@
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
<property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.bin" value="${module.source}/bin"/>
+ <property name="source.docs" value="${module.source}/docs"/>
<property name="source.resources" value="${module.source}/resources"/>
<!-- Where build generated files will go -->
@@ -219,18 +221,38 @@
<property name="build.jars" value="${module.build}/lib"/>
<property name="build.api" value="${module.build}/api"/>
<property name="build.etc" value="${module.build}/etc"/>
+ <property name="build.bin" value="${module.build}/bin"/>
+ <property name="build.docs" value="${module.build}/docs"/>
<property name="build.resources" value="${module.build}/resources"/>
<!-- Where release generated files will go -->
- <property name="release.id" value="${module.name}-${build.id}"/>
+ <property name="release.id" value="${module.name}-${module.version}-${build.id}"/>
<property name="release.root" value="${module.release}/${release.id}"/>
+ <property name="release.bin" value="${release.root}/bin"/>
+ <property name="release.client" value="${release.root}/client"/>
+ <property name="release.conf" value="${release.root}/conf"/>
+ <property name="release.conf.default" value="${release.conf}/default"/>
+ <property name="release.db" value="${release.root}/db"/>
+ <property name="release.deploy" value="${release.root}/deploy"/>
+ <property name="release.deploy.lib" value="${release.deploy}/lib"/>
<property name="release.lib" value="${release.root}/lib"/>
<property name="release.lib.ext" value="${release.lib}/ext"/>
+ <property name="release.log" value="${release.root}/log"/>
+ <property name="release.tmp" value="${release.root}/tmp"/>
+
+ <!-- Documentation and examples -->
<property name="release.docs" value="${release.root}/docs"/>
- <property name="release.db" value="${release.root}/db"/>
+ <property name="release.examples" value="${release.docs}/examples"/>
<property name="release.api" value="${release.docs}/api"/>
+ <property name="release.module.docs" value="${release.docs}/${module.name}"/>
<property name="release.module.api" value="${release.api}/${module.name}"/>
+
+ <!-- Not really sure why these are here -->
+ <property name="release.admin" value="${release.root}/admin"/>
+ <property name="release.admin.client" value="${release.admin}/client"/>
+ <property name="release.admin.client.lib" value="${release.client}/lib"/>
+ <property name="release.admin.components" value="${release.admin}/components"/>
<!-- ================================================================== -->
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
