cziegeler    01/11/26 01:05:44

  Modified:    .        build.xml
  Log:
  Patches to build system inspired by Jeff Turner [[EMAIL PROTECTED]]
  
  Revision  Changes    Path
  1.110     +7 -10     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- build.xml 2001/11/26 08:33:23     1.109
  +++ build.xml 2001/11/26 09:05:44     1.110
  @@ -132,7 +132,6 @@
       <fileset dir="./lib">
         <include name="*.jar"/>
       </fileset>
  -    <pathelement path="${java.class.path}" />
     </path>
   
     <path id="scratchpad.classpath">
  @@ -141,7 +140,6 @@
       </fileset>
       <!-- FIXME : how to build a path that references a property set in 'init' 
target ? -->
       <pathelement path="./build/cocoon/classes"/>
  -    <pathelement path="${java.class.path}" />
     </path>
   
     <!-- =================================================================== -->
  @@ -397,17 +395,17 @@
     <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"
  @@ -1194,10 +1192,9 @@
       <chmod perm="+x" file="${dist.src.dir}/run.sh"/>
       <chmod perm="+x" file="${dist.src.dir}/build.sh"/>
       <chmod perm="+x" file="${dist.src.dir}/bin/antRun"/>
  -    <fixcrlf srcdir="${dist.src.dir}" includes="run.sh"       eol="lf"/>
  -    <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="**.sh"        eol="lf"/>
  +    <fixcrlf srcdir="${dist.src.dir}" includes="antRun"       eol="lf"/>
  +    <fixcrlf srcdir="${dist.src.dir}" includes="**.bat"      eol="crlf"/>
     </target>
   
     <!-- =================================================================== -->
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to