Skip to content
This repository
Browse code

Fix compilation issue caused by thrift-0.5.0 changes.

  • Loading branch information...
commit 2ee14d31efdbaa612e0e4c958862c9c0258f36eb 1 parent 3f14e93
Ying-Yi Liang authored October 14, 2010
10  README
@@ -57,7 +57,7 @@ Requirements
57 57
 
58 58
 [libevent] Event Notification library
59 59
 [boost] Boost C++ library (version 1.36 or later)
60  
-[thrift] Thrift framework
  60
+[thrift] Thrift framework (version 0.5.0 or later)
61 61
 [fb303] Facebook Bassline (included in thrift/contrib/fb303/)
62 62
    fb303 r697294 or later is required.
63 63
 [hadoop] optional. version 0.19.1 or higher (http://hadoop.apache.org)
@@ -74,14 +74,6 @@ Helpful tips:
74 74
  scribe or fb303, try setting the environment variable PYTHONPATH to the
75 75
  location of the installed packages.  This path gets output during
76 76
  'make install'. (Eg: PYTHONPATH='/usr/lib/python2.5/site-packages').
77  
--The current version of scribe_cat does not work with the stable version of
78  
- thrift, as of 5th March 2010. To get it to work change
79  
- log_entry = scribe.LogEntry(category=category, message=sys.stdin.read())
80  
- to
81  
- log_entry = scribe.LogEntry(dict(category=category, message=sys.stdin.read()))
82  
- The current scribe_cat works with latest thrift code if you clone their dev
83  
- repository.
84  
-
85 77
 
86 78
 
87 79
 To build
2  if/bucketupdater.thrift
... ...
@@ -1,4 +1,4 @@
1  
-#!/usr/local/bin/thrift --cpp --php
  1
+#!/usr/local/bin/thrift --gen cpp:pure_enums --gen php
2 2
 
3 3
 ##  Copyright (c) 2009- Facebook
4 4
 ##
2  if/scribe.thrift
... ...
@@ -1,4 +1,4 @@
1  
-#!/usr/local/bin/thrift --cpp --php
  1
+#!/usr/local/bin/thrift --gen cpp:pure_enums --gen php
2 2
 
3 3
 ##  Copyright (c) 2007-2008 Facebook
4 4
 ##
8  src/Makefile.am
@@ -33,6 +33,8 @@ all:
33 33
 # hadoop_home
34 34
 #
35 35
 THRIFT = $(thrift_home)/bin/thrift
  36
+THRIFT_INCLUDES = -I $(fb303_home)/share/
  37
+THRIFT_OPTS = $(THRIFT_INCLUDES) --gen cpp:pure_enums --gen py --gen php --gen java
36 38
 
37 39
 # User defined conditionals and conditonal statements set up in configure.ac.
38 40
 # FACEBOOK set in configure.ac
@@ -112,11 +114,11 @@ endif
112 114
 # Set up Thrift specific activity here.
113 115
 # We assume that a <name>+types.cpp will always be built from <name>.thrift.
114 116
 
115  
-$(eval $(call thrift_template,.,$(srcdir)/../if/scribe.thrift, -I $(fb303_home)/share/ --cpp --py --php --java))
116  
-$(eval $(call thrift_template,.,$(srcdir)/../if/bucketupdater.thrift, -I $(fb303_home)/share/ --cpp --py --php --java))
  117
+$(eval $(call thrift_template,.,$(srcdir)/../if/scribe.thrift,$(THRIFT_OPTS)))
  118
+$(eval $(call thrift_template,.,$(srcdir)/../if/bucketupdater.thrift,$(THRIFT_OPTS)))
117 119
 
118 120
 if FACEBOOK
119  
-  $(eval $(call thrift_template,.,$(smc_home)/if/ServiceManager.thrift,--cpp))
  121
+  $(eval $(call thrift_template,.,$(smc_home)/if/ServiceManager.thrift,--gen cpp))
120 122
 endif
121 123
 
122 124
 BUILT_SOURCES = thriftstyle

0 notes on commit 2ee14d3

Please sign in to comment.
Something went wrong with that request. Please try again.