提交 1a2f2ed8 编写于 作者: A arhag

update other version numbers to 1.0 and cleanup

上级 0da62cc5
...@@ -41,7 +41,6 @@ endif() ...@@ -41,7 +41,6 @@ endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS "ON") set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make") set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin") set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
set(EOS_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/genesis.json" )
#set (USE_PCH 1) #set (USE_PCH 1)
...@@ -100,7 +99,7 @@ FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS ...@@ -100,7 +99,7 @@ FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
if( WIN32 ) if( WIN32 )
message( STATUS "Configuring Eos on WIN32") message( STATUS "Configuring EOSIO on WIN32")
set( DB_VERSION 60 ) set( DB_VERSION 60 )
set( BDB_STATIC_LIBS 1 ) set( BDB_STATIC_LIBS 1 )
...@@ -135,11 +134,11 @@ else( WIN32 ) # Apple AND Linux ...@@ -135,11 +134,11 @@ else( WIN32 ) # Apple AND Linux
if( APPLE ) if( APPLE )
# Apple Specific Options Here # Apple Specific Options Here
message( STATUS "Configuring Eos on OS X" ) message( STATUS "Configuring EOSIO on OS X" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" ) set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
else( APPLE ) else( APPLE )
# Linux Specific Options Here # Linux Specific Options Here
message( STATUS "Configuring Eos on Linux" ) message( STATUS "Configuring EOSIO on Linux" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall" ) set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall" )
if ( FULL_STATIC_BUILD ) if ( FULL_STATIC_BUILD )
set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc") set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
...@@ -168,7 +167,7 @@ else( WIN32 ) # Apple AND Linux ...@@ -168,7 +167,7 @@ else( WIN32 ) # Apple AND Linux
endif( WIN32 ) endif( WIN32 )
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Eos for code coverage analysis") set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build EOSIO for code coverage analysis")
if(ENABLE_COVERAGE_TESTING) if(ENABLE_COVERAGE_TESTING)
SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}") SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
...@@ -186,7 +185,7 @@ string(TOUPPER ${CORE_SYMBOL_NAME} CORE_SYMBOL_NAME) ...@@ -186,7 +185,7 @@ string(TOUPPER ${CORE_SYMBOL_NAME} CORE_SYMBOL_NAME)
string(LENGTH ${CORE_SYMBOL_NAME} CORE_SYMBOL_NAME_LENGTH) string(LENGTH ${CORE_SYMBOL_NAME} CORE_SYMBOL_NAME_LENGTH)
if (CORE_SYMBOL_NAME_LENGTH GREATER 7) if (CORE_SYMBOL_NAME_LENGTH GREATER 7)
message(FATAL_ERROR "CORE_SYMBOL_NAME lenght must be a between 1 and 7 characters") message(FATAL_ERROR "CORE_SYMBOL_NAME length must be between 1 and 7 characters")
endif() endif()
message( STATUS "Using '${CORE_SYMBOL_NAME}' as CORE symbol name" ) message( STATUS "Using '${CORE_SYMBOL_NAME}' as CORE symbol name" )
...@@ -195,7 +194,7 @@ if ("${EOSIO_ROOT_KEY}" STREQUAL "") ...@@ -195,7 +194,7 @@ if ("${EOSIO_ROOT_KEY}" STREQUAL "")
set(EOSIO_ROOT_KEY "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV") set(EOSIO_ROOT_KEY "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV")
endif() endif()
message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for eosio account" ) message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for 'eosio' account" )
include(wasm) include(wasm)
......
...@@ -5,7 +5,7 @@ include(FindDoxygen) ...@@ -5,7 +5,7 @@ include(FindDoxygen)
if(NOT DOXYGEN_FOUND) if(NOT DOXYGEN_FOUND)
message(STATUS "Doxygen not found. Contract documentation will not be generated.") message(STATUS "Doxygen not found. Contract documentation will not be generated.")
else() else()
set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.") set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
# CMake strips trailing path separators off of variables it knows are paths, # CMake strips trailing path separators off of variables it knows are paths,
# so the trailing '/' Doxygen expects is embedded in the doxyfile. # so the trailing '/' Doxygen expects is embedded in the doxyfile.
set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output") set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output")
......
...@@ -20,10 +20,10 @@ cd eos/Docker ...@@ -20,10 +20,10 @@ cd eos/Docker
docker build . -t eosio/eos docker build . -t eosio/eos
``` ```
The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the dawn-v4.0.0 tag, you could do the following: The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.0.0 tag, you could do the following:
```bash ```bash
docker build -t eosio/eos:dawn-v4.0.0 --build-arg branch=dawn-v4.0.0 . docker build -t eosio/eos:v1.0.0 --build-arg branch=v1.0.0 .
``` ```
By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image. By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.
...@@ -173,9 +173,9 @@ run `docker pull eosio/eos:latest` ...@@ -173,9 +173,9 @@ run `docker pull eosio/eos:latest`
run `docker-compose up` run `docker-compose up`
### Dawn 4.2 Testnet ### EOSIO 1.0 Testnet
We can easily set up a Dawn 4.2 local testnet using docker images. Just run the following commands: We can easily set up a EOSIO 1.0 local testnet using docker images. Just run the following commands:
Note: if you want to use the mongo db plugin, you have to enable it in your `data-dir/config.ini` first. Note: if you want to use the mongo db plugin, you have to enable it in your `data-dir/config.ini` first.
...@@ -188,13 +188,13 @@ docker volume create --name=nodeos-data-volume ...@@ -188,13 +188,13 @@ docker volume create --name=nodeos-data-volume
docker volume create --name=keosd-data-volume docker volume create --name=keosd-data-volume
docker volume create --name=mongo-data-volume docker volume create --name=mongo-data-volume
# start containers # start containers
docker-compose -f docker-compose-dawn4.2.yaml up -d docker-compose -f docker-compose-eosio1.0.yaml up -d
# get chain info # get chain info
curl http://127.0.0.1:8888/v1/chain/get_info curl http://127.0.0.1:8888/v1/chain/get_info
# get logs # get logs
docker-compose logs -f nodeosd docker-compose logs -f nodeosd
# stop containers # stop containers
docker-compose -f docker-compose-dawn4.2.yaml down docker-compose -f docker-compose-eosio1.0.yaml down
``` ```
The `blocks` data are stored under `--data-dir` by default, and the wallet files are stored under `--wallet-dir` by default, of course you can change these as you want. The `blocks` data are stored under `--data-dir` by default, and the wallet files are stored under `--wallet-dir` by default, of course you can change these as you want.
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8 DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "EOS.IO" PROJECT_NAME = "EOS.IO"
PROJECT_NUMBER = "DAWN ${DOXY_EOS_VERSION}" PROJECT_NUMBER = "EOSIO ${DOXY_EOS_VERSION}"
PROJECT_BRIEF = PROJECT_BRIEF =
PROJECT_LOGO = eos-logo.png PROJECT_LOGO = eos-logo.png
OUTPUT_DIRECTORY = OUTPUT_DIRECTORY =
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Dawn 4.0\n" "Project-Id-Version: EOSIO 1.0\n"
"Report-Msgid-Bugs-To: https://github.com/EOSIO/eos/issues" "Report-Msgid-Bugs-To: https://github.com/EOSIO/eos/issues"
"POT-Creation-Date: 2017-09-28 11:40-0400\n" "POT-Creation-Date: 2017-09-28 11:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册