Fix for issue #2 and #3. Fix for cmake issues with targets

CMakeLists.txt

@@ -310,6 +310,10 @@ configure_file(${CMAKE_SOURCE_DIR}/contracts/eosio.init/eosio.init.hpp.in ${CMAK
 
 set(NODEOS_HTTP_SERVER_PORT "http://127.0.0.1:8888")
 set(SIGNATURE_PROVIDER "${EOSIO_ROOT_KEY}=KEOSD:http://127.0.0.1:8900/v1/wallet/sign_digest")
+<<<<<<< HEAD
+=======
+set(WALLET_DIR "$ENV{HOME}/eosio-wallet")
+>>>>>>> Fix for issue #2 and #3. Fix for cmake issues with targets
 configure_file(${CMAKE_SOURCE_DIR}/cd-scripts/resources/config.ini.in ${CMAKE_SOURCE_DIR}/cd-scripts/resources/config.ini @ONLY)
 
 configure_file(${CMAKE_SOURCE_DIR}/cd-scripts/resources/genesis.json.in ${CMAKE_SOURCE_DIR}/cd-scripts/resources/genesis.json)

cd-scripts/deploy.py

@@ -513,10 +513,6 @@ def make_beos_plugin_test():
     if options.make_beos_plugin_test:
         make_beos_plugin_test()
 
-    if options.create_genesis_and_config:
-        configure_config_ini()
-        configure_genesis_json()
-
     if options.clear_init_data:
         clear_initialization_data(config.START_NODE_INDEX, "eosio")
 

cd-scripts/resources/config.ini.in

@@ -16,7 +16,6 @@ bnet-follow-irreversible = 0
 # this peer will request no pending transactions from other nodes (eosio::bnet_plugin)
 bnet-no-trx = false
 
-# The string used to format peers when logging messages about them.  Variables are escaped with ${<variable name>}.
 # Available Variables:
 #    _name  	self-reported name
 # 
@@ -194,7 +193,6 @@ max-implicit-request = 1500
 # Enable expirimental socket read watermark optimization (eosio::net_plugin)
 use-socket-read-watermark = 0
 
-# The string used to format peers when logging messages about them.  Variables are escaped with ${<variable name>}.
 # Available Variables:
 #    _name  	self-reported name
 # 

contracts/CMakeLists.txt

@@ -5,6 +5,7 @@ set(DEFAULT_SYSTEM_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts/libc++/upstream
 set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_BINARY_DIR}/contracts ${CMAKE_SOURCE_DIR}/externals/magic_get/include)
 
 add_subdirectory(eosiolib)
+add_subdirectory(beoslib)
 add_subdirectory(musl)
 add_subdirectory(libc++)
 add_subdirectory(beoslib)