Fix compilation issue caused by thrift-0.5.0 changes.

README

@@ -57,7 +57,7 @@ Requirements
 
 [libevent] Event Notification library
 [boost] Boost C++ library (version 1.36 or later)
-[thrift] Thrift framework
+[thrift] Thrift framework (version 0.5.0 or later)
 [fb303] Facebook Bassline (included in thrift/contrib/fb303/)
    fb303 r697294 or later is required.
 [hadoop] optional. version 0.19.1 or higher (http://hadoop.apache.org)
@@ -74,14 +74,6 @@ Helpful tips:
  scribe or fb303, try setting the environment variable PYTHONPATH to the
  location of the installed packages.  This path gets output during
  'make install'. (Eg: PYTHONPATH='/usr/lib/python2.5/site-packages').
--The current version of scribe_cat does not work with the stable version of
- thrift, as of 5th March 2010. To get it to work change
- log_entry = scribe.LogEntry(category=category, message=sys.stdin.read())
- to
- log_entry = scribe.LogEntry(dict(category=category, message=sys.stdin.read()))
- The current scribe_cat works with latest thrift code if you clone their dev
- repository.
-
 
 
 To build

if/bucketupdater.thrift

@@ -1,4 +1,4 @@
-#!/usr/local/bin/thrift --cpp --php
+#!/usr/local/bin/thrift --gen cpp:pure_enums --gen php
 
 ##  Copyright (c) 2009- Facebook
 ##

if/scribe.thrift

@@ -1,4 +1,4 @@
-#!/usr/local/bin/thrift --cpp --php
+#!/usr/local/bin/thrift --gen cpp:pure_enums --gen php
 
 ##  Copyright (c) 2007-2008 Facebook
 ##

src/Makefile.am

@@ -33,6 +33,8 @@ all:
 # hadoop_home
 #
 THRIFT = $(thrift_home)/bin/thrift
+THRIFT_INCLUDES = -I $(fb303_home)/share/
+THRIFT_OPTS = $(THRIFT_INCLUDES) --gen cpp:pure_enums --gen py --gen php --gen java
 
 # User defined conditionals and conditonal statements set up in configure.ac.
 # FACEBOOK set in configure.ac
@@ -112,11 +114,11 @@ endif
 # Set up Thrift specific activity here.
 # We assume that a <name>+types.cpp will always be built from <name>.thrift.
 
-$(eval $(call thrift_template,.,$(srcdir)/../if/scribe.thrift, -I $(fb303_home)/share/ --cpp --py --php --java))
-$(eval $(call thrift_template,.,$(srcdir)/../if/bucketupdater.thrift, -I $(fb303_home)/share/ --cpp --py --php --java))
+$(eval $(call thrift_template,.,$(srcdir)/../if/scribe.thrift,$(THRIFT_OPTS)))
+$(eval $(call thrift_template,.,$(srcdir)/../if/bucketupdater.thrift,$(THRIFT_OPTS)))
 
 if FACEBOOK
-  $(eval $(call thrift_template,.,$(smc_home)/if/ServiceManager.thrift,--cpp))
+  $(eval $(call thrift_template,.,$(smc_home)/if/ServiceManager.thrift,--gen cpp))
 endif
 
 BUILT_SOURCES = thriftstyle