Skip to content

Loading…

Use relative path for zookeeper.node symlink #91

Merged
merged 3 commits into from

2 participants

@devoncrouse

Addresses #90

If this is acceptable, please npm publish. Thanks!

Change-Id: I1d062db4a58a076eaaf667785968df9342d834a3

Devon Crouse added some commits
Devon Crouse Use relative path for zookeeper.node symlink
Change-Id: I1d062db4a58a076eaaf667785968df9342d834a3
e317e12
Devon Crouse Minor cleanup in symlink script
Change-Id: I4ee40ed2532fdbcdf273769bfd187c10dc520b83
0829ea9
@kuebk
Collaborator

Version should be 3.4.5-2, please fix it and I'll merge.

@devoncrouse

I can update, but out of curiosity: why update the pre-release for the same patch instead of the patch itself?

http://semver.org/

@kuebk
Collaborator

3.4.5 stands for the ZK version used.

Devon Crouse Updated version according to package convention
Change-Id: I0184c5e27fcff76757ca9ee2f6f160974a15a665
64ae3c0
@devoncrouse

Version is fixed; everything look okay for merge?

@kuebk kuebk merged commit d02b6d7 into yfinkelstein:master
@kuebk
Collaborator

Merged, thanks.

@kuebk
Collaborator

Published to NPM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 20, 2013
  1. Use relative path for zookeeper.node symlink

    Devon Crouse committed
    Change-Id: I1d062db4a58a076eaaf667785968df9342d834a3
  2. Minor cleanup in symlink script

    Devon Crouse committed
    Change-Id: I4ee40ed2532fdbcdf273769bfd187c10dc520b83
  3. Updated version according to package convention

    Devon Crouse committed
    Change-Id: I0184c5e27fcff76757ca9ee2f6f160974a15a665
Showing with 15 additions and 2 deletions.
  1. +1 −1 binding.gyp
  2. +13 −0 libzk-symlink.sh
  3. +1 −1 package.json
View
2 binding.gyp
@@ -46,7 +46,7 @@
"action_name": "symlink",
"inputs": ["<@(PRODUCT_DIR)/zookeeper.node"],
"outputs": ["<(module_root_dir)/build/zookeeper.node"],
- "action": ["ln", "-s", "<@(PRODUCT_DIR)/zookeeper.node", "<(module_root_dir)/build/zookeeper.node"]
+ "action": ["sh", "libzk-symlink.sh", "<@(_inputs)"]
}]
}
],
View
13 libzk-symlink.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]
+then
+ echo "Usage: $0 <PRODUCT_DIR>"
+ exit 1
+fi
+
+PRODUCT_DIR=$1
+FILE=$(basename $PRODUCT_DIR)
+BUILD_TYPE=$(basename $(dirname $PRODUCT_DIR))
+
+ln -s $BUILD_TYPE/$FILE build/$FILE
View
2 package.json
@@ -1,7 +1,7 @@
{
"name": "zookeeper"
,"description": "apache zookeeper client (zookeeper async API >= 3.4.0)"
- ,"version": "3.4.5-1"
+ ,"version": "3.4.5-2"
,"author": "Yuri Finkelstein <yurif2003@yahoo.com>"
,"contributors": [
"Yuri Finkelstein <yurif2003@yahoo.com>"
Something went wrong with that request. Please try again.