Generate [package].hpp, parse ver in version.hpp, refactor.

Author: evoskuil

generate.bat

@@ -14,7 +14,7 @@ REM ###########################################################################
 REM Do everything relative to this file location.
 pushd %~dp0
 
-REM Clean and make directories for generated build artifacts.
+REM Clean directories for generated build artifacts.
 rmdir /s /q libbitcoin            2>NUL
 rmdir /s /q libbitcoin-blockchain 2>NUL
 rmdir /s /q libbitcoin-client     2>NUL
@@ -24,30 +24,21 @@ rmdir /s /q libbitcoin-node       2>NUL
 rmdir /s /q libbitcoin-protocol   2>NUL
 rmdir /s /q libbitcoin-server     2>NUL
 
-mkdir libbitcoin
-mkdir libbitcoin-blockchain
-mkdir libbitcoin-client
-mkdir libbitcoin-consensus
-mkdir libbitcoin-explorer
-mkdir libbitcoin-node
-mkdir libbitcoin-protocol
-mkdir libbitcoin-server
-
 REM Generate build artifacts.
 gsl -q generate.xml
 
 REM Handle errors below.
 if %errorlevel% neq 0 goto error
 
 REM Copy outputs to all repositories.
-copy /b /y libbitcoin\*             ..\libbitcoin\
-copy /b /y libbitcoin-blockchain\*  ..\libbitcoin-blockchain\
-copy /b /y libbitcoin-client\*      ..\libbitcoin-client\
-copy /b /y libbitcoin-consensus\*   ..\libbitcoin-consensus\
-copy /b /y libbitcoin-explorer\*    ..\libbitcoin-explorer\
-copy /b /y libbitcoin-node\*        ..\libbitcoin-node\
-copy /b /y libbitcoin-protocol\*    ..\libbitcoin-protocol\
-copy /b /y libbitcoin-server\*      ..\libbitcoin-server\
+xcopy /s /y libbitcoin\*             ..\libbitcoin\
+xcopy /s /y libbitcoin-blockchain\*  ..\libbitcoin-blockchain\
+xcopy /s /y libbitcoin-client\*      ..\libbitcoin-client\
+xcopy /s /y libbitcoin-consensus\*   ..\libbitcoin-consensus\
+xcopy /s /y libbitcoin-explorer\*    ..\libbitcoin-explorer\
+xcopy /s /y libbitcoin-node\*        ..\libbitcoin-node\
+xcopy /s /y libbitcoin-protocol\*    ..\libbitcoin-protocol\
+xcopy /s /y libbitcoin-server\*      ..\libbitcoin-server\
 
 REM Generate bindings from generated binding generators.
 REM The path to swig.exe must be in our path.

generate.gsl

@@ -44,7 +44,7 @@ gsl from "templates/gsl.travis.yml"
 
 # Generate public API.
 generate_version()
-#generate_include()
+generate_include()
 #generate_interface()
 
 # Generate binding generators.

generate.sh

@@ -14,7 +14,7 @@ set -e
 # Do everything relative to this file location.
 cd `dirname "$0"`
 
-# Clean and make directories for generated build artifacts.
+# Clean directories for generated build artifacts.
 rm -rf libbitcoin
 rm -rf libbitcoin-blockchain
 rm -rf libbitcoin-client
@@ -24,37 +24,28 @@ rm -rf libbitcoin-node
 rm -rf libbitcoin-protocol
 rm -rf libbitcoin-server
 
-mkdir libbitcoin
-mkdir libbitcoin-blockchain
-mkdir libbitcoin-client
-mkdir libbitcoin-consensus
-mkdir libbitcoin-explorer
-mkdir libbitcoin-node
-mkdir libbitcoin-protocol
-mkdir libbitcoin-server
-
 # Generate build artifacts.
 gsl -q generate.xml
 
-# Copy outputs to all repositories.
-cp -r  libbitcoin/.             ../libbitcoin
-cp -r  libbitcoin-blockchain/.  ../libbitcoin-blockchain
-cp -r  libbitcoin-client/.      ../libbitcoin-client
-cp -r  libbitcoin-consensus/.   ../libbitcoin-consensus
-cp -r  libbitcoin-explorer/.    ../libbitcoin-explorer
-cp -r  libbitcoin-node/.        ../libbitcoin-node
-cp -r  libbitcoin-protocol/.    ../libbitcoin-protocol
-cp -r  libbitcoin-server/.      ../libbitcoin-server
+# Make generated scripts executable.
+chmod +x libbitcoin/*.sh
+chmod +x libbitcoin-blockchain/*.sh
+chmod +x libbitcoin-client/*.sh
+chmod +x libbitcoin-consensus/*.sh
+chmod +x libbitcoin-explorer/*.sh
+chmod +x libbitcoin-node/*.sh
+chmod +x libbitcoin-protocol/*.sh
+chmod +x libbitcoin-server/*.sh
 
-# Make root scripts executable.
-chmod +x ../libbitcoin/*.sh
-chmod +x ../libbitcoin-blockchain/*.sh
-chmod +x ../libbitcoin-client/*.sh
-chmod +x ../libbitcoin-consensus/*.sh
-chmod +x ../libbitcoin-explorer/*.sh
-chmod +x ../libbitcoin-node/*.sh
-chmod +x ../libbitcoin-protocol/*.sh
-chmod +x ../libbitcoin-server/*.sh
+# Copy outputs to all repositories.
+cp -rf  libbitcoin/.             ../libbitcoin
+cp -rf  libbitcoin-blockchain/.  ../libbitcoin-blockchain
+cp -rf  libbitcoin-client/.      ../libbitcoin-client
+cp -rf  libbitcoin-consensus/.   ../libbitcoin-consensus
+cp -rf  libbitcoin-explorer/.    ../libbitcoin-explorer
+cp -rf  libbitcoin-node/.        ../libbitcoin-node
+cp -rf  libbitcoin-protocol/.    ../libbitcoin-protocol
+cp -rf  libbitcoin-server/.      ../libbitcoin-server
 
 # Generate bindings from generated binding generators.
 # The path to swig must be in our path.

generate.xml

@@ -697,7 +697,7 @@
         <sources path="test" />
       </product>
       <product prefix="include" container="bitcoin">
-        <files path="include/bitcoin" summary="consensus" />
+        <files path="include/bitcoin" />
       </product>
       <product prefix="lib" path="bindings/java/wrap" name="bitcoin-consensus-jni" option="java">
         <library name="bitcoin-consensus" />

sandbox/sandbox.gsl

@@ -3,7 +3,7 @@
 #
 #  GSL sandbox, for trying out stuff and documenting issues in GSL.
 #
-#  This is a code generator built using the iMatix GSL code generation
+#  This is a code generator that requires the iMatix GSL code generation
 #  language. See https://github.com/imatix/gsl for details.
 #
 ###############################################################################