Merge pull request #520 from ethcore/db

Removed rocksdb from build scripts and instructions

README.md

@@ -18,17 +18,9 @@
 ##### Ubuntu 14.04, 15.04, 15.10
 
 ```bash
-# install rocksdb
-add-apt-repository ppa:ethcore/ethcore
-apt-get update
-apt-get install -y --force-yes librocksdb-dev
-
 # install multirust
 curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
 
-# install beta
-multirust update beta
-
 # download and build parity
 git clone https://github.com/ethcore/parity
 cd parity
@@ -43,20 +35,9 @@ cargo build --release
 ##### Other Linux
 
 ```bash
-# install rocksdb
-git clone --tag v4.1 --depth=1 https://github.com/facebook/rocksdb.git
-cd rocksdb
-make shared_lib 
-sudo cp -a librocksdb.so* /usr/lib 
-sudo ldconfig 
-cd ..
-
 # install rust beta
 curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes
 
-# install beta
-multirust update beta
-
 # download and build parity
 git clone https://github.com/ethcore/parity
 cd parity
@@ -71,14 +52,10 @@ cargo build --release
 ##### OSX with Homebrew
 
 ```bash
-# install rocksdb && multirust
+# install multirust
 brew update
-brew install rocksdb
 brew install multirust
 
-# install beta
-multirust update beta
-
 # download and build parity
 git clone https://github.com/ethcore/parity
 cd parity

ethcore/src/lib.rs

@@ -40,23 +40,17 @@
 //! - Ubuntu 14.04 and later:
 //!
 //!   ```bash
-//!   # install rocksdb
-//!   add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main"
-//!   apt-get update
-//!   apt-get install -y --force-yes librocksdb
 //!
 //!   # install multirust
 //!   curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
 //!
-//!   # install nightly and make it default
-//!   multirust update nightly && multirust default nightly
-//!
 //!   # export rust LIBRARY_PATH
 //!   export LIBRARY_PATH=/usr/local/lib
 //!
 //!   # download and build parity
 //!   git clone https://github.com/ethcore/parity
 //!   cd parity
+//!   multirust override beta
 //!   cargo build --release
 //!   ```
 //!
@@ -65,18 +59,15 @@
 //!   ```bash
 //!   # install rocksdb && multirust
 //!   brew update
-//!   brew install rocksdb
 //!   brew install multirust
 //!
-//!   # install nightly and make it default
-//!   multirust update nightly && multirust default nightly
-//!
 //!   # export rust LIBRARY_PATH
 //!   export LIBRARY_PATH=/usr/local/lib
 //!
 //!   # download and build parity
 //!   git clone https://github.com/ethcore/parity
 //!   cd parity
+//!   multirust override beta
 //!   cargo build --release
 //!   ```
 

install-deps.sh

@@ -342,8 +342,6 @@ function run_installer()
 		exe brew update
 		echo
 
-		info "Installing rocksdb"
-		exe brew install rocksdb
 		info "Installing multirust"
 		exe brew install multirust
 		sudo multirust default beta
@@ -391,7 +389,6 @@ function run_installer()
 		linux_version
 
 		find_multirust
-		find_rocksdb
 
 		find_curl
 		find_git
@@ -402,21 +399,6 @@ function run_installer()
 		find_sudo
 	}
 
-	function find_rocksdb()
-	{
-		depCount=$((depCount+1))
-		if [[ $(ldconfig -v 2>/dev/null | grep rocksdb | wc -l) == 1 ]]; then
-			depFound=$((depFound+1))
-			check "apt-get"
-			isRocksDB=true
-			INSTALL_FILES+="${blue}${dim}==> librocksdb:${reset}$n"
-		else
-			uncheck "librocksdb is missing"
-			isRocksDB=false
-			INSTALL_FILES+="${blue}${dim}==> librocksdb:${reset}$n"
-		fi
-	}
-
 	function find_multirust()
 	{
 		depCount=$((depCount+2))
@@ -562,34 +544,6 @@ function run_installer()
 		fi
 	}
 
