You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by pg...@apache.org on 2002/10/20 23:03:51 UTC
cvs commit: jakarta-james build.xml
pgoldstein 2002/10/20 14:03:50
Modified: phoenix-bin/bin phoenix.sh
. build.xml
Log:
Added LF conversion for phoenix.sh to the build.xml
Changed the Phoenix directory variable from phoenix to phoenix.dir
Couldn't find the CRLF problem for phoenix.sh, but I did
remove several tabs.
Revision Changes Path
1.2 +4 -4 jakarta-james/phoenix-bin/bin/phoenix.sh
Index: phoenix.sh
===================================================================
RCS file: /home/cvs/jakarta-james/phoenix-bin/bin/phoenix.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phoenix.sh 25 Sep 2002 21:14:55 -0000 1.1
+++ phoenix.sh 20 Oct 2002 21:03:50 -0000 1.2
@@ -210,10 +210,10 @@
check)
echo "Checking arguments to Phoenix: "
- echo "PHOENIX_HOME: $PHOENIX_HOME"
- echo "PHOENIX_TMPDIR: $PHOENIX_TMPDIR"
- echo "PHOENIX_JVM_OPTS: $PHOENIX_JVM_OPTS"
- echo "JAVA_HOME: $JAVA_HOME"
+ echo "PHOENIX_HOME: $PHOENIX_HOME"
+ echo "PHOENIX_TMPDIR: $PHOENIX_TMPDIR"
+ echo "PHOENIX_JVM_OPTS: $PHOENIX_JVM_OPTS"
+ echo "JAVA_HOME: $JAVA_HOME"
echo "JVM_OPTS: $JVM_OPTS"
echo "CLASSPATH: $CLASSPATH"
echo "RUN_CMD: $RUN_CMD"
1.112 +6 -4 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- build.xml 26 Sep 2002 11:52:07 -0000 1.111
+++ build.xml 20 Oct 2002 21:03:50 -0000 1.112
@@ -100,8 +100,8 @@
===================================================================
-->
<property name="lib.dir" value="lib"/>
- <property name="phoenix" value="phoenix-bin"/>
- <property name="phoenix.lib.dir" value="${phoenix}/lib"/>
+ <property name="phoenix.dir" value="phoenix-bin"/>
+ <property name="phoenix.lib.dir" value="${phoenix.dir}/lib"/>
<!--
===================================================================
@@ -157,7 +157,7 @@
<available property="jdbc3.present" classname="java.sql.Savepoint"/>
<mkdir dir="${dist.dir}"/>
<copy todir="${dist.dir}">
- <fileset dir="${phoenix}">
+ <fileset dir="${phoenix.dir}">
<exclude name="CVS/**"/>
</fileset>
<fileset dir=".">
@@ -170,8 +170,10 @@
<fixcrlf srcdir="${java.dir}" includes="**/*.minfo" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${java.dir}" includes="**/*.xinfo" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${conf.dir}" includes="**/*.xml" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${dist.dir}/bin" includes="run.sh" eol="lf"/>
<fixcrlf srcdir="${dist.dir}/bin" includes="run.bat" eol="crlf"/>
+ <fixcrlf srcdir="${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
<chmod perm="+x">
<fileset dir="${dist.dir}/bin">
<include name="run.sh"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>