[Sqlshell-svn] /devel//

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2009-02-20 21:46:01 +0100 (Fri, 20 Feb 2009)
New Revision: 375

Modified:
   sqlshell
   sqlshell.bat
Log:
fix startup files
removed dll/so file depending on host system (.sh file or bat file)


Modified: sqlshell
===================================================================
--- sqlshell	2009-02-20 20:45:25 UTC (rev 374)
+++ sqlshell	2009-02-20 20:46:01 UTC (rev 375)
@@ -47,7 +47,8 @@
     CP=${CP}:${DRIVER}
 done
 
+#unix source.. cleanup windows dll
+rm ${WORKINGDIR}/lib/jcurses/*.dll
 #Enable the file below to use the jcurses version
 #${JAVA} -cp ${CP} nl.improved.sqlclient.jcurses.SQLShell $@
-#Charva version
 ${JAVA} -Djava.library.path=${CHARVA} -cp ${CP} nl.improved.sqlclient.SQLShell $@

Modified: sqlshell.bat
===================================================================
--- sqlshell.bat	2009-02-20 20:45:25 UTC (rev 374)
+++ sqlshell.bat	2009-02-20 20:46:01 UTC (rev 375)
@@ -13,20 +13,21 @@
 REM   limitations under the License.
 
 REM Dir to use as base for relative locations
-set WORKINGDIR=y:\sqlshell\sqlclient\
+set WORKINGDIR=y:\sqlshell\
 
 REM The directory where the JCurses jar and library are located.
 REM Please note that JCurses requires tje jcurses.jar and libjcurses.so to
 REM be located in the same directory.
-set JCURSES=%WORKINGDIR%\lib
 
 REM Where to find the SQLShell classes
-set SQLSHELL=%WORKINGDIR%\target\sqlshell-0.6.jar
+set SQLSHELL=%WORKINGDIR%\sqlshell.jar
 
-# REM providing drivers for the databases to support.
+REM providing drivers for the databases to support.
 set DRIVERS="%WORKINGDIR%\lib\hsqldb-1.8.0.jar"
 
 REM The classpath to use when running
-set CP=%WORKINGDIR%;%SQLSHELL%;%JCURSES%\jcurses.jar;%WORKINGDIR%\lib\charva\charva.jar;%WORKINGDIR%\lib\commons-logging.jar
+set CP=%WORKINGDIR%;%SQLSHELL%;%WORKINGDIR%\lib\jcurses\jcurses.jar;%WORKINGDIR%\lib\charva\charva.jar;%WORKINGDIR%\lib\commons-logging.jar
 
-java -Djava.library.path=%WORKINGDIR%\lib\charva -classpath %CP%;%DRIVERS% nl.improved.sqlclient.jcurses.SQLShell
+#windows source.. cleanup unix so files
+del %WORKINGDIR%\lib\jcurses\*.so
+java -Djava.library.path=%WORKINGDIR%\lib\charva;%WORKINGDIR%\lib\jcurses -classpath %CP%;%DRIVERS% nl.improved.sqlclient.SQLShell %*