shuber 2005/04/21 14:26:57 CEST
Modified files:
. build.xml
Log:
Also make context name variable.
Revision Changes Path
1.11 +3 -2 jahia_update/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/build.xml.diff?r1=1.10&r2=1.11&f=h
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/jahia_update/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 21 Apr 2005 12:13:46 -0000 1.10
+++ build.xml 21 Apr 2005 12:26:57 -0000 1.11
@@ -14,6 +14,7 @@
<property file="${ant.build.properties.file}"/>
<property name="AppName" value="jahia"/>
+ <property name="contextName" value="${AppName}"/>
<property name="PkgName" value="JahiaUpdate"/>
<property name="version" value="1.0"/>
@@ -46,7 +47,7 @@
<property name="build.dist" value="${build.base}/dist"/>
<property name="build.javadoc" value="${doc.base}/javadoc"/>
- <property name="deploy.base"
value="${deploy.webappsroot}/${AppName}"/>
+ <property name="deploy.base"
value="${deploy.webappsroot}/${contextName}"/>
<property name="deploy.webinf" value="${deploy.base}/WEB-INF"/>
<property name="deploy.classes" value="${deploy.webinf}/classes"/>
<property name="deploy.lib" value="${deploy.webinf}/lib"/>
@@ -112,7 +113,7 @@
<!-- ===================================================================
-->
<target name="resources" depends="compile, package">
<mkdir dir="${build.classes}/${resources}" />
- <jar basedir="${deploy.webappsroot}/jahia"
+ <jar basedir="${deploy.webappsroot}/${contextName}"
jarfile="${build.classes}/${resources}/${resourceName}">
<!--
