From 62a6c2170c1167521f595bbd2492d191dd00c9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Tue, 22 Dec 2020 13:54:12 -0300 Subject: [PATCH 1/8] [ETCM-491] Extend generated bash script with absolute path configs --- build.sbt | 7 ++----- src/universal/conf/application.ini | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 2e4194cd28..d2af68ee89 100644 --- a/build.sbt +++ b/build.sbt @@ -199,11 +199,8 @@ lazy val node = { mappings in Universal ++= directory((resourceDirectory in Compile).value / "chains").map { case (f, name) => f -> s"conf/$name" }, - jdkPackagerJVMArgs := Seq( - "-Dconfig.file=." + sep + "conf" + sep + "app.conf", - "-Dlogback.configurationFile=." + sep + "conf" + sep + "logback.xml", - "-Xss10M" - ) + bashScriptDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""", + bashScriptDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.conf"""" ) if (!nixBuild) diff --git a/src/universal/conf/application.ini b/src/universal/conf/application.ini index 3dbf31d102..0234a70184 100644 --- a/src/universal/conf/application.ini +++ b/src/universal/conf/application.ini @@ -1 +1 @@ --Dconfig.file=./conf/app.conf -Dlogback.configurationFile=./conf/logback.xml -J-Xmx4g -J-Xss10M +-J-Xmx4g -J-Xss10M From 0d371907c3207551f778e3b1bdc28cb0e76e6e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Tue, 22 Dec 2020 17:32:40 -0300 Subject: [PATCH 2/8] Add batScriptExtraDefines --- build.sbt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index d2af68ee89..ca09d97651 100644 --- a/build.sbt +++ b/build.sbt @@ -199,8 +199,10 @@ lazy val node = { mappings in Universal ++= directory((resourceDirectory in Compile).value / "chains").map { case (f, name) => f -> s"conf/$name" }, - bashScriptDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""", - bashScriptDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.conf"""" + bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""", + bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.conf"""", + batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\..\conf\app.conf"""", + batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\..\conf\logback.conf"""" ) if (!nixBuild) From 2b9f1a3f46669eee28fe94c9368fbc7f9ab3cfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Wed, 23 Dec 2020 12:57:43 -0300 Subject: [PATCH 3/8] Add mantis-launcher functionality to mantis script --- build.sbt | 8 ++++---- src/main/resources/scripts/extra.bat | 10 ++++++++++ src/main/resources/scripts/extra.sh | 10 ++++++++++ src/universal/bin/mantis-launcher | 9 +-------- 4 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/scripts/extra.bat create mode 100755 src/main/resources/scripts/extra.sh diff --git a/build.sbt b/build.sbt index ca09d97651..b371f33392 100644 --- a/build.sbt +++ b/build.sbt @@ -199,10 +199,10 @@ lazy val node = { mappings in Universal ++= directory((resourceDirectory in Compile).value / "chains").map { case (f, name) => f -> s"conf/$name" }, - bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""", - bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.conf"""", - batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\..\conf\app.conf"""", - batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\..\conf\logback.conf"""" + bashScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.sh"), + bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""", + batScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.bat"), + batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\..\conf\logback.xml"""" ) if (!nixBuild) diff --git a/src/main/resources/scripts/extra.bat b/src/main/resources/scripts/extra.bat new file mode 100644 index 0000000000..c3861b7bcb --- /dev/null +++ b/src/main/resources/scripts/extra.bat @@ -0,0 +1,10 @@ +set "CHAIN=%~1" +set "CONFIG_FILE=%APP_HOME\..\conf\%CHAIN%.conf" + +if exists %CONFIG_FILE% ( + call :addJava "-Dconfig.file=%CONFIG_FILE%" + shift +) else if "%1"=="" ( + echo "You need to choose a chain" + exit /B 1 +) diff --git a/src/main/resources/scripts/extra.sh b/src/main/resources/scripts/extra.sh new file mode 100755 index 0000000000..22c62e2066 --- /dev/null +++ b/src/main/resources/scripts/extra.sh @@ -0,0 +1,10 @@ +chain="$1" +config_file="${app_home}/../conf/${chain}.conf" + +if [ -f "$config_file" ]; then + addJava "-Dconfig.file=${config_file}" + shift +elif [ $# -eq 0 ]; then + echo "You need to choose a chain" + exit 1 +fi diff --git a/src/universal/bin/mantis-launcher b/src/universal/bin/mantis-launcher index 8d4ee8e933..494bc69c52 100755 --- a/src/universal/bin/mantis-launcher +++ b/src/universal/bin/mantis-launcher @@ -3,11 +3,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/.. -chain="$1" -if [ -z "$chain" ] -then - echo "You need to choose chain" -else - shift - ./bin/mantis -Dconfig.file=./conf/"$chain".conf "$@" -fi +./bin/mantis "$@" From 01ef93e82f3e2245a0a8eb8a2d9200be29959e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Wed, 23 Dec 2020 12:59:29 -0300 Subject: [PATCH 4/8] Add missing % --- src/main/resources/scripts/extra.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/scripts/extra.bat b/src/main/resources/scripts/extra.bat index c3861b7bcb..cb762b09e5 100644 --- a/src/main/resources/scripts/extra.bat +++ b/src/main/resources/scripts/extra.bat @@ -1,5 +1,5 @@ set "CHAIN=%~1" -set "CONFIG_FILE=%APP_HOME\..\conf\%CHAIN%.conf" +set "CONFIG_FILE=%APP_HOME%\..\conf\%CHAIN%.conf" if exists %CONFIG_FILE% ( call :addJava "-Dconfig.file=%CONFIG_FILE%" From d5727b9090b2efd2aa370da5823562f17ad6ac42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Mon, 28 Dec 2020 16:10:06 -0300 Subject: [PATCH 5/8] Move everything into extra files --- build.sbt | 4 +--- src/main/resources/scripts/extra.bat | 8 +++++--- src/main/resources/scripts/extra.sh | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index b371f33392..3a8c539029 100644 --- a/build.sbt +++ b/build.sbt @@ -200,9 +200,7 @@ lazy val node = { f -> s"conf/$name" }, bashScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.sh"), - bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""", - batScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.bat"), - batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\..\conf\logback.xml"""" + batScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.bat") ) if (!nixBuild) diff --git a/src/main/resources/scripts/extra.bat b/src/main/resources/scripts/extra.bat index cb762b09e5..6a2d6282f3 100644 --- a/src/main/resources/scripts/extra.bat +++ b/src/main/resources/scripts/extra.bat @@ -1,10 +1,12 @@ set "CHAIN=%~1" -set "CONFIG_FILE=%APP_HOME%\..\conf\%CHAIN%.conf" +set "CONFIG_FILE=%APP_HOME%\conf\%CHAIN%.conf" -if exists %CONFIG_FILE% ( - call :addJava "-Dconfig.file=%CONFIG_FILE%" +if exist %CONFIG_FILE% ( + call :add_java "-Dconfig.file=%CONFIG_FILE%" shift ) else if "%1"=="" ( echo "You need to choose a chain" exit /B 1 ) + +call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml" diff --git a/src/main/resources/scripts/extra.sh b/src/main/resources/scripts/extra.sh index 22c62e2066..6a0492af96 100755 --- a/src/main/resources/scripts/extra.sh +++ b/src/main/resources/scripts/extra.sh @@ -8,3 +8,5 @@ elif [ $# -eq 0 ]; then echo "You need to choose a chain" exit 1 fi + +addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml" From 256ab9820321af6db4167307b4625425247bf7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Tue, 29 Dec 2020 14:16:38 -0300 Subject: [PATCH 6/8] Fix for Windows --- src/main/resources/scripts/extra.bat | 13 +++++-------- src/main/scala/io/iohk/ethereum/App.scala | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/resources/scripts/extra.bat b/src/main/resources/scripts/extra.bat index 6a2d6282f3..f087101b20 100644 --- a/src/main/resources/scripts/extra.bat +++ b/src/main/resources/scripts/extra.bat @@ -1,12 +1,9 @@ -set "CHAIN=%~1" +set "CHAIN=%1" set "CONFIG_FILE=%APP_HOME%\conf\%CHAIN%.conf" -if exist %CONFIG_FILE% ( - call :add_java "-Dconfig.file=%CONFIG_FILE%" - shift -) else if "%1"=="" ( - echo "You need to choose a chain" - exit /B 1 -) +if not exist %CONFIG_FILE% goto :skip +call :add_java "-Dconfig.file=%CONFIG_FILE%" +shift +:skip call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml" diff --git a/src/main/scala/io/iohk/ethereum/App.scala b/src/main/scala/io/iohk/ethereum/App.scala index 9a516d311f..a8c5c91455 100644 --- a/src/main/scala/io/iohk/ethereum/App.scala +++ b/src/main/scala/io/iohk/ethereum/App.scala @@ -35,7 +35,7 @@ object App extends Logger { case Some(`cli`) => CliLauncher.main(args.tail) case Some(unknown) => log.error( - s"Unrecognised launcher option, " + + s"Unrecognised launcher option $unknown, " + s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, " + s"$faucet, $vmServer, $ecKeyGen, $sigValidator or $cli" ) From ec96e117f8df5a998116425ef6e64a4795ffd901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Tue, 29 Dec 2020 17:15:02 -0300 Subject: [PATCH 7/8] Unify Windows scripts --- build.sbt | 6 ++++-- src/main/resources/scripts/extra.bat | 9 --------- src/main/resources/scripts/extra.sh | 12 ------------ src/universal/bin/mantis-launcher | 8 +++++++- src/windows/bin/eckeygen.bat | 5 +++++ src/windows/bin/faucet-server.bat | 5 +++++ src/windows/bin/mantis-launcher.bat | 19 +++++++++++++++++++ src/windows/bin/mantis-vm.bat | 5 +++++ src/windows/bin/signatureValidator.bat | 5 +++++ 9 files changed, 50 insertions(+), 24 deletions(-) delete mode 100644 src/main/resources/scripts/extra.bat delete mode 100755 src/main/resources/scripts/extra.sh create mode 100755 src/windows/bin/eckeygen.bat create mode 100755 src/windows/bin/faucet-server.bat create mode 100644 src/windows/bin/mantis-launcher.bat create mode 100755 src/windows/bin/mantis-vm.bat create mode 100755 src/windows/bin/signatureValidator.bat diff --git a/build.sbt b/build.sbt index 3a8c539029..47149d72a2 100644 --- a/build.sbt +++ b/build.sbt @@ -199,8 +199,10 @@ lazy val node = { mappings in Universal ++= directory((resourceDirectory in Compile).value / "chains").map { case (f, name) => f -> s"conf/$name" }, - bashScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.sh"), - batScriptExtraDefines ++= IO.readLines((resourceDirectory in Compile).value / "scripts" / "extra.bat") + bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""", + bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""", + batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\..\conf\app.conf"""", + batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml"""" ) if (!nixBuild) diff --git a/src/main/resources/scripts/extra.bat b/src/main/resources/scripts/extra.bat deleted file mode 100644 index f087101b20..0000000000 --- a/src/main/resources/scripts/extra.bat +++ /dev/null @@ -1,9 +0,0 @@ -set "CHAIN=%1" -set "CONFIG_FILE=%APP_HOME%\conf\%CHAIN%.conf" - -if not exist %CONFIG_FILE% goto :skip -call :add_java "-Dconfig.file=%CONFIG_FILE%" -shift - -:skip -call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml" diff --git a/src/main/resources/scripts/extra.sh b/src/main/resources/scripts/extra.sh deleted file mode 100755 index 6a0492af96..0000000000 --- a/src/main/resources/scripts/extra.sh +++ /dev/null @@ -1,12 +0,0 @@ -chain="$1" -config_file="${app_home}/../conf/${chain}.conf" - -if [ -f "$config_file" ]; then - addJava "-Dconfig.file=${config_file}" - shift -elif [ $# -eq 0 ]; then - echo "You need to choose a chain" - exit 1 -fi - -addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml" diff --git a/src/universal/bin/mantis-launcher b/src/universal/bin/mantis-launcher index 494bc69c52..66371b2b80 100755 --- a/src/universal/bin/mantis-launcher +++ b/src/universal/bin/mantis-launcher @@ -3,4 +3,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/.. -./bin/mantis "$@" +CONFIG_FILE="./conf/$1.conf" +if [ -f "$CONFIG_FILE" ]; then + shift + CHAIN_PARAM="-Dconfig.file=$CONFIG_FILE" +fi + +./bin/mantis ${CHAIN_PARAM:+"$CHAIN_PARAM"} "$@" diff --git a/src/windows/bin/eckeygen.bat b/src/windows/bin/eckeygen.bat new file mode 100755 index 0000000000..af652e5679 --- /dev/null +++ b/src/windows/bin/eckeygen.bat @@ -0,0 +1,5 @@ +@echo off + +cd "%~dp0\.." + +call bin\mantis.bat eckeygen %* diff --git a/src/windows/bin/faucet-server.bat b/src/windows/bin/faucet-server.bat new file mode 100755 index 0000000000..8b652a12c9 --- /dev/null +++ b/src/windows/bin/faucet-server.bat @@ -0,0 +1,5 @@ +@echo off + +cd "%~dp0\.." + +call bin\mantis.bat faucet %* diff --git a/src/windows/bin/mantis-launcher.bat b/src/windows/bin/mantis-launcher.bat new file mode 100644 index 0000000000..d0d8a5ff7a --- /dev/null +++ b/src/windows/bin/mantis-launcher.bat @@ -0,0 +1,19 @@ +@echo off + +cd "%~dp0\.." + +set "CONFIG_FILE=conf\%1.conf" +set "RESTVAR=%*" + +if not exist %CONFIG_FILE% goto :skip + set "CHAIN_PARAM=-Dconfig.file=%CONFIG_FILE%" + set RESTVAR= + shift + :loop + if "%1"=="" goto skip + set RESTVAR=%RESTVAR% %1 + shift + goto loop + +:skip +call bin\mantis.bat %CHAIN_PARAM% %RESTVAR% diff --git a/src/windows/bin/mantis-vm.bat b/src/windows/bin/mantis-vm.bat new file mode 100755 index 0000000000..3ceec8de14 --- /dev/null +++ b/src/windows/bin/mantis-vm.bat @@ -0,0 +1,5 @@ +@echo off + +cd "%~dp0\.." + +call bin\mantis.bat vm-server %* diff --git a/src/windows/bin/signatureValidator.bat b/src/windows/bin/signatureValidator.bat new file mode 100755 index 0000000000..6f7f536463 --- /dev/null +++ b/src/windows/bin/signatureValidator.bat @@ -0,0 +1,5 @@ +@echo off + +cd "%~dp0\.." + +call bin\mantis.bat signature-validator %* From 77825c2a65172d34e65f39d55a22810da675534f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Rodr=C3=ADguez?= Date: Tue, 29 Dec 2020 17:30:17 -0300 Subject: [PATCH 8/8] More Windows fixes --- build.sbt | 2 +- src/{windows => universal}/bin/eckeygen.bat | 0 src/{windows => universal}/bin/faucet-server.bat | 0 src/{windows => universal}/bin/mantis-launcher.bat | 0 src/{windows => universal}/bin/mantis-vm.bat | 0 src/{windows => universal}/bin/signatureValidator.bat | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename src/{windows => universal}/bin/eckeygen.bat (100%) rename src/{windows => universal}/bin/faucet-server.bat (100%) rename src/{windows => universal}/bin/mantis-launcher.bat (100%) rename src/{windows => universal}/bin/mantis-vm.bat (100%) rename src/{windows => universal}/bin/signatureValidator.bat (100%) diff --git a/build.sbt b/build.sbt index 47149d72a2..2af074dabf 100644 --- a/build.sbt +++ b/build.sbt @@ -201,7 +201,7 @@ lazy val node = { }, bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""", bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""", - batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\..\conf\app.conf"""", + batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\conf\app.conf"""", batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml"""" ) diff --git a/src/windows/bin/eckeygen.bat b/src/universal/bin/eckeygen.bat similarity index 100% rename from src/windows/bin/eckeygen.bat rename to src/universal/bin/eckeygen.bat diff --git a/src/windows/bin/faucet-server.bat b/src/universal/bin/faucet-server.bat similarity index 100% rename from src/windows/bin/faucet-server.bat rename to src/universal/bin/faucet-server.bat diff --git a/src/windows/bin/mantis-launcher.bat b/src/universal/bin/mantis-launcher.bat similarity index 100% rename from src/windows/bin/mantis-launcher.bat rename to src/universal/bin/mantis-launcher.bat diff --git a/src/windows/bin/mantis-vm.bat b/src/universal/bin/mantis-vm.bat similarity index 100% rename from src/windows/bin/mantis-vm.bat rename to src/universal/bin/mantis-vm.bat diff --git a/src/windows/bin/signatureValidator.bat b/src/universal/bin/signatureValidator.bat similarity index 100% rename from src/windows/bin/signatureValidator.bat rename to src/universal/bin/signatureValidator.bat