From 0c6cef4026ea4b575dd50dabff006e35be158369 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 28 Jul 2015 01:30:18 +0200
Subject: [PATCH] allow genesis stuff to be specified with --genesis like geth.
 add "default" bundle.

---
 CMakeLists.txt | 25 +++++++++++++++++++++----
 eth/main.cpp   |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43cb31d8c..004f919c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,6 +223,9 @@ if (GUI)
 	set(JSONRPC ON)
 endif()
 
+# Default CMAKE_BUILD_TYPE to "Release".
+set(CMAKE_BUILD_TYPE CACHE STRING "Release")
+
 # note: The value "default" which provides the defaults is just a fake value
 # which lets us keep the default values of all build options and is set at
 # the beginning of this file.
@@ -292,8 +295,23 @@ elseif (BUNDLE STREQUAL "miner")
 	set(ETHKEY OFF)
 	set(MINER ON)
 	set(ETHASHCL ON)
-elseif (BUNDLE STREQUAL "release")
-	set(SERPENT OFF)
+elseif (BUNDLE STREQUAL "default")	# development builds
+	set(SERPENT ${DECENT_PLATFORM})
+	set(SOLIDITY ON)
+	set(USENPM OFF)
+	set(GUI ON)
+	set(TOOLS ON)
+	set(TESTS ON)
+	set(FATDB ON)
+	set(ETHASHCL ON)
+	set(EVMJIT ON)
+	set(JSCONSOLE ON)
+	set(JSONRPC ON)
+	if ("x${CMAKE_BUILD_TYPE}" STREQUAL "x")
+		set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+	endif ()
+elseif (BUNDLE STREQUAL "release")      # release builds
+	set(SERPENT ${DECENT_PLATFORM})
 	set(SOLIDITY ON)
 	set(USENPM OFF)
 	set(GUI ON)
@@ -304,10 +322,9 @@ elseif (BUNDLE STREQUAL "release")
 	set(EVMJIT ON)
 	set(JSCONSOLE ON)
 	set(JSONRPC ON)
+	set(FRONTIER ON)
 endif ()
 
-# Default CMAKE_BUILD_TYPE to "Release".
-set(CMAKE_BUILD_TYPE CACHE STRING "Release")
 if ("x${CMAKE_BUILD_TYPE}" STREQUAL "x")
 	set(CMAKE_BUILD_TYPE "Release")
 endif ()
diff --git a/eth/main.cpp b/eth/main.cpp
index 379e61f81..f85e7096f 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -1324,7 +1324,7 @@ int main(int argc, char** argv)
 		}
 		else if ((arg == "-d" || arg == "--path" || arg == "--db-path") && i + 1 < argc)
 			dbPath = argv[++i];
-		else if (arg == "--genesis-json" && i + 1 < argc)
+		else if ((arg == "--genesis-json" || arg == "--genesis") && i + 1 < argc)
 		{
 			try
 			{