Hi,

The attached patch for build.xml does the following:

 - JDK 1.3 and higher includes javax.naming.* in
   ${java.home}/lib/rt.jar, so include this jar in the default
   classpath.
 - Fix the EOLs for appendcp.bat. Without this, I suspect Windows users
   would be unable to build Cocoon (if the src distro was built on a
   *nix box).
 - Fix a typo and capitalization.


Btw, I really like the warnings about missing optional packages :) It
would be nice if a URL for each was given, instead of just 'Get the Xxx
package ..'.

--Jeff

Index: build.xml
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/build.xml,v
retrieving revision 1.107
diff -u -r1.107 build.xml
--- build.xml   2001/11/24 16:46:44     1.107
+++ build.xml   2001/11/25 02:17:53
@@ -133,6 +133,7 @@
       <include name="*.jar"/>
     </fileset>
     <pathelement path="${java.class.path}" />
+    <pathelement path="${java.home}/lib/rt.jar" />
   </path>
 
   <path id="scratchpad.classpath">
@@ -397,21 +398,21 @@
   <target name="php-warn" unless="php.present" depends="optional-tests"
       description="Outputs a warning if net.php.* classes are missing during 
compilation">
     <antcall target="op-warning">
-      <param name="thing" value="Php"/>
+      <param name="thing" value="PHP"/>
       <param name="recovery" 
-        value="Get the php servlet and place the jar in the lib dir"/>
+        value="Get the PHP servlet and place the jar in the lib dir"/>
       <param name="message"
-             value="Php is required for the php generator."/>
+             value="PHP is required for the PHP generator."/>
     </antcall>
   </target>  
   <target name="naming-warn" unless="naming.present" depends="optional-tests"
       description="Outputs a warning if javax.naming.* classes are missing during 
compilation">
     <antcall target="op-warning">
-      <param name="thing" value="JDNI"/>
+      <param name="thing" value="JNDI"/>
       <param name="recovery" 
         value="Get the jndi.jar from Sun and place the jar in the lib dir"/>
       <param name="message"
-             value="JNDI is required for the ldap generator and the parentcm 
generator."/>
+             value="JNDI is required for the LDAP generator and the parentcm 
+generator."/>
     </antcall>
   </target>  
   <target name="svg-warn" unless="svg.present" depends="optional-tests"
@@ -1198,6 +1199,7 @@
     <fixcrlf srcdir="${dist.src.dir}" includes="run.bat"      eol="crlf"/>
     <fixcrlf srcdir="${dist.src.dir}" includes="build.sh"     eol="lf"/>
     <fixcrlf srcdir="${dist.src.dir}" includes="build.bat"    eol="crlf"/>
+    <fixcrlf srcdir="${dist.src.dir}" includes="appendcp.bat" eol="crlf"/>
   </target>
 
   <!-- =================================================================== -->

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to