cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ovi...@apache.org
Subject cvs commit: xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/scheme/util SchemeServletCmdLine.java
Date Tue, 02 Apr 2002 19:31:55 GMT
ovidiu      02/04/02 11:31:55

  Modified:    src/scratchpad/schecoon build.xml
  Removed:     src/scratchpad/schecoon/emacs .cvsignore README
                        sisc-servlet.bat.in sisc-servlet.in siscscheme.el
               src/scratchpad/schecoon/legal LICENSE.antlr
                        LICENSE.jakarta-oro
               src/scratchpad/schecoon/lib ant-antlr.jar antlr-2.7.2a2.jar
                        jakarta-oro-2.0.4.jar
                        rhino1.5r4-continuations-20020320.jar
               src/scratchpad/schecoon/scheme functions.scm sitemap.scm
                        sxml.scm utils.scm
               src/scratchpad/schecoon/src/org/apache/cocoon/flow
                        .cvsignore Translator.java flow.g
               src/scratchpad/schecoon/src/org/apache/cocoon/scheme/servlet
                        REPLEvalServlet.java REPLGenericServlet.java
               src/scratchpad/schecoon/src/org/apache/cocoon/scheme/sitemap
                        CocoonModule.java ContinuationsManager.java
                        SchemeEnvironmentFunctions.java
                        SchemeInterpreter.java SchemeInterpreterImpl.java
                        SchemeSitemap.java SchemeSitemapFunctions.java
                        SchemeSitemapHandler.java SitemapComponents.java
                        XMLtoSXML.java
               src/scratchpad/schecoon/src/org/apache/cocoon/scheme/util
                        SchemeServletCmdLine.java
  Log:
  Removed the Scheme-only dependencies in the implementation.
  
  Revision  Changes    Path
  1.13      +4 -69     xml-cocoon2/src/scratchpad/schecoon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/schecoon/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	21 Mar 2002 23:07:48 -0000	1.12
  +++ build.xml	2 Apr 2002 19:31:54 -0000	1.13
  @@ -49,7 +49,7 @@
       <property name="bin.dir"      value="./bin"/>
       <property name="webapp.dir"   value="./webapp"/>
       <property name="scheme.dir"     value="./scheme"/>
  -    <property name="emacs.dir"     value="./emacs"/>
  +
       <property name="root.dir"     value="../../.."/>
       <property name="tools.dir"    value="${root.dir}/tools"/>
   
  @@ -92,21 +92,8 @@
         <pathelement location="${root.dir}/${build.root}/cocoon/classes"/>
       </path>
   
  -    <!-- This task should be obsoleted with the next version of Ant
  -    (1.5?). The current 1.4.1 Ant has a broken ANTLR task. The one
  -    included here is compiled from Ant's CVS as of March 1, 2002 -->
  -    <taskdef name="myantlr"
  -	     classname="org.apache.tools.ant.taskdefs.optional.MyANTLR">
  -      <classpath>
  -        <pathelement path="./lib/ant-antlr.jar"/>
  -      </classpath>
  -    </taskdef>
  -
     </target>
   
  -  <!-- Add filters for loading database information from
  -       database.properties file
  -  -->
     <!-- =================================================================== -->
     <!-- Prepares the build directory                                        -->
     <!-- =================================================================== -->
  @@ -118,25 +105,15 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Generate the parser/lexer/tree walker for jWeave                    -->
  -  <!-- =================================================================== -->
  -  <target name="antlr" depends="prepare">
  -    <!-- Use the new antlr task which allows specifying the classpath -->
  -    <myantlr target="${src.dir}/org/apache/cocoon/flow/flow.g"
  -	   outputdirectory="${src.dir}/org/apache/cocoon/flow">
  -      <classpath refid="classpath"/>
  -    </myantlr>
  -  </target>
  -
  -  <!-- =================================================================== -->
     <!-- Compiles the source directory                                       -->
     <!-- =================================================================== -->
  -  <target name="compile" depends="prepare, antlr"
  +  <target name="compile" depends="prepare"
             description="Compiles the source code">
       <copy todir="${build.dest}">
         <fileset dir="${src.dir}">
           <include name="**/*.xsl"/>
           <include name="**/*.js"/>
  +        <include name="**/*.scm"/>
           <include name="**/*.xml"/>
         </fileset>
       </copy>
  @@ -206,24 +183,6 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Generate the heap from the Scheme files                             -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-heap" depends="init, prepare">
  -    <java classname="sisc.boot.GenerateHeap">
  -      <classpath refid="classpath"/>
  -      <arg value="-in"/>
  -      <arg value="${basedir}/${lib.dir}/sisc.heap"/>
  -      <arg value="-out"/>
  -      <arg value="${basedir}/${build.war}/${name}.heap"/>
  -      <arg value="-files"/>
  -      <arg value="${basedir}/${scheme.dir}/sxml.scm"/>
  -      <arg value="${basedir}/${scheme.dir}/utils.scm"/>
  -      <arg value="${basedir}/${scheme.dir}/functions.scm"/>
  -      <arg value="${basedir}/${scheme.dir}/sitemap.scm"/>
  -    </java>
  -  </target>
  -
  -  <!-- =================================================================== -->
     <!-- Creates the jar file                                                -->
     <!-- =================================================================== -->
     <target name="jar" depends="compile"
  @@ -234,28 +193,10 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Setup the script files                                              -->
  -  <!-- =================================================================== -->
  -  <target name="scripts">
  -    <copy todir="${emacs.dir}">
  -      <fileset dir="${emacs.dir}">
  -        <include name="*.in"/>
  -      </fileset>
  -      <filterset>
  -        <filter token="top" value="${basedir}"/>
  -      </filterset>
  -      <mapper type="glob" from="*.in" to="*"/>
  -    </copy>
  -    <chmod perm="a+x">
  -      <fileset dir="${emacs.dir}" includes="sisc-servlet"/>
  -    </chmod>
  -  </target>
  -
  -  <!-- =================================================================== -->
     <!-- Prepares everything to be run in place                              -->
     <!-- =================================================================== -->
     <target name="build" depends="prepare-webapp, prepare-webapp-libs,
  -	                        compile, prepare-heap, jar, scripts"
  +	                        compile, jar"
   	  description="Prepares everything to be run in place"/>
   
     <!-- =================================================================== -->
  @@ -314,12 +255,6 @@
     <target name="clean" depends="init" description="* Cleans the build directories">
       <delete dir="${build.dir}"/>
       <delete dir="${webapp.dir}/docs/dtd"/>
  -    <delete>
  -      <fileset dir="${emacs.dir}" includes="sisc-servlet.bat"/>
  -      <fileset dir="${emacs.dir}" includes="sisc-servlet"/>
  -      <fileset dir="${src.dir}/org/apache/cocoon/flow"
  -	       includes="FlowLexer.java, FlowParser*.*"/>
  -    </delete>
     </target>
   
     <target name="distclean" depends="clean" description="* Cleans everything to the original
state">
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message