You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ca...@apache.org on 2013/06/04 10:59:24 UTC
git commit: THRIFT-1985: Add a Vagrantfile to build and test Apache
Thrift fully reproducable
Updated Branches:
refs/heads/master d65def015 -> 1ed799156
THRIFT-1985: Add a Vagrantfile to build and test Apache Thrift fully reproducable
Moved the Vagrantfile to the contrib/ directory to prevent polluting the top level directory
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/1ed79915
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/1ed79915
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/1ed79915
Branch: refs/heads/master
Commit: 1ed799156dbaa8f313b413d28a6dacc7775ce88f
Parents: d65def0
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Jun 3 18:29:31 2013 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Tue Jun 4 04:56:00 2013 -0400
----------------------------------------------------------------------
.gitignore | 2 +-
Makefile.am | 1 -
Vagrantfile | 41 --------------------------------
contrib/Vagrantfile | 59 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 60 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ed79915/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8c4ba8e..b9c63dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ gen-*
/Makefile
/Makefile.in
-/.vagrant/
+/contrib/.vagrant/
/aclocal/libtool.m4
/aclocal/ltoptions.m4
/aclocal/ltsugar.m4
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ed79915/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index f7758af..c8d85ae 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ EXTRA_DIST = \
doap.rdf \
sonar-project.properties \
tutorial \
- Vagrantfile \
LICENSE \
CHANGES \
NOTICE
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ed79915/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index b63dae9..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,41 +0,0 @@
-# © The Apache Software Foundation
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-$script = <<SCRIPT
-echo I am provisioning for Apache Thrift ...
-sudo apt-get update -qq -y
-sudo apt-get upgrade -qq -y
-sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev
-sudo apt-get install -qq ant openjdk-7-jdk
-sudo apt-get install -qq python-all python-all-dev python-all-dbg
-sudo apt-get install -qq libbit-vector-perl
-sudo apt-get install -qq php5-dev php5-cli phpunit
-sudo apt-get install -qq libglib2.0-dev
-sudo apt-get install -qq git erlang-base erlang-eunit erlang-dev
-sudo apt-get install -qq mono-gmcs mono-devel libmono-system-web2.0-cil
-#sudo apt-get install -qq ghc6 cabal-install libghc6-binary-dev libghc6-network-dev libghc6-http-dev
-sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime
-echo I am building Apache Thrift ...
-cd /vagrant
-sh bootstrap.sh
-sh configure
-make
-make dist
-make check
-#sh test/test.sh
-date > /etc/vagrant_provisioned_at
-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"
-
- # call the script
- config.vm.provision :shell, :inline => $script
-end
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ed79915/contrib/Vagrantfile
----------------------------------------------------------------------
diff --git a/contrib/Vagrantfile b/contrib/Vagrantfile
new file mode 100644
index 0000000..dd2e2ee
--- /dev/null
+++ b/contrib/Vagrantfile
@@ -0,0 +1,59 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+$script = <<SCRIPT
+echo I am provisioning for Apache Thrift ...
+sudo apt-get update -qq -y
+sudo apt-get upgrade -qq -y
+sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev
+sudo apt-get install -qq ant openjdk-7-jdk
+sudo apt-get install -qq python-all python-all-dev python-all-dbg
+sudo apt-get install -qq libbit-vector-perl
+sudo apt-get install -qq php5-dev php5-cli phpunit
+sudo apt-get install -qq libglib2.0-dev
+sudo apt-get install -qq git erlang-base erlang-eunit erlang-dev
+sudo apt-get install -qq mono-gmcs mono-devel libmono-system-web2.0-cil
+#sudo apt-get install -qq ghc6 cabal-install libghc6-binary-dev libghc6-network-dev libghc6-http-dev
+sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime
+echo I am building Apache Thrift ...
+cd /thrift
+sh bootstrap.sh
+sh configure
+make
+make dist
+make check
+#sh test/test.sh
+date > /etc/vagrant_provisioned_at
+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"
+
+ config.vm.synced_folder "../", "/thrift"
+
+ # call the script
+ config.vm.provision :shell, :inline => $script
+end