-	function ubuntu_rocksdb_installer()
-	{
-		sudo apt-get update -qq
-		sudo apt-get install -qq -y software-properties-common
-		sudo apt-add-repository -y ppa:ethcore/ethcore
-		sudo apt-get -f -y install
-		sudo apt-get update -qq
-		sudo apt-get install -qq -y librocksdb-dev librocksdb
-	}
-
-	function linux_rocksdb_installer()
-	{
-		if [[ $isUbuntu == true ]]; then
-			ubuntu_rocksdb_installer
-		else
-			oldpwd=`pwd`
-			cd /tmp
-			exe git clone --branch v4.2 --depth=1 https://github.com/facebook/rocksdb.git
-			cd rocksdb
-			exe make shared_lib
-			sudo cp -a librocksdb.so* /usr/lib
-			sudo ldconfig
-			cd /tmp
-			rm -rf /tmp/rocksdb
-			cd $oldpwd
-		fi
-	}
-
 	function linux_installer()
 	{
 		if [[ $isGCC == false || $isGit == false || $isMake == false || $isCurl == false ]]; then
@@ -610,12 +564,6 @@ function run_installer()
 			echo
 		fi
 
-		if [[ $isRocksDB == false ]]; then
-			info "Installing rocksdb..."
-			linux_rocksdb_installer
-			echo
-		fi
-
 		if [[ $isMultirust == false ]]; then
 			info "Installing multirust..."
 			if [[ $isSudo == false ]]; then
@@ -655,10 +603,9 @@ function run_installer()
 			find_git
 			find_make
 			find_gcc
-			find_rocksdb
 			find_multirust
 
-			if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustBeta == false ]]; then
+			if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isMultirustBeta == false ]]; then
 				abort_install
 			fi
 		fi

install-parity.sh

@@ -236,14 +236,29 @@ function run_installer()
 	{
 		linux_version
 
-		find_rocksdb
-
 		find_curl
 
 		find_apt
 		find_sudo
 	}
 
+	function find_git()
+	{
+		depCount=$((depCount+1))
+		GIT_PATH=`which git 2>/dev/null`
+
+		if [[ -f $GIT_PATH ]]
+		then
+			depFound=$((depFound+1))
+			check "git"
+			isGit=true
+		else
+			uncheck "git is missing"
+			isGit=false
+			INSTALL_FILES+="${blue}${dim}==> git:${reset}${n}"
+		fi
+	}
+
 	function find_brew()
 	{
 		BREW_PATH=`which brew 2>/dev/null`
@@ -333,20 +348,6 @@ function run_installer()
 		fi
 	}
 
-	function find_rocksdb()
-	{
-		depCount=$((depCount+1))
-		if [[ $(ldconfig -v 2>/dev/null | grep rocksdb | wc -l) == 1 ]]; then
-			depFound=$((depFound+1))
-			check "librocksdb"
-			isRocksDB=true
-		else
-			uncheck "librocksdb is missing"
-			isRocksDB=false
-			INSTALL_FILES+="${blue}${dim}==>${reset}\tlibrocksdb${n}"
-		fi
-	}
-
 	function find_apt()
 	{
 		depCount=$((depCount+1))
@@ -386,10 +387,9 @@ function run_installer()
 		info "Verifying installation"
 
 		if [[ $OS_TYPE == "linux" ]]; then
-			find_rocksdb
 			find_apt
 
-			if [[ $isRocksDB == false || $isApt == false ]]; then
+			if [[ $isApt == false ]]; then
 				abortInstall
 			fi
 		fi
@@ -397,24 +397,12 @@ function run_installer()
 	
 	function linux_deps_installer()
 	{
-		if [[ $isRocksDB == false || $isCurl == false ]]; then
+		if [[ $isCurl == false ]]; then
 			info "Preparing apt..."
 			sudo apt-get update -qq
 			echo
 		fi
 
-		if [[ $isRocksDB == false ]]; then
-			info "Installing rocksdb..."
-
-			sudo apt-get install -qq -y software-properties-common
-			sudo apt-add-repository -y ppa:ethcore/ethcore
-			sudo apt-get -f -y install
-			sudo apt-get update -qq
-			sudo apt-get install -qq -y librocksdb
-
-			echo
-		fi
-
 		if [[ $isCurl == false ]]; then
 			info "Installing curl..."
 			sudo apt-get install -q -y curl