You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2014/07/10 05:40:35 UTC
[1/3] git commit: Thrift-2601: Fix vagrant to work again for builds
again Client: build Patch: jfarrell
Repository: thrift
Updated Branches:
refs/heads/master 4402adafe -> b0350dbc4
Thrift-2601: Fix vagrant to work again for builds again
Client: build
Patch: jfarrell
Updating vagrant to ubuntu 14.04 and fixes to make it work again.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3e41ece4
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3e41ece4
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3e41ece4
Branch: refs/heads/master
Commit: 3e41ece40cc0cb1aea60bc30d84d8110b469727b
Parents: 4402ada
Author: jfarrell <jf...@apache.org>
Authored: Wed Jul 9 23:35:54 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Wed Jul 9 23:35:54 2014 -0400
----------------------------------------------------------------------
contrib/Vagrantfile | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/3e41ece4/contrib/Vagrantfile
----------------------------------------------------------------------
diff --git a/contrib/Vagrantfile b/contrib/Vagrantfile
index cc8bcdf..a638587 100644
--- a/contrib/Vagrantfile
+++ b/contrib/Vagrantfile
@@ -22,8 +22,17 @@
$build_and_test = <<SCRIPT
echo "Provisioning system to compile and test Apache Thrift."
-sudo apt-get update -qq -y
-sudo apt-get upgrade -qq -y
+
+# Create swap space
+sudo fallocate -l 2G /swapfile
+sudo chmod 600 /swapfile
+sudo mkswap /swapfile
+sudo swapon /swapfile
+sudo swapon -s
+
+# Update the system
+sudo DEBIAN_FRONTEND=noninteractive apt-get update -qq -y
+sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y
# Install Dependencies
# ---
@@ -34,17 +43,17 @@ sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options
sudo apt-get install -qq ant openjdk-7-jdk
# Python dependencies
-sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools
+sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools python-support
# Ruby dependencies
-sudo apt-get install -qq ruby rubygems
+sudo apt-get install -qq ruby ruby-dev
sudo gem install bundler rake
# Perl dependencies
sudo apt-get install -qq libbit-vector-perl libclass-accessor-class-perl
# Php dependencies
-sudo apt-get install -qq php5 php5-dev php5-cli php-pear
+sudo apt-get install -qq php5 php5-dev php5-cli php-pear re2c
# GlibC dependencies
sudo apt-get install -qq libglib2.0-dev
@@ -57,10 +66,14 @@ echo "golang-go golang-go/dashboard boolean false" | debconf-set-selections
sudo apt-get -y install -qq golang golang-go
# Haskell dependencies
-sudo apt-get install -qq ghc6 cabal-install libghc6-binary-dev libghc6-network-dev libghc6-http-dev libghc-hashable-dev libghc-unordered-containers-dev libghc-vector-dev
+sudo apt-get install -qq ghc cabal-install libghc-binary-dev libghc-network-dev libghc-http-dev libghc-hashable-dev libghc-unordered-containers-dev libghc-vector-dev
+
+# Lua dependencies
+sudo apt-get install -qq lua5.2 lua5.2-dev
# Node.js dependencies
-sudo apt-get install -qq npm
+sudo apt-get install -qq nodejs nodejs-dev npm
+sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
# CSharp
sudo apt-get install -qq mono-gmcs mono-devel libmono-system-web2.0-cil
@@ -89,18 +102,15 @@ cd /thrift
sh bootstrap.sh
sh configure --without-erlang
make
-make dist
make check
echo "Finished building Apache Thrift."
SCRIPT
Vagrant.configure("2") do |config|
- # Ubuntu 12.04 LTS (Precise Pangolin)
- config.vm.box = "precise64"
- config.vm.box_url = "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-amd64-disk1.box"
- # config.vm.box = "precise32"
- # config.vm.box_url = "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-i386-disk1.box"
+ # Ubuntu 14.04 LTS (Trusty Tahr)
+ config.vm.box = "trusty64"
+ config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.synced_folder "../", "/thrift"
[3/3] git commit: Thrift-2601:Fix vagrant to work again for builds
again Client: build process Patch: jfarrell
Posted by jf...@apache.org.
Thrift-2601:Fix vagrant to work again for builds again
Client: build process
Patch: jfarrell
Updates debian packaging to work with ubuntu 14.04 deps
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/b0350dbc
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/b0350dbc
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/b0350dbc
Branch: refs/heads/master
Commit: b0350dbc40d3bc442f02bbd5980e2c2b5d83194d
Parents: dbf2bb5
Author: jfarrell <jf...@apache.org>
Authored: Wed Jul 9 23:39:34 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Wed Jul 9 23:39:34 2014 -0400
----------------------------------------------------------------------
debian/control | 6 +++---
debian/docs | 2 +-
debian/rules | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/b0350dbc/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 6ec6614..39d57f9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: thrift
Section: devel
Priority: extra
Build-Depends: debhelper (>= 5), build-essential, mono-gmcs, python-dev, ant,
- mono-devel, libmono-system-web2.0-cil, erlang-base, ruby1.8-dev, autoconf, python-support,
- automake, pkg-config, libtool, bison, flex, libboost-dev | libboost1.40-dev, python-all,
+ mono-devel, libmono-system-web2.0-cil, erlang-base, ruby1.8-dev, autoconf, automake,
+ pkg-config, libtool, bison, flex, libboost-dev | libboost1.40-dev, python-all,
python-all-dev, python-all-dbg, openjdk-6-jdk | java-sdk,
libboost-test-dev | libboost-test1.40-dev, libevent-dev, perl (>= 5.8.0-7),
php5, php5-dev, libglib2.0-dev, libqt4-dev
@@ -12,7 +12,7 @@ Homepage: http://thrift.apache.org/
Vcs-Git: https://git-wip-us.apache.org/repos/asf/thrift.git
Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=thrift.git
Standards-Version: 3.7.2
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.6
Package: thrift-compiler
Architecture: any
http://git-wip-us.apache.org/repos/asf/thrift/blob/b0350dbc/debian/docs
----------------------------------------------------------------------
diff --git a/debian/docs b/debian/docs
index e845566..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.md
http://git-wip-us.apache.org/repos/asf/thrift/blob/b0350dbc/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 8995f9c..633b17e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,6 @@ binary-common:
dh_strip -Npython-thrift-dbg
dh_compress
dh_fixperms
- dh_pysupport
dh_makeshlibs
dh_installdeb
dh_perl
[2/3] git commit: Thrift-2601:Fix vagrant to work again for builds
again Client: build process Patch: jfarrell
Posted by jf...@apache.org.
Thrift-2601:Fix vagrant to work again for builds again
Client: build process
Patch: jfarrell
Reverting TMultiplexedProtocol tests in test/py from commit 879cab2c are non functional,
reverts the portion of the commit that changed test/py/{TestServer.py,TestClient.py}
Follow up to address this issue: THRIFT-2613
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/dbf2bb5c
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/dbf2bb5c
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/dbf2bb5c
Branch: refs/heads/master
Commit: dbf2bb5c46ffb519186da4c4f13e288becd42ba2
Parents: 3e41ece
Author: jfarrell <jf...@apache.org>
Authored: Wed Jul 9 23:37:12 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Wed Jul 9 23:37:12 2014 -0400
----------------------------------------------------------------------
test/py/TestClient.py | 15 +--------------
test/py/TestServer.py | 22 +++-------------------
2 files changed, 4 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/dbf2bb5c/test/py/TestClient.py
----------------------------------------------------------------------
diff --git a/test/py/TestClient.py b/test/py/TestClient.py
index fd6b8e9..53b3ad7 100755
--- a/test/py/TestClient.py
+++ b/test/py/TestClient.py
@@ -38,8 +38,6 @@ parser.add_option("--zlib", action="store_true", dest="zlib",
help="use zlib wrapper for compressed transport")
parser.add_option("--ssl", action="store_true", dest="ssl",
help="use SSL for encrypted transport")
-parser.add_option("--multiple", action="store_true", dest="multiple",
- help="use Multiple service")
parser.add_option("--http", dest="http_path",
help="Use the HTTP transport with the specified path")
parser.add_option('-v', '--verbose', action="store_const",
@@ -59,7 +57,6 @@ sys.path.insert(0, options.genpydir)
from ThriftTest import ThriftTest, SecondService
from ThriftTest.ttypes import *
-from thrift.protocol import TMultiplexedProtocol
from thrift.transport import TTransport
from thrift.transport import TSocket
from thrift.transport import THttpClient
@@ -90,14 +87,7 @@ class AbstractTest(unittest.TestCase):
self.transport = TZlibTransport.TZlibTransport(self.transport, 9)
self.transport.open()
protocol = self.protocol_factory.getProtocol(self.transport)
- if options.multiple:
- p = TMultiplexedProtocol.TMultiplexedProtocol(protocol, "ThriftTest")
- self.client = ThriftTest.Client(p)
- p = TMultiplexedProtocol.TMultiplexedProtocol(protocol, "SecondService")
- self.client2 = SecondService.Client(p)
- else:
- self.client = ThriftTest.Client(protocol)
- self.client2 = None
+ self.client = ThriftTest.Client(protocol)
def tearDown(self):
# Close!
@@ -216,9 +206,6 @@ class AbstractTest(unittest.TestCase):
self.client.testOneway(1) # type is int, not float
self.assertEqual(self.client.testString('Python'), 'Python')
- def testblahBlah(self):
- if self.client2:
- self.assertEqual(self.client2.blahBlah(), None)
class NormalBinaryTest(AbstractTest):
protocol_factory = TBinaryProtocol.TBinaryProtocolFactory()
http://git-wip-us.apache.org/repos/asf/thrift/blob/dbf2bb5c/test/py/TestServer.py
----------------------------------------------------------------------
diff --git a/test/py/TestServer.py b/test/py/TestServer.py
index 6ee0399..98446a5 100755
--- a/test/py/TestServer.py
+++ b/test/py/TestServer.py
@@ -33,8 +33,6 @@ parser.add_option("--zlib", action="store_true", dest="zlib",
help="use zlib wrapper for compressed transport")
parser.add_option("--ssl", action="store_true", dest="ssl",
help="use SSL for encrypted transport")
-parser.add_option("--multiple", action="store_true", dest="multiple",
- help="use multiple service")
parser.add_option('-v', '--verbose', action="store_const",
dest="verbose", const=2,
help="verbose output")
@@ -50,10 +48,9 @@ options, args = parser.parse_args()
sys.path.insert(0, options.genpydir)
-from ThriftTest import ThriftTest, SecondService
+from ThriftTest import ThriftTest
from ThriftTest.ttypes import *
from thrift.Thrift import TException
-from thrift import TMultiplexedProcessor
from thrift.transport import TTransport
from thrift.transport import TSocket
from thrift.transport import TZlibTransport
@@ -67,12 +64,6 @@ PROT_FACTORIES = {'binary': TBinaryProtocol.TBinaryProtocolFactory,
'compact': TCompactProtocol.TCompactProtocolFactory,
'json': TJSONProtocol.TJSONProtocolFactory}
-class SecondHandler:
-
- def blahBlah(self):
- if options.verbose > 1:
- print 'blahBlah()'
-
class TestHandler:
def testVoid(self):
@@ -199,15 +190,8 @@ if len(args) > 1:
server_type = args[0]
# Set up the handler and processor objects
-if not options.multiple:
- handler = TestHandler()
- processor = ThriftTest.Processor(handler)
-else:
- processor = TMultiplexedProcessor.TMultiplexedProcessor()
- handler = TestHandler()
- processor.registerProcessor("ThriftTest", ThriftTest.Processor(handler))
- handler = SecondHandler()
- processor.registerProcessor("SecondService", SecondService.Processor(handler))
+handler = TestHandler()
+processor = ThriftTest.Processor(handler)
# Handle THttpServer as a special case
if server_type == 'THttpServer':