Merge pull request #260 from DavidVujic/3-5-8-for-all-platforms

Use ZooKeeper C Client v3.5.8 in all platforms

Author: DavidVujic

.gitignore

@@ -2,8 +2,6 @@ build
 node_modules
 npm-debug.log
 .idea
-*.tgz
-deps/zookeeper*
-deps/apache-zookeeper-*/
+deps/zookeeper-client-c/
 .DS_Store
 package-lock.json

binding.gyp

@@ -19,22 +19,22 @@
             }],
             ['OS=="mac"',{
                 'include_dirs': [
-                    '<(module_root_dir)/deps/zookeeper/include',
-                    '<(module_root_dir)/deps/zookeeper/generated',
+                    '<(module_root_dir)/deps/zookeeper-client-c/include',
+                    '<(module_root_dir)/deps/zookeeper-client-c/generated',
                     '<!(node -e "require(\'nan\')")'
                 ],
-                'libraries': ['<(module_root_dir)/deps/zookeeper/.libs/libzookeeper_st.a'],
+                'libraries': ['<(module_root_dir)/deps/zookeeper-client-c/.libs/libzookeeper_st.a'],
                 'xcode_settings': {
                     'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
                     'MACOSX_DEPLOYMENT_TARGET': '<!(sw_vers -productVersion)'
                 }
             }],['OS=="linux"',{
                 'include_dirs': [
-                    '<(module_root_dir)/deps/zookeeper/include',
-                    '<(module_root_dir)/deps/zookeeper/generated',
+                    '<(module_root_dir)/deps/zookeeper-client-c/include',
+                    '<(module_root_dir)/deps/zookeeper-client-c/generated',
                     '<!(node -e "require(\'nan\')")'
                 ],
-                'libraries': ['<(module_root_dir)/deps/zookeeper/.libs/libzookeeper_st.a'],
+                'libraries': ['<(module_root_dir)/deps/zookeeper-client-c/.libs/libzookeeper_st.a'],
             }],['OS=="win"',{
                 'defines': ['WIN32', 'USE_STATIC_LIB'],
                 'msvs_settings': {
@@ -43,13 +43,13 @@
                     }
                 },
                 'include_dirs': [
-                    '<(module_root_dir)/deps/zookeeper/include',
-                    '<(module_root_dir)/deps/zookeeper/generated',
+                    '<(module_root_dir)/deps/zookeeper-client-c/include',
+                    '<(module_root_dir)/deps/zookeeper-client-c/generated',
                     '<!(node -e "require(\'nan\')")'
                 ],
                 'libraries': [
-                    '<(module_root_dir)/deps/zookeeper/Debug/zookeeper.lib',
-                    '<(module_root_dir)/deps/zookeeper/Debug/hashtable.lib',
+                    '<(module_root_dir)/deps/zookeeper-client-c/Debug/zookeeper.lib',
+                    '<(module_root_dir)/deps/zookeeper-client-c/Debug/hashtable.lib',
                     'msvcrt.lib',
                     'msvcmrt.lib',
                     'Ws2_32.lib',

deps/README.md

@@ -0,0 +1,10 @@
+### Developer: updating the ZooKeeper Client C source code
+
+This guide is extracted from the [official docs](https://github.com/apache/zookeeper/blob/master/zookeeper-client/zookeeper-client-c/README)
+
+1 Download the source code
+2 Navigate to the root folder: run ant compile_jute 
+3 Navigate to the zookeeper-client-c folder: run autoreconf -if
+4 compress the entire zookeeper-client-c folder and name it `zookeeper-client-c.tar.gz`
+   * On Mac OS X: `COPYFILE_DISABLE=1 tar -czvf zookeeper-client-c.tar.gz zookeeper-client-c`
+5 replace the existing compressed file in the deps folder

deps/apache-zookeeper-3.5.6.tar.gz

@@ -64,7 +64,7 @@
         "type-declarations": "tsc --outFile ./lib/typedeclarations.d.ts"
     },
     "engines": {
-        "node": ">=8.9.4"
+        "node": ">=10.0.0"
     },
     "types": "./lib/typedeclarations.d.ts"
 }

deps/zookeeper-client-c.tar.gz

@@ -0,0 +1,20 @@
+### Prebuilds
+
+Currently, there are prebuilt Node.js AddOns for Mac OS X and Windows. 
+Each platform has prebuilds for Node.js 12 and 14.
+
+
+#### Creating prebuilds
+Create prebuilds for Mac OS X:
+
+```bash
+npx prebuildify --arch x64 --platform darwin --target 12.18.4
+npx prebuildify --arch x64 --platform darwin --target 14.13.0
+```
+
+Create prebuilds for Windows 10:
+
+```bash
+npx prebuildify --arch x64 --platform win32 --target 12.13.0
+Npx prebuildify --arch x64 --platform win32 --target 14.13.0
+```

package.json

@@ -2,24 +2,6 @@ const shell = require('shelljs');
 const env = require('./env.js');
 const { exec } = require('./helper.js');
 
-function handleSunOS() {
-    const uname = shell.exec('uname -v');
-
-    if (uname.match('joyent_.*')) {
-        const res = shell.exec(`pkgin list | grep zookeeper-client-${env.zookeeperVersion}`);
-
-        if (res.code !== 0) {
-            shell.echo('You must install zookeeper before installing this module. Try:');
-            shell.echo(`pkgin install zookeeper-client-${env.zookeeperVersion}`);
-        }
-    }
-}
-
-if (env.isSunOs) {
-    handleSunOS();
-    shell.exit(0);
-}
-
 if (env.isAlreadyBuilt) {
     shell.echo('Zookeeper has already been built');
     shell.exit(0);

patches/CMakeLists.txt

@@ -19,40 +19,21 @@ function checkIfAlreadyBuilt(env) {
 }
 
 const isWindows = process.platform.toLowerCase().includes('win32');
-const isSunOs = process.platform.toLowerCase().includes('sunos');
 const rootFolder = setRoot({ isWindows });
 
-let zookeeperVersion;
-let downloadedFolderName;
-let sha512sum;
-const suffix = '.tar.gz';
-let downloadedFileName;
-
-if (isWindows) {
-    zookeeperVersion = '3.4.14';
-    downloadedFolderName = `zookeeper-${zookeeperVersion}`;
-    downloadedFileName = `${downloadedFolderName}${suffix}`;
-    sha512sum = `b2e03d95f8cf18b97a46e2f53871cef5a5da9d5d80b97009375aed7fb35368c440ca944c7e8b64efabbc065f6fb98bb86239f7c1491f0490efc71876d5a7f424  ${downloadedFileName}`;
-} else {
-    zookeeperVersion = '3.5.6';
-    downloadedFolderName = `apache-zookeeper-${zookeeperVersion}`;
-    downloadedFileName = `${downloadedFolderName}${suffix}`;
-    sha512sum = `7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0  ${downloadedFileName}`;
-}
+const zookeeperVersion = '3.5.8';
+const downloadedFolderName = 'zookeeper-client-c';
+const downloadedFileName = 'zookeeper-client-c.tar.gz';
 
 const variables = {
     rootFolder,
     workFolder: `${rootFolder}/deps`,
     buildFolder: `${rootFolder}/build/zk`,
     zookeeperVersion,
-    sha512sum,
     downloadedFolderName,
-    sourceFolder: `${rootFolder}/deps/zookeeper`,
-    patchesFolder: `${rootFolder}/patches`,
+    sourceFolder: `${rootFolder}/deps/zookeeper-client-c`,
     downloadedFileName,
-    downloadUrl: `http://archive.apache.org/dist/zookeeper/zookeeper-${zookeeperVersion}/${downloadedFileName}`,
     isWindows,
-    isSunOs,
     isVerbose: !!process.env.ZK_INSTALL_VERBOSE,
 };
 

patches/README.md

@@ -11,22 +11,6 @@ function exec(action) {
     return res.stdout;
 }
 
-async function retry(func, ...args) {
-    let res;
-
-    try {
-        res = await func(...args);
-    } catch (e) {
-        shell.echo(e.message);
-        shell.echo(`Retrying ${func.name}`);
-
-        res = await func(...args);
-    }
-
-    return res;
-}
-
 module.exports = {
     exec,
-    retry,
 };