jython-checkins

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv8066

Modified Files:
	build.xml 
Log Message:
add com/ziclix

Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml	2001/08/19 14:39:33	1.16
--- build.xml	2001/11/20 04:58:58	1.17
***************
*** 2,9 ****
  
  <project name="jython" default="jar" basedir=".">
      <target name="init">
!         <property name="sourceDir" value="." />
!         <property name="outputDir" value="build" />
!         <property name="apidocDir" value="Doc/api" />
          <property name="debug" value="off" />
          <property name="optimize" value="on" />
--- 2,33 ----
  
  <project name="jython" default="jar" basedir=".">
+ 
+     <!--
+       This propery should be specified in the ant.property file
+       property name="javaccHome2" value="/opt/javacc2.0/bin/lib"
+     -->
+ 
+     <!-- Give users a change to override editing this file. -->
+     <property file="ant.properties" />
+ 
+     <!-- =================================================================== -->
+     <!-- Classpaths                                                          -->
+     <!-- =================================================================== -->
+     <path id="main.classpath">
+         <pathelement path="${informix.jar}"/>
+         <pathelement path="${oracle.jar}"/>
+         <pathelement path="${mysql.jar}"/>
+         <pathelement path="${postgresql.jar}"/>
+         <pathelement path="${jndi.jar}"/>
+         <pathelement path="${jdbc.jar}"/>
+         <pathelement path="${java.class.path}"/>
+         <pathelement location="${build.classes}"/>
+     </path>
+ 
      <target name="init">
! 
!         <property name="sourceDir" value="${basedir}" />
!         <property name="outputDir" value="${basedir}/build" />
!         <property name="apidocDir" value="${basedir}/Doc/api" />
          <property name="debug" value="off" />
          <property name="optimize" value="on" />
***************
*** 14,22 ****
          <available classname="org.gnu.readline.Readline" property="readline" />
  
!         <!-- This propery should be specified in the ant.property file
!            property name="javaccHome2" value="/opt/javacc2.0/bin/lib" /-->
  
!         <!-- Give users a change to override editing this file-->
!         <property file="ant.properties" />
      </target>
  
--- 38,77 ----
          <available classname="org.gnu.readline.Readline" property="readline" />
  
!         <available property="informix.present"
!             classname="com.informix.jdbc.IfxDriver"
!             classpath="${informix.jar}"
!         />
!         <available property="mysql.present"
!             classname="org.gjt.mm.mysql.Driver"
!             classpath="${mysql.jar}"
!         />
!         <available property="postgresql.present"
!             classname="org.postgresql.Driver"
!             classpath="${postgresql.jar}"
!         />
!         <available property="oracle.present"
!             classname="oracle.jdbc.driver.OracleDriver"
!             classpath="${oracle.jar}"
!         />
!         <available property="jndi.present"
!             classname="javax.naming.Context"
!             classpath="${jndi.jar}"
!         />
!         <available property="javax.sql.present"
!             classname="javax.sql.DataSource"
!             classpath="${jdbc.jar}"
!         />
  
!         <echo>--- Build environment for ${ant.project.name} ---</echo>
!         <echo>--- Flags (Note: If the {property name} is displayed, then the component is not present)</echo>
!         <echo/>
!         <echo>--- Optional Libraries ---</echo>
!         <echo>oracle      = ${oracle.present}</echo>
!         <echo>informix    = ${informix.present}</echo>
!         <echo>mysql       = ${mysql.present}</echo>
!         <echo>postgresql  = ${postgresql.present}</echo>
!         <echo>jndi        = ${jndi.present}</echo>
!         <echo>jdbc        = ${javax.sql.present}</echo>
! 
      </target>
  
***************
*** 40,45 ****
  
      <target name="tree" depends="prepare">
!         <jjtree 
!             javacchome="${javaccHome2}" 
              target="org/python/parser/python.jjt"
              outputdirectory="org/python/parser/"
--- 95,100 ----
  
      <target name="tree" depends="prepare">
!         <jjtree
!             javacchome="${javaccHome2}"
              target="org/python/parser/python.jjt"
              outputdirectory="org/python/parser/"
***************
*** 48,53 ****
  
      <target name="parser" depends="tree">
!         <javacc 
!             javacchome="${javaccHome2}" 
              target="org/python/parser/python.jj"
              outputdirectory="org/python/parser/"
--- 103,108 ----
  
      <target name="parser" depends="tree">
!         <javacc
!             javacchome="${javaccHome2}"
              target="org/python/parser/python.jj"
              outputdirectory="org/python/parser/"
***************
*** 58,66 ****
      </target>
  
!     <!-- 
        Only do this task if our environment is java2.
      -->
      <target name="check.javaversion" unless="java2">
!         <property name="exclude.java2.files" 
              value="**/CollectionProxy2.java,
                     **/Java2Accessibility.java,
--- 113,121 ----
      </target>
  
!     <!--
        Only do this task if our environment is java2.
      -->
      <target name="check.javaversion" unless="java2">
!         <property name="exclude.java2.files"
              value="**/CollectionProxy2.java,
                     **/Java2Accessibility.java,
