From e94653dae455dcd9e6461d831ae908150056fee0 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 18:20:24 +0800 Subject: [PATCH 01/17] hyperdex 1.6.0 --- hyperdex.rb | 4 ++-- hyperleveldb.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hyperdex.rb b/hyperdex.rb index 5ca8686..86cf813 100644 --- a/hyperdex.rb +++ b/hyperdex.rb @@ -2,8 +2,8 @@ class Hyperdex < Formula homepage 'http://hyperdex.org' - url 'http://hyperdex.org/src/hyperdex-1.4.4.tar.gz' - sha1 'c5b126fc7862de66eab54fa5ef3c7cbb84b2bc9b' + url 'http://hyperdex.org/src/hyperdex-1.6.0.tar.gz' + sha1 'b019a2d1fc3e25a140b729d4392f7c07dd0cfcc2' depends_on 'autoconf' depends_on 'automake' diff --git a/hyperleveldb.rb b/hyperleveldb.rb index 00e0efc..237286b 100644 --- a/hyperleveldb.rb +++ b/hyperleveldb.rb @@ -2,8 +2,8 @@ class Hyperleveldb < Formula homepage 'http://hyperdex.org' - url 'http://hyperdex.org/src/hyperleveldb-1.2.1.tar.gz' - sha1 'fc43412dbc2cafc7cee8fd47b3e12a84c2833ec4' + url 'http://hyperdex.org/src/hyperleveldb-1.2.2.tar.gz' + sha1 '5cc2694f5f13388a28e17cd65a6b650ebc3d39a4' def install ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig" From d42424c6fc2311f1c0d5a73702ad76395910af3e Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 18:42:26 +0800 Subject: [PATCH 02/17] added libmacaroons dependency --- libmacaroons.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 libmacaroons.rb diff --git a/libmacaroons.rb b/libmacaroons.rb new file mode 100644 index 0000000..814c639 --- /dev/null +++ b/libmacaroons.rb @@ -0,0 +1,22 @@ +require 'formula' + +class Replicant < Formula + homepage 'http://hyperdex.org' + url 'http://hyperdex.org/src/libmacaroons-0.2.0.tar.gz' + sha1 'e8f3dfdb322febdeff03c0e71c3ed9518711f629' + + depends_on 'autoconf' + depends_on 'automake' + depends_on 'autoconf-archive' + depends_on 'libtool' + depends_on 'pkg-config' + + depends_on 'libsodium' + + def install + ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig" + system "./configure", "--prefix=#{prefix}" + system "make" + system "make install" + end +end From 2966e79e9f0f181a1b159141a447fb82e3b07d38 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 18:43:43 +0800 Subject: [PATCH 03/17] libmacaroons dependency definition added --- hyperdex.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/hyperdex.rb b/hyperdex.rb index 86cf813..42f2dd4 100644 --- a/hyperdex.rb +++ b/hyperdex.rb @@ -20,6 +20,7 @@ class Hyperdex < Formula depends_on 'busybee' depends_on 'hyperleveldb' depends_on 'replicant' + depends_on 'libmacaroons' option 'with-python-bindings', "Builds and installs Python client bindings" option 'with-java-bindings', "Builds and installs Java client bindings" From aa984b3cca5b7472114060eb756af0fedc7004c9 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 18:45:34 +0800 Subject: [PATCH 04/17] fixed libmacaroon rb class name --- libmacaroons.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmacaroons.rb b/libmacaroons.rb index 814c639..ce8f3b7 100644 --- a/libmacaroons.rb +++ b/libmacaroons.rb @@ -1,6 +1,6 @@ require 'formula' -class Replicant < Formula +class Libmacaroons < Formula homepage 'http://hyperdex.org' url 'http://hyperdex.org/src/libmacaroons-0.2.0.tar.gz' sha1 'e8f3dfdb322febdeff03c0e71c3ed9518711f629' From bb35015874282168dc912899b2673d3c79b2a8a8 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 19:01:40 +0800 Subject: [PATCH 05/17] added libtreadstone and libpo6 0.6 --- hyperdex.rb | 1 + libpo6.rb | 4 ++-- libtreadstone.rb | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 libtreadstone.rb diff --git a/hyperdex.rb b/hyperdex.rb index 42f2dd4..98d118c 100644 --- a/hyperdex.rb +++ b/hyperdex.rb @@ -21,6 +21,7 @@ class Hyperdex < Formula depends_on 'hyperleveldb' depends_on 'replicant' depends_on 'libmacaroons' + depends_on 'libtreadstone' option 'with-python-bindings', "Builds and installs Python client bindings" option 'with-java-bindings', "Builds and installs Java client bindings" diff --git a/libpo6.rb b/libpo6.rb index cd3c124..51ed95f 100644 --- a/libpo6.rb +++ b/libpo6.rb @@ -2,8 +2,8 @@ class Libpo6 < Formula homepage 'http://hyperdex.org' - url 'http://hyperdex.org/src/libpo6-0.5.2.tar.gz' - sha1 'dcbce34fe3f1032381e125204168dac71d159ec3' + url 'http://hyperdex.org/src/libpo6-0.6.0.tar.gz' + sha1 '4bed4124daf33acba0e527c4dc59ccc63c8bbde0' depends_on 'autoconf' depends_on 'automake' diff --git a/libtreadstone.rb b/libtreadstone.rb new file mode 100644 index 0000000..b0a2dad --- /dev/null +++ b/libtreadstone.rb @@ -0,0 +1,22 @@ +require 'formula' + +class Libtreadstone < Formula + homepage 'http://hyperdex.org' + url 'http://hyperdex.org/src/libtreadstone-0.1.0.tar.gz' + sha1 '5e34d8c67a2e7c1b3c5a6ade4c5141372297fb0d' + + depends_on 'autoconf' + depends_on 'automake' + depends_on 'autoconf-archive' + depends_on 'libtool' + depends_on 'pkg-config' + + depends_on 'libpo6' + + def install + ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig" + system "./configure", "--prefix=#{prefix}" + system "make" + system "make install" + end +end From 060c2a2e92132a1890ef2d13d65eacba0aeb7ec1 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 19:05:29 +0800 Subject: [PATCH 06/17] upgrade libe dependency to 0.9.0 --- libe.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libe.rb b/libe.rb index 9340fb1..c02dd21 100644 --- a/libe.rb +++ b/libe.rb @@ -2,8 +2,8 @@ class Libe < Formula homepage 'http://hyperdex.org' - url 'http://hyperdex.org/src/libe-0.8.1.tar.gz' - sha1 '95c42531d4834b5eb801694b6929f831b76a24f0' + url 'http://hyperdex.org/src/libe-0.9.0.tar.gz' + sha1 '30b6273a1f374035dfbe770bdee36ac0b30a24c4' depends_on 'autoconf' depends_on 'automake' From a0c373ea9dda4c6753d99e694f81080151b08cab Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 19:29:04 +0800 Subject: [PATCH 07/17] libtreadstone compile error fix --- libtreadstone.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libtreadstone.rb b/libtreadstone.rb index b0a2dad..bf77a5f 100644 --- a/libtreadstone.rb +++ b/libtreadstone.rb @@ -13,6 +13,10 @@ class Libtreadstone < Formula depends_on 'libpo6' + def patches + DATA + end + def install ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig" system "./configure", "--prefix=#{prefix}" @@ -20,3 +24,17 @@ def install system "make install" end end +__END__ +diff --git a/treadstone.cc b/treadstone.cc +index f4f651b..cf2b884 100644 +--- a/treadstone.cc ++++ b/treadstone.cc +@@ -1805,7 +1805,7 @@ treadstone_transformer :: parse_array(const treadstone::pa + { + const unsigned char* const elem_start = tmp; + const unsigned char* elem_tmp = NULL; +- size_t elem_sz; ++ uint64_t elem_sz; + + switch (*elem_start) + { \ No newline at end of file From 69baf54757b886b271713476f526499d0868129f Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 19:30:18 +0800 Subject: [PATCH 08/17] libtreadstone patch missing EOL --- libtreadstone.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtreadstone.rb b/libtreadstone.rb index bf77a5f..619db2d 100644 --- a/libtreadstone.rb +++ b/libtreadstone.rb @@ -16,7 +16,7 @@ class Libtreadstone < Formula def patches DATA end - + def install ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig" system "./configure", "--prefix=#{prefix}" @@ -37,4 +37,4 @@ def install + uint64_t elem_sz; switch (*elem_start) - { \ No newline at end of file + { From 4063e9e878141850237ea101acebe1cdf1770b71 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 19:48:41 +0800 Subject: [PATCH 09/17] README.md notes on JDK binding on macosx --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 8eaa18a..0dcbe7a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,27 @@ Homebrew tap for HyperDex. ## Installation +#Using formula from the official repository + `brew tap HyperDex/hyperdex && brew install hyperdex.` Optional client bindings can be individually selected with `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` + +## Using formula from this fork + +`brew tap dayasakti/hyperdex && brew install hyperdex.` + +## java binding hacks on macosx 10.7.5 +(only when you install JDK from oracle) + +Assuming that you are installing jdk1.7.0_45. Then you may need to create +a symlink below if you enable --with-java-bindings + +``` +sudo ln -sf /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/include . +cd /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/include +sudo ln -sf darwin/jni_md.h . +sudo ln -sf darwin/jawt_md.h . +``` + From 52b1e9c424319843a6e2ef9280fdc370216d389b Mon Sep 17 00:00:00 2001 From: dayasakti Date: Thu, 19 Mar 2015 19:50:48 +0800 Subject: [PATCH 10/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0dcbe7a..8398f71 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Homebrew tap for HyperDex. Optional client bindings can be individually selected with `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` -## Using formula from this fork +## Using formula from this fork (HyperDex 1.6.0) `brew tap dayasakti/hyperdex && brew install hyperdex.` From 20596926f6c934a90610f129bfb52dfb14cb8b57 Mon Sep 17 00:00:00 2001 From: daya Date: Thu, 19 Mar 2015 23:55:40 +0800 Subject: [PATCH 11/17] replicant upgraded to 0.6.4 --- replicant.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/replicant.rb b/replicant.rb index cacd705..af31d19 100644 --- a/replicant.rb +++ b/replicant.rb @@ -2,8 +2,8 @@ class Replicant < Formula homepage 'http://hyperdex.org' - url 'http://hyperdex.org/src/replicant-0.6.3.tar.gz' - sha1 'e3677d6998623db3fdba4ac834eb69e8be6852c2' + url 'http://hyperdex.org/src/replicant-0.6.4.tar.gz' + sha1 'bc2527c31ef4671859926fc31b6eb80b9011026e' depends_on 'autoconf' depends_on 'automake' From 90a99b9958ed78ea39a72cbdcf9911e32bcfba6e Mon Sep 17 00:00:00 2001 From: dayasakti Date: Fri, 20 Mar 2015 10:28:21 +0800 Subject: [PATCH 12/17] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8398f71..7a25620 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,14 @@ Optional client bindings can be individually selected with ## Using formula from this fork (HyperDex 1.6.0) -`brew tap dayasakti/hyperdex && brew install hyperdex.` +``` +brew tap dayasakti/hyperdex +brew install hyperdex +``` + +Optional client bindings can be individually selected with +`brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` + ## java binding hacks on macosx 10.7.5 (only when you install JDK from oracle) From 2767691ac3090e29de100ea933eeb1a0a1ed3ba5 Mon Sep 17 00:00:00 2001 From: daya Date: Fri, 20 Mar 2015 10:53:47 +0800 Subject: [PATCH 13/17] Revert README.md --- README.md | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/README.md b/README.md index 7a25620..8eaa18a 100644 --- a/README.md +++ b/README.md @@ -2,34 +2,7 @@ Homebrew tap for HyperDex. ## Installation -#Using formula from the official repository - `brew tap HyperDex/hyperdex && brew install hyperdex.` Optional client bindings can be individually selected with `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` - -## Using formula from this fork (HyperDex 1.6.0) - -``` -brew tap dayasakti/hyperdex -brew install hyperdex -``` - -Optional client bindings can be individually selected with -`brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` - - -## java binding hacks on macosx 10.7.5 -(only when you install JDK from oracle) - -Assuming that you are installing jdk1.7.0_45. Then you may need to create -a symlink below if you enable --with-java-bindings - -``` -sudo ln -sf /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/include . -cd /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/include -sudo ln -sf darwin/jni_md.h . -sudo ln -sf darwin/jawt_md.h . -``` - From b26046fdbdf29ad7f5868b5adad1f0d347568d7d Mon Sep 17 00:00:00 2001 From: daya Date: Fri, 20 Mar 2015 18:34:12 +0800 Subject: [PATCH 14/17] option to enable-ycsb --- hyperdex.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hyperdex.rb b/hyperdex.rb index 98d118c..2915b29 100644 --- a/hyperdex.rb +++ b/hyperdex.rb @@ -26,6 +26,7 @@ class Hyperdex < Formula option 'with-python-bindings', "Builds and installs Python client bindings" option 'with-java-bindings', "Builds and installs Java client bindings" option 'with-ruby-bindings', "Builds and installs Ruby client bindings" + option 'with-enable-ycsb', "Enable the Yahoo Cloud Serving Benchmark" def patches DATA @@ -37,6 +38,7 @@ def install args << "--enable-java-bindings" if build.with? "java-bindings" args << "--enable-python-bindings" if build.with? "python-bindings" args << "--enable-ruby-bindings" if build.with? "ruby-bindings" + args << "--enable-ycsb" if build.with? "enable-ycsb" system "./configure", "--prefix=#{prefix}", *args system "make" From 60ee1de65dd4345f35220e88915bc0b862c10eba Mon Sep 17 00:00:00 2001 From: dayasakti Date: Sat, 21 Mar 2015 08:57:16 +0800 Subject: [PATCH 15/17] updated to README on enabling ycsb binding --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8eaa18a..a35f489 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ Homebrew tap for HyperDex. Optional client bindings can be individually selected with `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` + + +Enabling bindings for ycsb: +`CLASSPATH=/core/lib/core-.jar brew install --with-java-bindings --with-enable-ycsb hyperdex` From 1ecc4a9d43e95e37333606024d1906144352579f Mon Sep 17 00:00:00 2001 From: dayasakti Date: Sat, 21 Mar 2015 08:57:45 +0800 Subject: [PATCH 16/17] new line --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a35f489..8b379e7 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,6 @@ Optional client bindings can be individually selected with `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` -Enabling bindings for ycsb: +Enabling bindings for ycsb + `CLASSPATH=/core/lib/core-.jar brew install --with-java-bindings --with-enable-ycsb hyperdex` From bb37898a22737dc4b14c56dc32dd343bf662621f Mon Sep 17 00:00:00 2001 From: dayasakti Date: Sat, 21 Mar 2015 08:58:15 +0800 Subject: [PATCH 17/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b379e7..0011fbc 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,6 @@ Optional client bindings can be individually selected with `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex` -Enabling bindings for ycsb +Enabling bindings for ycsb: `CLASSPATH=/core/lib/core-.jar brew install --with-java-bindings --with-enable-ycsb hyperdex`