Permalink
Browse files

Start refactoring Thrift version for decoupling.

A new version of Thrift will be cut soon-hopefully including many of
these fixes.  Thusly, we want to make it easy to test against another
formal release of it.
  • Loading branch information...
1 parent e592317 commit 600e49194ff51b2d078ec2e635bb34f1fc282f4d @matttproud matttproud committed Sep 2, 2012
View
@@ -1,3 +1,5 @@
+include Makefile.environment
+
SUB_DIRECTORIES = lib tests
CLEAN_DIRECTORIES = $(SUB_DIRECTORIES:%=clean-%)
TEST_DIRECTORIES = $(SUB_DIRECTORIES:%=test-%)
View
@@ -0,0 +1 @@
+export THRIFT_VERSION = 0.8.0
@@ -6,7 +6,7 @@ TEST_ARTIFACTS = \
test-generation-stamp \
test-stamp
-THRIFT = $(CURDIR)/../merge/thrift-0.8.0/compiler/cpp/thrift
+THRIFT = $(CURDIR)/../merge/thrift-$(THRIFT_VERSION)/compiler/cpp/thrift
IDL = $(CURDIR)/cassandra.thrift
all: test
@@ -6,7 +6,7 @@ TEST_ARTIFACTS = \
test-generation-stamp \
test-stamp
-THRIFT = $(CURDIR)/../merge/thrift-0.8.0/compiler/cpp/thrift
+THRIFT = $(CURDIR)/../merge/thrift-$(THRIFT_VERSION)/compiler/cpp/thrift
IDL = $(CURDIR)/cassandra.thrift
all: test
@@ -8,7 +8,7 @@ TEST_ARTIFACTS = \
test-stamp \
test-validate-stamp
-THRIFT=$(CURDIR)/../merge/thrift-0.8.0/compiler/cpp/thrift
+THRIFT=$(CURDIR)/../merge/thrift-$(THRIFT_VERSION)/compiler/cpp/thrift
all: test
@@ -13,7 +13,7 @@ TEST_ARTIFACTS = \
test-start-compact-server-stamp \
test-start-json-server-stamp
-THRIFT = $(CURDIR)/../merge/thrift-0.8.0/compiler/cpp/thrift
+THRIFT = $(CURDIR)/../merge/thrift-$(THRIFT_VERSION)/compiler/cpp/thrift
IDL = $(CURDIR)/../generation/simple.thrift
GENERATED = gen-java/thrift4go/generated/*.java
GENERATED_TARGET = src/main/java/thrift4go/generated
@@ -1,2 +0,0 @@
-This directory is completely overriden, but this file is needed for preserving
-the structure for Git.
View
@@ -5,13 +5,13 @@ TEST_ARTIFACTS = \
test-installation-stamp \
test-merge-stamp \
test-stamp \
- thrift-0.8.0 \
- thrift-0.8.0.tar.gz \
+ thrift-$(THRIFT_VERSION) \
+ thrift-$(THRIFT_VERSION).tar.gz \
thrift-extraction-stamp \
tree \
tree-stamp
-export THRIFT=$(CURDIR)/thrift-0.8.0
+export THRIFT=$(CURDIR)/thrift-$(THRIFT_VERSION)
export THRIFT4GO=$(CURDIR)/../..
all: test
@@ -50,11 +50,11 @@ tree-stamp:
mkdir -vp tree
touch $@
-thrift-0.8.0.tar.gz:
- wget -c https://dist.apache.org/repos/dist/release/thrift/0.8.0/thrift-0.8.0.tar.gz
+thrift-$(THRIFT_VERSION).tar.gz:
+ wget -c https://dist.apache.org/repos/dist/release/thrift/$(THRIFT_VERSION)/thrift-$(THRIFT_VERSION).tar.gz
-thrift-extraction-stamp: thrift-0.8.0.tar.gz
- tar xzvf thrift-0.8.0.tar.gz
+thrift-extraction-stamp: thrift-$(THRIFT_VERSION).tar.gz
+ tar xzvf thrift-$(THRIFT_VERSION).tar.gz
touch $@
clean:

0 comments on commit 600e491

Please sign in to comment.