[Jython-checkins] CVS: jython build.xml,1.19,1.20

[Finn B. <bc...@us...>]

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

Modified Files:
	build.xml 
Log Message:
Reworked dependency checking to match brian's work on zxJDBC. Also made
zxJDBC depend on java2 collections.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** build.xml	2001/11/25 13:23:27	1.19
--- build.xml	2001/11/25 16:12:55	1.20
***************
*** 34,40 ****
  
          <available classname="java.util.List" property="java2" />
!         <available classname="javax.servlet.Servlet" property="servlet" />
!         <available classname="java.lang.ref.WeakReference" property="weakref" />
!         <available classname="org.gnu.readline.Readline" property="readline" />
  
          <available property="informix.present"
--- 34,60 ----
  
          <available classname="java.util.List" property="java2" />
! 
!         <available property="java2collection.present"
!             classname="java.util.List"
!         />
!         <available property="threadlocal.present"
!             classname="java.lang.ThreadLocal"
!         />
!         <available property="secureclassloader.present"
!             classname="java.security.SecureClassLoader"
!         />
!         <available property="java2accessible.present"
!             classname="java.lang.reflect.AccessibleObject"
!         />
!         <available property="weakref.present"
!             classname="java.lang.ref.WeakReference"
!         />
!         <available property="servlet.present" 
!             classname="javax.servlet.Servlet"
!         />
! 
!         <available property="readline.present"
!             classname="org.gnu.readline.Readline"
!         />
  
          <available property="informix.present"
***************
*** 68,71 ****
--- 88,94 ----
          <echo/>
          <echo>--- Optional Libraries ---</echo>
+         <echo>java2 coll  = ${java2collection.present}</echo>
+         <echo>servlet     = ${servlet.present}</echo>
+         <echo>readline    = ${readline.present}</echo>
          <echo>oracle      = ${oracle.present}</echo>
          <echo>informix    = ${informix.present}</echo>
***************
*** 113,154 ****
          <touch file="org/python/parser/python.java" />
      </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,
-                    **/InternalTables2.java,
-                    **/ThreadStateMapping2.java,
-                    **/WeakInternalTables.java,
-                    **/AutoInternalTables.java,
-                    **/SoftIInternalTables.java
-                    **/BytecodeLoader2.java
-             "/>
-     </target>
- 
-     <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>
- 
-     <target name="checks" depends="check.javaversion,
-                                    check.servlet,
-                                    check.weakref,
-                                    check.readline" />
  
!     <target name="compile" depends="prepare,parser,checks">
          <javac
              srcdir="${sourceDir}/"
--- 136,141 ----
          <touch file="org/python/parser/python.java" />
      </target>
  
!     <target name="compile" depends="prepare,parser">
          <javac
              srcdir="${sourceDir}/"
***************
*** 157,166 ****
              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"/>
--- 144,176 ----
              optimize="${optimize}">
              <include name="org/**"/>
              <exclude name="org/python/parser/python.java"/>
! 
!             <include name="com/ziclix/python/sql/**"
!                      if="java2collection.present"/>
! 
!             <exclude name="**/CollectionProxy2.java"
!                      unless="java2collection.present"/>
!             <exclude name="**/Java2Accessibility.java"
!                      unless="java2accessible.present"/>
!             <exclude name="**/BytecodeLoader2.java"
!                      unless="secureclassloader.present"/>
!             <exclude name="**/ThreadStateMapping2.java"
!                      unless="threadlocal.present"/>
! 
!             <exclude name="**/InternalTables2.java"
!                      unless="weakref.present"/>
!             <exclude name="**/WeakInternalTables.java"
!                      unless="weakref.present"/>
!             <exclude name="**/AutoInternalTables.java"
!                      unless="weakref.present"/>
!             <exclude name="**/SoftIInternalTables.java"
!                      unless="weakref.present"/>
!             <exclude name="**/_weakref.java"
!                      unless="weakref.present"/>
! 
!             <exclude name="**/PyServlet.java" unless="servlet.present"/>
!             <exclude name="**/ReadlineConsole.java"
!                      unless="readline.present"/>
! 
              <exclude name="**/handler/InformixDataHandler.java" unless="informix.present"/>
              <exclude name="**/handler/MySQLDataHandler.java" unless="mysql.present"/>
***************
*** 186,190 ****
         <copy todir="${outputDir}/com">
             <fileset dir="${sourceDir}/com">
!               <include name="**/*.properties"/>
             </fileset>
         </copy>
--- 196,200 ----
         <copy todir="${outputDir}/com">
             <fileset dir="${sourceDir}/com">
!               <include name="**/*.properties" if="java2collection.present"/>
             </fileset>
         </copy>