diff --git a/Makefile b/Makefile index a2311cc52d..55bc077bf9 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ VPATH += $(addprefix :,$(filter-out lib,$(patsubst -L%,%,$(filter -L%,$(LDFLAGS) CS_PROJECTS := flow/actorcompiler flow/coveragetool fdbclient/vexillographer CPP_PROJECTS := flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings/c bindings/java fdbmonitor bindings/flow/tester bindings/flow -OTHER_PROJECTS := bindings/python bindings/ruby bindings/nodejs bindings/go +OTHER_PROJECTS := bindings/python bindings/ruby bindings/go CS_MK_GENERATED := $(CS_PROJECTS:=/generated.mk) CPP_MK_GENERATED := $(CPP_PROJECTS:=/generated.mk) @@ -127,7 +127,7 @@ else endif @echo "#define FDB_VT_PACKAGE_NAME \"$(PACKAGE_NAME)\"" >> $@ -bindings: fdb_c fdb_python fdb_ruby fdb_java fdb_node fdb_flow fdb_flow_tester fdb_go fdb_go_tester +bindings: fdb_c fdb_python fdb_ruby fdb_java fdb_flow fdb_flow_tester fdb_go fdb_go_tester Makefiles: $(MK_GENERATED) diff --git a/bindings/bindingtester/known_testers.py b/bindings/bindingtester/known_testers.py index 683d79eba9..b7aca6808a 100644 --- a/bindings/bindingtester/known_testers.py +++ b/bindings/bindingtester/known_testers.py @@ -58,8 +58,6 @@ _java_cmd = 'java -ea -cp %s:%s com.apple.foundationdb.test.' % ( testers = { 'python': Tester('python', 'python ' + _absolute_path('python/tests/tester.py'), 2040, 23, MAX_API_VERSION, types=ALL_TYPES), 'python3': Tester('python3', 'python3 ' + _absolute_path('python/tests/tester.py'), 2040, 23, MAX_API_VERSION, types=ALL_TYPES), - 'node': Tester('node', _absolute_path('nodejs/tests/tester.js'), 53, 500, MAX_API_VERSION), - 'streamline': Tester('streamline', _absolute_path('nodejs/tests/streamline_tester._js'), 53, 500, MAX_API_VERSION), 'ruby': Tester('ruby', _absolute_path('ruby/tests/tester.rb'), 64, 23, MAX_API_VERSION), 'java': Tester('java', _java_cmd + 'StackTester', 2040, 510, MAX_API_VERSION, types=ALL_TYPES), 'java_async': Tester('java', _java_cmd + 'AsyncStackTester', 2040, 510, MAX_API_VERSION, types=ALL_TYPES), diff --git a/bindings/bindingtester/run_binding_tester.sh b/bindings/bindingtester/run_binding_tester.sh index 42af9d593f..b8d94e12e3 100644 --- a/bindings/bindingtester/run_binding_tester.sh +++ b/bindings/bindingtester/run_binding_tester.sh @@ -25,7 +25,7 @@ BREAKONERROR="${BREAKONERROR:-0}" RUNSCRIPTS="${RUNSCRIPTS:-1}" RUNTESTS="${RUNTESTS:-1}" RANDOMTEST="${RANDOMTEST:-0}" -BINDINGTESTS="${BINDINGTESTS:-python python3 java java_async ruby node go flow}" +BINDINGTESTS="${BINDINGTESTS:-python python3 java java_async ruby go flow}" LOGLEVEL="${LOGLEVEL:-INFO}" _BINDINGTESTS=(${BINDINGTESTS}) DISABLEDTESTS=() diff --git a/bindings/bindingtester/run_tester_loop.sh b/bindings/bindingtester/run_tester_loop.sh index d1eff08b43..d78915a489 100755 --- a/bindings/bindingtester/run_tester_loop.sh +++ b/bindings/bindingtester/run_tester_loop.sh @@ -24,7 +24,6 @@ function run_scripted() { scripted ruby scripted java scripted java_async - scripted node scripted go scripted flow } @@ -40,8 +39,6 @@ while `true`; do run ruby run java run java_async - run node - #run streamline run go run flow done diff --git a/build/tarball.py b/build/tarball.py deleted file mode 100644 index e440cfe9d8..0000000000 --- a/build/tarball.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/python -# -# tarball.py -# -# This source file is part of the FoundationDB open source project -# -# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -import tarfile -import argparse -import glob - - -def createTarball(outFile, rootDir, inFiles): - tar = tarfile.open(outFile, 'w:gz') - for fStr in inFiles: - for f in glob.glob(fStr): - if rootDir is None: - tar.add(f) - else: - tar.add(f, rootDir + "/" + f) - - tar.close() - - -if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Python tar utility') - parser.add_argument('-r', dest='rootDir', type=str, help='The root directory for files in the tarball') - parser.add_argument('outFile', type=str, help='The output tarball') - parser.add_argument('inFile', type=str, nargs='+', help='The files to put into the tarball') - - args = parser.parse_args() - createTarball(args.outFile, args.rootDir, args.inFile) diff --git a/documentation/sphinx/source/administration.rst b/documentation/sphinx/source/administration.rst index 0f165ace0d..46f297fd0f 100644 --- a/documentation/sphinx/source/administration.rst +++ b/documentation/sphinx/source/administration.rst @@ -611,7 +611,7 @@ For **RHEL/CentOS**, perform the upgrade using the rpm command: user@host$ sudo rpm -Uvh |package-rpm-clients| \\ |package-rpm-server| -The ``foundationdb-clients`` package also installs the :doc:`Python ` and :doc:`C ` APIs. If your clients use :doc:`Ruby `, `Java `_, :doc:`Node.js `, or `Go `_, follow the instructions in the corresponding language documentation to install the APIs. +The ``foundationdb-clients`` package also installs the :doc:`Python ` and :doc:`C ` APIs. If your clients use :doc:`Ruby `, `Java `_, or `Go `_, follow the instructions in the corresponding language documentation to install the APIs. Test the database ----------------- diff --git a/documentation/sphinx/source/api-common.rst.inc b/documentation/sphinx/source/api-common.rst.inc index 1574c6c3d1..71dbbb2561 100644 --- a/documentation/sphinx/source/api-common.rst.inc +++ b/documentation/sphinx/source/api-common.rst.inc @@ -443,7 +443,6 @@ .. |directory-create-or-open-blurb| replace:: Opens the directory with ``path`` specified as |dir-path-type| of strings. ``path`` can also be a string, in which case it will be automatically wrapped in |dir-path-type|. All string values in a path will be converted to unicode. If the directory does not exist, it is created (creating parent directories if necessary). -.. **NOTE** this blurb is not used in api-node .. |directory-create-or-open-return-blurb| replace:: Returns the directory and its contents as a |directory-subspace|. @@ -456,7 +455,6 @@ .. |directory-move-blurb| replace:: Moves the directory at ``old_path`` to ``new_path``. There is no effect on the physical prefix of the given directory or on clients that already have the directory open. The method will |error-raise-type| an |error-type| if a directory does not exist at ``old_path``, a directory already exists at ``new_path``, or the parent directory of ``new_path`` does not exist. -.. **NOTE** this blurb is not used in api-node .. |directory-move-return-blurb| replace:: Returns the directory at its new location as a |directory-subspace|. diff --git a/documentation/sphinx/source/api-reference.rst b/documentation/sphinx/source/api-reference.rst index 3ce84ab606..4527d2a6a8 100644 --- a/documentation/sphinx/source/api-reference.rst +++ b/documentation/sphinx/source/api-reference.rst @@ -12,7 +12,6 @@ The following documents give detailed descriptions of the API for each language: api-python api-ruby - Node.js API Java API Go API api-c diff --git a/documentation/sphinx/source/getting-started-linux.rst b/documentation/sphinx/source/getting-started-linux.rst index ff4838ee69..ff6759a3db 100644 --- a/documentation/sphinx/source/getting-started-linux.rst +++ b/documentation/sphinx/source/getting-started-linux.rst @@ -110,7 +110,7 @@ Managing the FoundationDB service Next steps ========== -* Install the APIs for :doc:`Ruby `, `Java `_, or :doc:`Node.js ` if you intend to use those languages. :doc:`Python ` and :doc:`C ` APIs were installed along with the ``foundationdb-clients`` package above. +* Install the APIs for :doc:`Ruby `, `Java `_, or `Go `_ if you intend to use those languages. :doc:`Python ` and :doc:`C ` APIs were installed along with the ``foundationdb-clients`` package above. * See :doc:`tutorials` for samples of developing applications with FoundationDB. * See :doc:`developer-guide` for information of interest to developers, including common design patterns and performance considerations. * See :doc:`administration` for detailed administration information. diff --git a/documentation/sphinx/source/getting-started-mac.rst b/documentation/sphinx/source/getting-started-mac.rst index 69e5bc96d7..8eacc2ce7a 100644 --- a/documentation/sphinx/source/getting-started-mac.rst +++ b/documentation/sphinx/source/getting-started-mac.rst @@ -101,7 +101,7 @@ Managing the FoundationDB service Next steps ========== -* Install the APIs for :doc:`Ruby `, `Java `_, or :doc:`Node.js ` if you intend to use those languages. :doc:`Python ` and :doc:`C ` APIs were installed using the FoundationDB installer above. +* Install the APIs for :doc:`Ruby `, `Java `_, or `Go `_ if you intend to use those languages. :doc:`Python ` and :doc:`C ` APIs were installed using the FoundationDB installer above. * See :doc:`tutorials` for samples of developing applications with FoundationDB. * See :doc:`developer-guide` for information of interest to developers, including common design patterns and performance considerations. * See :doc:`administration` for detailed administration information. diff --git a/foundationdb.sln b/foundationdb.sln index 8d8ac34005..f0162c7b60 100644 --- a/foundationdb.sln +++ b/foundationdb.sln @@ -64,22 +64,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MSIInstaller", "packaging\m {E2939DAA-238E-4970-96C4-4C57980F93BD} = {E2939DAA-238E-4970-96C4-4C57980F93BD} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdb_node_0_8", "bindings\nodejs\fdb_node_0_8.vcxproj", "{E936E200-689E-49FD-8463-32FE763F1860}" - ProjectSection(ProjectDependencies) = postProject - {CACB2C8E-3E55-4309-A411-2A9C56C6C1CB} = {CACB2C8E-3E55-4309-A411-2A9C56C6C1CB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdb_node_0_10", "bindings\nodejs\fdb_node_0_10.vcxproj", "{E22D4EF8-E75D-4281-93F9-A9F73936DE54}" - ProjectSection(ProjectDependencies) = postProject - {CACB2C8E-3E55-4309-A411-2A9C56C6C1CB} = {CACB2C8E-3E55-4309-A411-2A9C56C6C1CB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdb_node", "bindings\nodejs\fdb_node.vcxproj", "{9463CB25-DCA0-9D45-C46E-0A8E68EE7FAE}" - ProjectSection(ProjectDependencies) = postProject - {E936E200-689E-49FD-8463-32FE763F1860} = {E936E200-689E-49FD-8463-32FE763F1860} - {E22D4EF8-E75D-4281-93F9-A9F73936DE54} = {E22D4EF8-E75D-4281-93F9-A9F73936DE54} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdb_flow", "bindings\flow\fdb_flow.vcxproj", "{2BA0A5E2-EB4C-4A32-948C-CBAABD77AF87}" ProjectSection(ProjectDependencies) = postProject {00AC9087-0378-4872-9992-DF267CF12ACB} = {00AC9087-0378-4872-9992-DF267CF12ACB}