Skip to content

Commit 626b279

Browse files
committed
Revert activenode vb to cdd_policy #2
1 parent 9ffa878 commit 626b279

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Defines BitShares library target.
2-
project( BitShares )
1+
# Defines LocalCoin library target.
2+
project( LocalCoin )
33
cmake_minimum_required( VERSION 2.8.12 )
44

5-
set( BLOCKCHAIN_NAME "BitShares" )
5+
set( BLOCKCHAIN_NAME "LocalCoin" )
66

77
set( CLI_CLIENT_EXECUTABLE_NAME graphene_client )
8-
set( GUI_CLIENT_EXECUTABLE_NAME BitShares )
8+
set( GUI_CLIENT_EXECUTABLE_NAME LocalCoin )
99
set( CUSTOM_URL_SCHEME "gcs" )
1010
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
1111

@@ -70,7 +70,7 @@ ENDIF()
7070

7171
if( WIN32 )
7272

73-
message( STATUS "Configuring BitShares on WIN32")
73+
message( STATUS "Configuring LocalCoin on WIN32")
7474
set( DB_VERSION 60 )
7575
set( BDB_STATIC_LIBS 1 )
7676

@@ -107,11 +107,11 @@ else( WIN32 ) # Apple AND Linux
107107

108108
if( APPLE )
109109
# Apple Specific Options Here
110-
message( STATUS "Configuring BitShares on OS X" )
110+
message( STATUS "Configuring LocalCoin on OS X" )
111111
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall" )
112112
else( APPLE )
113113
# Linux Specific Options Here
114-
message( STATUS "Configuring BitShares on Linux" )
114+
message( STATUS "Configuring LocalCoin on Linux" )
115115
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" )
116116
if(USE_PROFILER)
117117
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg" )
@@ -148,7 +148,7 @@ else( WIN32 ) # Apple AND Linux
148148

149149
endif( WIN32 )
150150

151-
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build BitShares for code coverage analysis")
151+
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build LocalCoin for code coverage analysis")
152152

153153
if(ENABLE_COVERAGE_TESTING)
154154
SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
@@ -178,18 +178,18 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
178178
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
179179
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
180180
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
181-
set(CPACK_PACKAGE_DESCRIPTION "A client for the BitShares network")
182-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the BitShares network")
181+
set(CPACK_PACKAGE_DESCRIPTION "A client for the LocalCoin network")
182+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the LocalCoin network")
183183
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
184-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "BitShares ${CPACK_PACKAGE_VERSION}")
184+
set(CPACK_PACKAGE_INSTALL_DIRECTORY "LocalCoin ${CPACK_PACKAGE_VERSION}")
185185

186186
if(WIN32)
187187
SET(CPACK_GENERATOR "ZIP;NSIS")
188-
set(CPACK_PACKAGE_NAME "BitShares") # override above
188+
set(CPACK_PACKAGE_NAME "LocalCoin") # override above
189189
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
190-
set(CPACK_NSIS_PACKAGE_NAME "BitShares v${CPACK_PACKAGE_VERSION}")
190+
set(CPACK_NSIS_PACKAGE_NAME "LocalCoin v${CPACK_PACKAGE_VERSION}")
191191
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
192-
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"BitShares\\\"")
192+
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"LocalCoin\\\"")
193193
# it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
194194
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
195195

libraries/chain/db_balance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void database::deposit_activenode_pay(const activenode_object& ano, share_type a
198198
amount,
199199
get_global_properties().parameters.activenode_pay_vesting_seconds,
200200
ano.activenode_account,
201-
false );
201+
true );
202202

203203
if( new_vbid.valid() )
204204
{

0 commit comments

Comments
 (0)