[Cdk-commits] CVS: cdk/packages/tar/cdk-bin/bin cdk-dbadmin.in,1.5,1.6 cdk-fileconvert.in,1.5,1.6 cdk-view.in,1.7,1.8

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

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

Modified Files:
	cdk-dbadmin.in cdk-fileconvert.in cdk-view.in 
Log Message:
Fixed wishlist bug #564839: add support for SMILES in cdk-view/cdk.applications.Viewer.


Index: cdk-dbadmin.in
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/bin/cdk-dbadmin.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cdk-dbadmin.in	18 May 2002 18:20:46 -0000	1.5
--- cdk-dbadmin.in	29 Jul 2002 15:16:27 -0000	1.6
***************
*** 9,13 ****
  
  JARLIBS=`ls -1 ${CDKLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}
  
  ${JAVA} -Dcdk.debugging=true -cp ${CLASSPATH} org.openscience.cdk.database.DBAdmin $*
--- 9,14 ----
  
  JARLIBS=`ls -1 ${CDKLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CDKLIBS=`ls -1 ${PREFIX}/share/java/cdk*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}:${CDKLIBS}
  
  ${JAVA} -Dcdk.debugging=true -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.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cdk-fileconvert.in	18 May 2002 18:20:46 -0000	1.5
--- cdk-fileconvert.in	29 Jul 2002 15:16:27 -0000	1.6
***************
*** 9,13 ****
  
  JARLIBS=`ls -1 ${CDKLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}
  
  ${JAVA} -Dcdk.debugging=true -cp ${CLASSPATH} org.openscience.cdk.applications.FileConvertor $*
--- 9,14 ----
  
  JARLIBS=`ls -1 ${CDKLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CDKLIBS=`ls -1 ${PREFIX}/share/java/cdk*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}:${CDKLIBS}
  
  ${JAVA} -Dcdk.debugging=true -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.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cdk-view.in	18 May 2002 18:20:46 -0000	1.7
--- cdk-view.in	29 Jul 2002 15:16:27 -0000	1.8
***************
*** 10,14 ****
  
  JARLIBS=`ls -1 ${CDKLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}:${THREEDJAR}
  
  # Collect -D options as java arguments
--- 10,15 ----
  
  JARLIBS=`ls -1 ${CDKLIBDIR}/*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CDKLIBS=`ls -1 ${PREFIX}/share/java/cdk*.jar | perl -ne "s/\n|\r/:/g; print;"`
! CLASSPATH=${RTJAR}:${LOGJAVA}:${XERCESJAR}:${JARLIBS}:${THREEDJAR}:${CDKLIBS}
  
  # Collect -D options as java arguments