Changeset: 2d91ed794054 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d91ed794054 Removed Files: java/ChangeLog java/ChangeLog-Archive java/ChangeLog.Jun2016 java/Makefile.ag java/SQLSTATEs java/build.properties java/build.xml java/example/MJDBCTest.java java/example/PreparedExample.java java/example/SQLImport.java java/example/SQLcopyinto.java java/jdbc-3_0-fr-spec.pdf java/jdbc4.0-fr-spec.pdf java/pom.xml java/release.txt java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java java/src/main/java/nl/cwi/monetdb/merovingian/Control.java java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java java/src/main/java/nl/cwi/monetdb/util/Exporter.java java/src/main/java/nl/cwi/monetdb/util/Extract.java java/src/main/java/nl/cwi/monetdb/util/OptionsException.java java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java java/src/main/java/nl/cwi/monetdb/util/SQLRestore.java java/src/main/java/nl/cwi/monetdb/util/XMLExporter.java java/tests/BugConcurrent_clients_SF_1504657.java java/tests/BugConcurrent_sequences.java java/tests/BugDatabaseMetaData_Bug_3356.java java/tests/BugDecimalRound_Bug_3561.java java/tests/Makefile.ag java/tests/Test_Cautocommit.java java/tests/Test_Cforkbomb.java java/tests/Test_CisValid.java java/tests/Test_Clargequery.java java/tests/Test_Cmanycon.java java/tests/Test_Creplysize.java java/tests/Test_Csavepoints.java java/tests/Test_Csendthread.java java/tests/Test_Ctransaction.java java/tests/Test_Dobjects.java java/tests/Test_FetchSize.java java/tests/Test_Int128.java java/tests/Test_PSgeneratedkeys.java java/tests/Test_PSgetObject.java java/tests/Test_PSlargeamount.java java/tests/Test_PSlargebatchval.java java/tests/Test_PSlargeresponse.java java/tests/Test_PSmanycon.java java/tests/Test_PSmetadata.java java/tests/Test_PSsomeamount.java java/tests/Test_PSsqldata.java java/tests/Test_PStimedate.java java/tests/Test_PStimezone.java java/tests/Test_PStypes.java java/tests/Test_Rbooleans.java java/tests/Test_Rmetadata.java java/tests/Test_Rpositioning.java java/tests/Test_Rsqldata.java java/tests/Test_Rtimedate.java java/tests/Test_Sbatching.java java/tests/Test_Smoreresults.java java/tests/build.properties java/tests/build.xml java/tests/drop.sql java/version.sh Modified Files: Makefile.ag MonetDB.spec NT/rules.msc buildtools/autogen/autogen/am.py buildtools/autogen/autogen/msc.py buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst configure.ag debian/rules testing/Mtest.py.in Branch: default Log Message:
Removed Java (JDBC) code: it's now in its own repository. See http://dev.monetdb.org/hg/monetdb-java/ or ssh://h...@dev.monetdb.org/monetdb-java/. diffs (truncated from 27594 to 300 lines): diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -10,7 +10,6 @@ SUBDIRS = buildtools common clients \ HAVE_SQL?sql \ HAVE_GEOM?geom \ tools \ - HAVE_JAVA?java \ HAVE_TESTING?testing \ EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -845,10 +845,8 @@ developer, but if you do want to test, t --enable-gsl=yes \ --enable-instrument=no \ --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \ - --enable-jdbc=no \ --enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \ --enable-mapi=yes \ - --enable-merocontrol=no \ --enable-microhttpd=no \ --enable-monetdb5=yes \ --enable-netcdf=no \ @@ -860,12 +858,10 @@ developer, but if you do want to test, t --enable-sql=yes \ --enable-strict=no \ --enable-testing=yes \ - --with-ant=no \ --with-bz2=yes \ --with-curl=yes \ --with-gdal=%{?with_lidar:yes}%{!?with_lidar:no} \ --with-geos=%{?with_geos:yes}%{!?with_geos:no} \ - --with-java=no \ --with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \ --with-libxml2=yes \ --with-lzma=yes \ diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -198,9 +198,6 @@ GENDLL = RC = rc MT = mt /nologo -JAVAC = javac -JAR = jar -ANT = ant.bat # no need to edit beyond here.. @@ -324,23 +321,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_HGE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_JAVA - $(ECHO) HAVE_JAVA_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!IFDEF HAVE_JAVAJDBC - $(ECHO) HAVE_JAVAJDBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_JAVAJDBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF -!IFDEF HAVE_JAVAMEROCONTROL - $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF -!ELSE - $(ECHO) HAVE_JAVA_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" - $(ECHO) HAVE_JAVAJDBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" - $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_LIBBZ2 $(ECHO) HAVE_LIBBZ2_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -460,7 +440,6 @@ update_winconfig_conds_py: create_wincon CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \ "$(TOPDIR)\winconfig_conds.py" \ "prefix=$(prefix)" \ - "JDBCCLIENT_JAR=$(JDBCCLIENT_JAR)" \ "LIBICONV=$(LIBICONV)" \ "LIBXML2=$(LIBXML2)" \ "LIBZLIB=$(LIBZLIB)" \ diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py --- a/buildtools/autogen/autogen/am.py +++ b/buildtools/autogen/autogen/am.py @@ -812,73 +812,6 @@ def am_library(fd, var, libmap, am): am_deps(fd, libmap['DEPS'], am) -def am_ant(fd, var, ant, am): - - target = var[4:] # the ant target to call - - jd = "JAVADIR" - if "DIR" in ant: - jd = ant["DIR"][0] # use first name given - jd = am_translate_dir(jd, am) - - #if "SOURCES" in ant: - #for src in ant['SOURCES']: - #am['EXTRA_DIST'].append(src) - - fd.write("\nif HAVE_JAVA\n\n") # there is ant if configure set HAVE_JAVA - - if "COND" in ant: - fd.write("\nif " + ant["COND"][0] +"\n\n") - - fd.write("\n%s_ant_target:\n\t\"$(ANT)\" -f \"`$(anttranslatepath) $(srcdir)/build.xml`\" -Dbuilddir=\"`$(anttranslatepath) $(PWD)`/%s\" -Djardir=\"`$(anttranslatepath) $(PWD)`\" -Dbasedir=\"`$(anttranslatepath) $(srcdir)`\" %s\n" % (target, target, target)) - - for file in ant['FILES']: - sfile = file.replace(".", "_") - fd.write("\n%s: %s_ant_target\n" % (file, target)) - - fd.write("install-exec-local-%s: %s\n" % (sfile, file)) - fd.write("\t-mkdir -p $(DESTDIR)%s\n" % jd) - fd.write("\t$(INSTALL) $< $(DESTDIR)%s/%s\n" % (jd, file)) - - fd.write("uninstall-local-%s:\n" % sfile) - fd.write("\t$(RM) $(DESTDIR)%s/%s\n" % (jd, file)) - - fd.write("all-local-%s: %s\n" % (sfile, file)) - - am['ALL'].append(sfile) - - if "COND" in ant: - fd.write("\nelse\n\n") - - for file in ant['FILES']: - sfile = file.replace(".", "_") - fd.write("install-exec-local-%s:\n" % sfile) - fd.write("uninstall-local-%s:\n" % sfile) - fd.write("all-local-%s:\n" % sfile) - - if "COND" in ant: - fd.write("\nendif !" + ant["COND"][0] + "\n\n") - - fd.write("\nelse\n\n") - - for file in ant['FILES']: - sfile = file.replace(".", "_") - fd.write("install-exec-local-%s:\n" % sfile) - fd.write("uninstall-local-%s:\n" % sfile) - fd.write("all-local-%s:\n" % sfile) - - fd.write("\nendif !HAVE_JAVA\n\n") - - if "COND" in ant: - cond = "#" + ant["COND"][0] - else: - cond = "" - for file in ant['FILES']: - sfile = file.replace(".", "_") - am['INSTALL'].append(sfile) - am['UNINSTALL'].append(sfile) - am['InstallList'].append("\t" + jd + "/" + file + cond + "\n") - def am_add_srcdir(path, am, prefix =""): dir = path if dir[0] == '$': @@ -937,7 +870,6 @@ output_funcs = {'SUBDIRS': am_subdirs, 'smallTOC_SHARED_MODS': am_mods_to_libs, 'largeTOC_SHARED_MODS': am_mods_to_libs, 'HEADERS': am_headers, - 'ANT': am_ant, } def output(tree, cwd, topdir, automake, conditional): diff --git a/buildtools/autogen/autogen/msc.py b/buildtools/autogen/autogen/msc.py --- a/buildtools/autogen/autogen/msc.py +++ b/buildtools/autogen/autogen/msc.py @@ -856,58 +856,6 @@ def msc_includes(fd, var, values, msc): + msc_add_srcdir(i, msc, " -I") fd.write("INCLUDES = " + incs + "\n") -callantno = 0 -def msc_ant(fd, var, ant, msc): - global callantno - - target = var[4:] # the ant target to call - - jd = "JAVADIR" - if "DIR" in ant: - jd = ant["DIR"][0] # use first name given - jd = msc_translate_dir(jd, msc) - - if "SOURCES" in ant: - for src in ant['SOURCES']: - msc['EXTRA_DIST'].append(src) - - if 'COND' in ant: - condname = 'defined(' + ') && defined('.join(ant['COND']) + ')' - condname = 'defined(HAVE_JAVA) && ' + condname - else: - condname = 'defined(HAVE_JAVA)' - fd.write("\n!IF %s\n\n" % condname) # there is ant if configure set HAVE_JAVA - - # we create a bat file that contains the call to ant so that we - # can get hold of the full path name of the current working - # directory - fd.write("callant%d.bat:\n" % callantno) - fd.write("\techo @set thisdir=%%~dp0>callant%d.bat\n" % callantno) - fd.write("\techo @set thisdir=%%thisdir:~0,-1%%>>callant%d.bat\n" % callantno) - fd.write("\techo @$(ANT) -f $(srcdir)\\build.xml \"-Dbuilddir=%%thisdir%%\\%s\" \"-Djardir=%%thisdir%%\" %s>>callant%d.bat\n" % (target, target, callantno)) - fd.write("%s_ant_target: callant%d.bat\n" % (target, callantno)) - fd.write("\tcallant%d.bat\n" % callantno) - callantno = callantno + 1 - - - # install is done at the end, here we simply collect to be installed files - # INSTALL expects a list of dst,src,ext,install_directory,'lib?'. - for file in ant['FILES']: - sfile = file.replace(".", "_") - fd.write('%s: %s_ant_target\n' % (file, target)) - msc['INSTALL'][file] = file, '', jd, '', condname - - fd.write("\n!ELSE\n\n") - - fd.write('%s:\n' % file) - fd.write('install_%s:\n' % file) - fd.write("%s_ant_target:\n" % target) - - fd.write("\n!ENDIF #%s\n\n" % condname) - - # make sure the jars and classes get made - msc['SCRIPTS'].append(target + '_ant_target') - output_funcs = {'SUBDIRS': msc_subdirs, 'EXTRA_DIST': msc_extra_dist, 'EXTRA_HEADERS': msc_extra_headers, @@ -923,7 +871,6 @@ output_funcs = {'SUBDIRS': msc_subdirs, 'smallTOC_SHARED_MODS': msc_mods_to_libs, 'largeTOC_SHARED_MODS': msc_mods_to_libs, 'HEADERS': msc_headers, - 'ANT': msc_ant, } def output(tree, cwd, topdir): diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst --- a/buildtools/doc/HowToRelease.rst +++ b/buildtools/doc/HowToRelease.rst @@ -117,12 +117,10 @@ Releasing correct compiler, i.e., Microsoft Visual Studio 8, and options: Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1 - HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1 - HAVE_MONETDB5=1`` + HAVE_PYTHON=1 HAVE_PCRE=1 HAVE_MONETDB5=1`` Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1 - HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 - HAVE_PCRE=1`` + HAVE_MONETDB5=1 HAVE_PYTHON=1 HAVE_PCRE=1`` - Create PGP signatures and SHA1 checksums:: diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -59,11 +59,7 @@ clients Also known as the MonetDB Client component contains a library which forms the basis for communicating with the MonetDB server components, and some interface programs that use this library to communicate with -the server. Additionally, this component contains modules for some -other languages (Python, Perl, PHP, Ruby) to enable communication with -the server from programs written in those languages. The Python and -Ruby modules can be built separately; the PHP module does not need to -be built. This component is required. +the server. This component is required. monetdb5 -------- @@ -91,12 +87,6 @@ geom The geom component provides a module for the MonetDB SQL frontend. This component is optional. -java ----- - -Also known as MonetDB Java, this component provides the MonetDB JDBC -driver. This component is optional. - testing ------- @@ -692,62 +682,6 @@ refers to the location where you install __ https://github.com/ivmai/libatomic_ops -Perl ----- - -There is a Perl__ interface that can be used from a Perl program to -communicate with a MonetDB server. This interface is written -completely in Perl, so there is no compilation involved. This means -that no installation of Perl is required for building, but only for -testing. - -We have used ActiveState__'s ActivePerl__ distribution (release -5.12.1.1201). Just install the 32 or 64 bit version. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