***************
*** 75,89 ****
  
      <target name="check.servlet" unless="servlet">
!         <property name="exclude.servlet.files" 
              value="**/PyServlet.java"/>
      </target>
  
      <target name="check.weakref" unless="weakref">
!         <property name="exclude.weakref.files" 
              value="**/_weakref.java"/>
      </target>
  
      <target name="check.readline" unless="readline">
!         <property name="exclude.readline.files" 
              value="**/ReadlineConsole.java"/>
      </target>
--- 130,144 ----
  
      <target name="check.servlet" unless="servlet">
!         <property name="exclude.servlet.files"
              value="**/PyServlet.java"/>
      </target>
  
      <target name="check.weakref" unless="weakref">
!         <property name="exclude.weakref.files"
              value="**/_weakref.java"/>
      </target>
  
      <target name="check.readline" unless="readline">
!         <property name="exclude.readline.files"
              value="**/ReadlineConsole.java"/>
      </target>
***************
*** 95,127 ****
  
      <target name="compile" depends="prepare,parser,checks">
!         <javac 
!             srcdir="${sourceDir}/" 
!             includes="org/**"
!             destdir="${outputDir}/" 
!             excludes="org/python/parser/python.java,
!                       ${exclude.java2.files},
!                       ${exclude.servlet.files},
!                       ${exclude.weakref.files},
!                       ${exclude.readline.files}"
              debug="${debug}"
!             optimize="${optimize}"
!         />
  
!         <javac 
!             srcdir="${sourceDir}/Lib" 
              includes="jxxload_help/**"
!             destdir="${outputDir}/" 
              debug="${debug}"
              optimize="${optimize}"
          />
  
!        <copy file="org/python/modules/ucnhash.dat" 
               todir="${outputDir}/org/python/modules" />
      </target>
  
      <target name="jar" depends="compile">
!         <jar jarfile="jython.jar" 
!              basedir="${outputDir}" 
!              includes="**/*.class,**/ucnhash.dat" />
      </target>
  
--- 150,198 ----
  
      <target name="compile" depends="prepare,parser,checks">
!         <javac
!             srcdir="${sourceDir}/"
!             destdir="${outputDir}/"
              debug="${debug}"
!             optimize="${optimize}">
!             <include name="org/**"/>
!             <include name="com/**"/>
!             <exclude name="org/python/parser/python.java"/>
!             <exclude name="${exclude.java2.files}"/>
!             <exclude name="${exclude.servlet.files}"/>
!             <exclude name="${exclude.weakref.files}"/>
!             <exclude name="${exclude.readline.files}"/>
!             <exclude name="**/handler/InformixDataHandler.java" unless="informix.present"/>
!             <exclude name="**/handler/MySQLDataHandler.java" unless="mysql.present"/>
!             <exclude name="**/handler/OracleDataHandler.java" unless="oracle.present"/>
!             <exclude name="**/handler/PostgresqlDataHandler.java" unless="postgresql.present"/>
!             <exclude name="**/connect/Lookup.java" unless="jndi.present"/>
!             <exclude name="**/connect/Lookup.java" unless="javax.sql.present"/>
!             <exclude name="**/connect/Connectx.java" unless="javax.sql.present"/>
!             <classpath refid="main.classpath"/>
!         </javac>
  
!         <javac
!             srcdir="${sourceDir}/Lib"
              includes="jxxload_help/**"
!             destdir="${outputDir}/"
              debug="${debug}"
              optimize="${optimize}"
          />
  
!        <copy file="org/python/modules/ucnhash.dat"
               todir="${outputDir}/org/python/modules" />
+ 
+        <copy todir="${outputDir}/com">
+            <fileset dir="${sourceDir}/com">
+               <include name="**/*.properties"/>
+            </fileset>
+        </copy>
+ 
      </target>
  
      <target name="jar" depends="compile">
!         <jar jarfile="jython.jar"
!              basedir="${outputDir}"
!              includes="**/*.class,**/ucnhash.dat,**/*.properties" />
      </target>
  
***************
*** 130,137 ****
          <javadoc sourcepath="${sourceDir}"
                   destdir="${apidocDir}"
!                  Public="Yes"
                   packagenames="org.python.core,
!                                org.python.util"
!                  Windowtitle="Jython API documentation"
                   bottom="&lt;a href='http://www.jython.org'>Jython homepage&lt;/a>"
          />
--- 201,209 ----
          <javadoc sourcepath="${sourceDir}"
                   destdir="${apidocDir}"
!                  public="true"
                   packagenames="org.python.core,
!                                org.python.util,
!                                com.ziclix.python.sql"
!                  windowtitle="Jython API documentation"
                   bottom="&lt;a href='http://www.jython.org'>Jython homepage&lt;/a>"
          />
***************
*** 160,165 ****
      </target>
  
!     <target name="all" depends="init,clean,prepare,parser,compile,jar">
!     </target>
  </project>
  
--- 232,236 ----
      </target>
  
!     <target name="all" depends="init,clean,prepare,parser,compile,jar"/>
  </project>