donaldp 01/12/21 19:20:07
Modified: . build.xml
Log:
Moved wrapper.conf into ${phoenix.home}/conf directory.
Made sure wrapper exe is actually executable under unix.
Based on submission by: Leif Mortenson <[EMAIL PROTECTED]>
Revision Changes Path
1.96 +11 -5 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 2001/12/22 03:03:06 1.95
+++ build.xml 2001/12/22 03:20:07 1.96
@@ -82,7 +82,7 @@
</path>
<!-- Main target -->
- <target name="main" depends="wrapper-dist"
+ <target name="main" depends="dist-lite-wrapper"
description="generates the Phoenix distribution without the
javadocs"/>
<target name="all" depends="dist-lite" description="generates the Phoenix
distribution">
<ant target="docs" antfile="docs.xml" inheritall="false" />
@@ -108,7 +108,6 @@
</available>
</target>
-
<!-- Prepares the build directory -->
<target name="prepare" depends="check-environment">
@@ -219,6 +218,7 @@
<property name="bin.dist.apps" value="${bin.dist.dir}/apps"/>
<property name="bin.dist.ext" value="${bin.dist.dir}/ext"/>
<property name="bin.dist.lib" value="${bin.dist.dir}/lib"/>
+ <property name="bin.dist.conf" value="${bin.dist.dir}/conf"/>
<mkdir dir="${bin.dist.bin}"/>
<mkdir dir="${bin.dist.apps}"/>
@@ -258,16 +258,22 @@
</target>
<!-- Create the lite build -->
- <target name="wrapper-dist" depends="dist-lite" if="wrapper.present"
+ <target name="dist-lite-wrapper" depends="dist-lite" if="wrapper.present"
description="generates the Phoenix binary distribution without the
javadocs and with wrapper">
+ <!-- Wrapper filters -->
+ <filter token="app.name" value="phoenix"/>
+ <filter token="app.long.name" value="Phoenix Application Server"/>
+
<copy file="${wrapper.jar}" todir="${bin.dist.bin}"/>
<copy file="${wrapper.exe}" todir="${bin.dist.bin}"/>
<copy file="${wrapper.dll}" todir="${bin.dist.bin}"/>
- <copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.bin}"/>
+
+ <chmod file="${bin.dist.bin}/wrapper" perm="u+x"/>
+ <copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.conf}"/>
</target>
- <target name="install" depends="wrapper-dist,install-check-phoenix">
+ <target name="install" depends="dist-lite-wrapper,install-check-phoenix">
<mkdir dir="${phoenix.home}" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
