Merge pull request #63 from evoskuil/master

Rename binary to bs/bs.exe.

Author: evoskuil

.travis.yml

@@ -61,7 +61,7 @@ install:
     - if [[ $LINUX && $GCC   && $STATIC  ]]; then sudo apt-get -qq install bash-completion; fi
 
     # Download and install packages for osx/clang/dynamic.
-    - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then brew install bash-completion; fi
+    - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then brew unlink bash-completion; brew install bash-completion; fi
 
     # Download and install packages for linux/clang/dynamic.
     - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo apt-get -qq install boost1.54; fi
@@ -74,7 +74,7 @@ script:
     # Download and build libbitcoin-server and all dependencies.
     - if [[ $OSX   && $CLANG && $STATIC  ]]; then ./install.sh --without-consensus --with-secp256k1 --without-openssl --enable-testnet --disable-shared --build-boost --prefix=$HOME/my-prefix; fi
     - if [[ $LINUX && $CLANG && $STATIC  ]]; then ./install.sh --with-secp256k1 --without-openssl --disable-shared --build-boost --prefix=$HOME/my-prefix CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
-    - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --disable-ndebug --disable-shared --build-boost --prefix=$HOME/my-prefix --build-dir=my-build --with-bash-completiondir CXXFLAGS='-Os -s'; fi
+    - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --disable-ndebug --disable-shared --build-boost --prefix=$HOME/my-prefix --build-dir=my-build --with-bash-completiondir CXXFLAGS='-Os -s -static'; fi
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then ./install.sh --with-secp256k1 --without-openssl --with-bash-completiondir; fi
     - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
     - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --without-consensus --disable-static --build-boost --with-bash-completiondir CXXFLAGS='-Os -s'; fi

Makefile.am

@@ -29,12 +29,12 @@ doc_DATA = \
     NEWS \
     README
 
-# src/bitcoin_server => ${bindir}
+# src/bs => ${bindir}
 #------------------------------------------------------------------------------
-bin_PROGRAMS = src/bitcoin_server
-src_bitcoin_server_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\" ${bitcoin_node_CPPFLAGS} ${sodium_CPPFLAGS} ${czmq___CPPFLAGS}
-src_bitcoin_server_LDADD = ${bitcoin_node_LIBS} ${sodium_LIBS} ${czmq___LIBS}
-src_bitcoin_server_SOURCES = \
+bin_PROGRAMS = src/bs
+src_bs_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\" ${bitcoin_node_CPPFLAGS} ${sodium_CPPFLAGS} ${czmq___CPPFLAGS}
+src_bs_LDADD = ${bitcoin_node_LIBS} ${sodium_LIBS} ${czmq___LIBS}
+src_bs_SOURCES = \
     src/config.cpp \
     src/config.hpp \
     src/echo.cpp \
@@ -77,13 +77,13 @@ src_bitcoin_server_SOURCES = \
 if BASH_COMPLETIONDIR
 
 dist_bash_completion_DATA = \
-    data/bitcoin_server
+    data/bs
 
 endif BASH_COMPLETIONDIR
 
 # files => ${sysconfdir}/libbitcoin
 #------------------------------------------------------------------------------
 sysconf_libbitcoindir = ${sysconfdir}/libbitcoin
 sysconf_libbitcoin_DATA = \
-    data/server.cfg
+    data/bs.cfg
 

README.md

@@ -79,7 +79,7 @@ Finally install Libbitcoin Server:
 ```sh
 $ sudo ./install.sh
 ```
-Libbitcoin Server is now installed in `/usr/local/bin` and can be invoked as `$ bitcoin_server`.
+Libbitcoin Server is now installed in `/usr/local/bin` and can be invoked as `$ bs`.
 
 ### Macintosh
 
@@ -126,7 +126,7 @@ Finally install Libbitcoin Server:
 ```sh
 $ ./install.sh
 ```
-Libbitcoin Server is now installed in `/usr/local/bin` and can be invoked as `$ bitcoin_server`.
+Libbitcoin Server is now installed in `/usr/local/bin` and can be invoked as `$ bs`.
 
 #### Using MacPorts
 
@@ -149,7 +149,7 @@ Finally install Libbitcoin Server:
 ```sh
 $ ./install.sh
 ```
-Libbitcoin Server is now installed in `/usr/local/bin` and can be invoked as `$ bitcoin_server`.
+Libbitcoin Server is now installed in `/usr/local/bin` and can be invoked as `$ bs`.
 
 ### Configuration Options
 
@@ -160,7 +160,7 @@ Building for minimum size and with debug symbols stripped:
 $ sudo ./install.sh CXXFLAGS="-Os -s"
 ```
 
-> The `-s` option is not supported by the Clang compiler. Instead use the command `$ strip bitcoin_server` after the build.
+> The `-s` option is not supported by the Clang compiler. Instead use the command `$ strip bs` after the build.
 
 Building with NDEBUG (no debug assertions) defined:
 ```sh

builds/msvc/build/buildall.bat

@@ -1,7 +1,7 @@
 @ECHO OFF
 ECHO.
 ECHO Downloading libbitcoin-server dependencies from NuGet
-CALL nuget.exe install ..\vs2013\bitcoin-server\packages.config
+CALL nuget.exe install ..\vs2013\bs\packages.config
 ECHO.
 CALL buildbase.bat ..\vs2013\libbitcoin-server.sln 12
 ECHO.

builds/msvc/resource.rc

@@ -4,7 +4,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>CTP_Nov2013</PlatformToolset>
     <ProjectGuid>{F45B7D90-90BC-41EF-9AD1-9B29256A09FE}</ProjectGuid>
-    <ProjectName>bitcoin-server</ProjectName>
+    <ProjectName>bs</ProjectName>
     <NuGetPackageImportStamp>d5ab076e</NuGetPackageImportStamp>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

…2013/bitcoin-server/bitcoin-server.props builds/msvc/vs2013/bs/bs.propsbuilds/msvc/vs2013/bitcoin-server/bitcoin-server.props renamed to builds/msvc/vs2013/bs/bs.props builds/msvc/vs2013/bitcoin-server/bitcoin-server.props renamed to builds/msvc/vs2013/bs/bs.props

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoin-server", "bitcoin-server\bitcoin-server.vcxproj", "{F45B7D90-90BC-41EF-9AD1-9B29256A09FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs", "bs\bs.vcxproj", "{F45B7D90-90BC-41EF-9AD1-9B29256A09FE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution