Author: bago
Date: Thu Mar 22 06:46:36 2007
New Revision: 521265
URL: http://svn.apache.org/viewvc?view=rev&rev=521265
Log:
Made jars-prefix a variable so we can tune wether to use "james-server-" as the
prefix for generated module jars or simply the module name (empty prefix)
Modified:
james/server/trunk/build-tools/base-build.xml
james/server/trunk/default.properties
Modified: james/server/trunk/build-tools/base-build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/build-tools/base-build.xml?view=diff&rev=521265&r1=521264&r2=521265
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Thu Mar 22 06:46:36 2007
@@ -191,21 +191,30 @@
</path>
<path
- id='classpath.dependencies.api'
- description="Convenient way to import all APIs">
- <!-- TODO Add content when APIs are broken out -->
+ id='classpath.dependencies.api'
+ description="Convenient way to import all APIs">
+ <!-- TODO Add content when APIs are broken out -->
+ <fileset dir="${lib.dir}/${path.lib.james}">
+ <include name="${jars-prefix}*-api-*.jar" />
+ </fileset>
</path>
<path
id='classpath.dependencies.libraries'
description="Convenient way to import all libraries and APIs">
<!-- TODO Add content when libraries are broken out -->
<path refid='classpath.dependencies.api'/>
+ <fileset dir="${lib.dir}/${path.lib.james}">
+ <include name="${jars-prefix}*-library-*.jar" />
+ </fileset>
</path>
<path
id='classpath.dependencies.functions'
description="Convenient way to import all functions, libraries
and APIs">
<!-- TODO Add content when functions are broken out -->
<path refid='classpath.dependencies.libraries'/>
+ <fileset dir="${lib.dir}/${path.lib.james}">
+ <include name="${jars-prefix}*-function-*.jar" />
+ </fileset>
</path>
</sequential>
</macrodef>
@@ -276,6 +285,7 @@
<attribute name='name'/>
<attribute name='bin'/>
<attribute name='lib'/>
+ <attribute name='prefix' default='${jars-prefix}'/>
<attribute name='version' default='${version}'/>
<attribute name='vendor.impl' default='${vendor.impl}'/>
<attribute name='vendor.spec' default='${vendor.spec}'/>
@@ -285,7 +295,7 @@
<mkdir dir='@{lib}'/>
<mkdir dir='@{bin}'/>
<jar
- jarfile="@{lib}/[EMAIL PROTECTED]@{version}.jar"
+ jarfile="@{lib}/@[EMAIL PROTECTED]@{version}.jar"
basedir="@{bin}">
<manifest>
<attribute name='Built-By' value='${user.name}'/>
Modified: james/server/trunk/default.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/default.properties?view=diff&rev=521265&r1=521264&r2=521265
==============================================================================
--- james/server/trunk/default.properties (original)
+++ james/server/trunk/default.properties Thu Mar 22 06:46:36 2007
@@ -7,6 +7,7 @@
# See also: include.properties
name=james-server
+jars-prefix=${name}-
sar-name=james
Name=James Mail Server
version=next-major
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
