[Cdk-commits] CVS: cdk/packages/tar/cdk-bin/bin cdk-dbadmin.in,1.2,1.3 cdk-fileconvert.in,1.2,1.3 cdk-view.in,1.3,1.4

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/packages/tar/cdk-bin/bin
In directory usw-pr-cvs1:/tmp/cvs-serv4762/bin

Modified Files:
	cdk-dbadmin.in cdk-fileconvert.in cdk-view.in 
Log Message:
Added detection for Xerces and Log4J on user's system.


Index: cdk-dbadmin.in
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/bin/cdk-dbadmin.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cdk-dbadmin.in	2001/12/30 19:03:57	1.2
--- cdk-dbadmin.in	2002/02/06 12:36:07	1.3
***************
*** 1,11 ****
  #! /bin/sh -e
  
! PREFIX="@prefix@"
  
! JARLIBDIR="${PREFIX}/lib/cdk"
  JARLIBS=`ls -1 ${JARLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH="@PATHTORTJAR@:${JARLIBS}"
! 
! JAVA="@PATHTOJAVA@"
  
  ${JAVA} -cp ${CLASSPATH} org.openscience.cdk.database.DBAdmin $*
--- 1,13 ----
  #! /bin/sh -e
  
! PREFIX=@prefix@
! XERCESJAR=@PATHTOXERCES@
! LOGJAVA=@PATHTOLOGJAVA@
! RTJAR=@PATHTORTJAR@
! JAVA=@PATHTOJAVA@
  
! JARLIBDIR=${PREFIX}/lib/cdk
  JARLIBS=`ls -1 ${JARLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}
  
  ${JAVA} -cp ${CLASSPATH} org.openscience.cdk.database.DBAdmin $*

Index: cdk-fileconvert.in
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/bin/cdk-fileconvert.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cdk-fileconvert.in	2001/12/30 19:03:57	1.2
--- cdk-fileconvert.in	2002/02/06 12:36:07	1.3
***************
*** 1,11 ****
  #! /bin/sh -e
  
! PREFIX="@prefix@"
  
! JARLIBDIR="${PREFIX}/lib/cdk"
  JARLIBS=`ls -1 ${JARLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH="@PATHTORTJAR@:${JARLIBS}"
! 
! JAVA="@PATHTOJAVA@"
  
  ${JAVA} -cp ${CLASSPATH} org.openscience.cdk.applications.FileConvertor $*
--- 1,13 ----
  #! /bin/sh -e
  
! PREFIX=@prefix@
! XERCESJAR=@PATHTOXERCES@
! LOGJAVA=@PATHTOLOGJAVA@
! RTJAR=@PATHTORTJAR@
! JAVA=@PATHTOJAVA@
  
! JARLIBDIR=${PREFIX}/lib/cdk
  JARLIBS=`ls -1 ${JARLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}
  
  ${JAVA} -cp ${CLASSPATH} org.openscience.cdk.applications.FileConvertor $*

Index: cdk-view.in
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/bin/cdk-view.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** cdk-view.in	2002/01/25 13:13:04	1.3
--- cdk-view.in	2002/02/06 12:36:07	1.4
***************
*** 1,11 ****
  #! /bin/sh -e
  
! PREFIX="@prefix@"
  
! JARLIBDIR="${PREFIX}/lib/cdk"
  JARLIBS=`ls -1 ${JARLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH="@PATHTO3DJAR@:@PATHTORTJAR@:${JARLIBS}"
! 
! JAVA="@PATHTOJAVA@"
  
  # Collect -D options as java arguments
--- 1,13 ----
  #! /bin/sh -e
  
! PREFIX=@prefix@
! XERCESJAR=@PATHTOXERCES@
! LOGJAVA=@PATHTOLOGJAVA@
! RTJAR=@PATHTORTJAR@
! JAVA=@PATHTOJAVA@
  
! JARLIBDIR=${PREFIX}/lib/cdk
  JARLIBS=`ls -1 ${JARLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}
  
  # Collect -D options as java arguments