diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh index 1a43eaa86fa713f79b66138f9e19695c0832cf75..c555a20bc896adaa34c42c2402166124517e70b6 100755 --- a/release/arch/arm/build-arm.sh +++ b/release/arch/arm/build-arm.sh @@ -61,7 +61,10 @@ echo "Copying Nodejs" cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node echo "npm install" -node/bin/npm install --production +node/bin/npm install +node/bin/npm install duniter-ui@1.4.x +sed -i "s/duniter\//..\/..\/..\/..\//g" node_modules/duniter-ui/server/controller/webmin.js +node/bin/npm prune --production SRC=`pwd` echo $SRC diff --git a/release/arch/debian/build-deb.sh b/release/arch/debian/build-deb.sh index 9a052556de730e8aab447ada9f71df26a5e8c691..ea8f2d36bfecd2c8e4b9bd43b6b86ee0b9b3099c 100644 --- a/release/arch/debian/build-deb.sh +++ b/release/arch/debian/build-deb.sh @@ -75,11 +75,15 @@ cd ${RELEASES}/duniter # Remove git files rm -Rf .git [[ $? -eq 0 ]] && echo ">> VM: building modules..." -[[ $? -eq 0 ]] && yarn --production +[[ $? -eq 0 ]] && yarn #[[ $? -eq 0 ]] && echo ">> VM: running tests..." #[[ $? -eq 0 ]] && yarn test -[[ $? -eq 0 ]] && node -e "const deps = require('./package.json').peerDependencies; Object.keys(deps).forEach(k => console.log(k + \"@\" + deps[k]))" | xargs yarn add --production +# Duniter UI +[[ $? -eq 0 ]] && yarn add duniter-ui@1.4.x +[[ $? -eq 0 ]] && sed -i "s/duniter\//..\/..\/..\/..\//g" node_modules/duniter-ui/server/controller/webmin.js + +[[ $? -eq 0 ]] && npm prune --production # Specific modules that are not needed in a release diff --git a/release/arch/windows/build.bat b/release/arch/windows/build.bat index 2f06db1ccc89cf2c0f10087ca85e0733c2fbc4a4..b60634f98ad490cbc7fa8026025c61bc898cc49b 100644 --- a/release/arch/windows/build.bat +++ b/release/arch/windows/build.bat @@ -1,9 +1,6 @@ -set DUNITER_BRANCH=1.3.x +set DUNITER_BRANCH=1.4.x set VER_UI=%DUNITER_BRANCH% -set VER_BMA=%DUNITER_BRANCH% -set VER_CRAWLER=%DUNITER_BRANCH% -set VER_KEYPAIR=%DUNITER_BRANCH% set ADDON_VERSION=48 set NW_VERSION=0.17.6 @@ -46,18 +43,17 @@ echo %DUNITER_TAG% git checkout %DUNITER_TAG% call npm cache clean -call npm install --production +call npm install REM call npm test +echo "Ajout du module 1/1 (duniter-ui)..." +call npm install duniter-ui@%VER_UI% --save --production +REM sed -i "s/duniter\//..\/..\/..\/..\//g" node_modules/duniter-ui/server/controller/webmin.js +cd node_modules\duniter-ui\server\controller\ +powershell -Command "(Get-Content webmin.js) | foreach-object {$_ -replace 'duniter/','../../../../' } | Set-Content webmin.js2" +move /y webmin.js2 webmin.js +cd ..\..\..\.. echo "Retrait des modules 'dev'..." call npm prune --production -echo "Ajout du module 1/4..." -call npm install duniter-bma@%VER_BMA% --save --production -echo "Ajout du module 2/4..." -call npm install duniter-crawler@%VER_CRAWLER% --save --production -echo "Ajout du module 3/4..." -call npm install duniter-keypair@%VER_KEYPAIR% --save --production -echo "Ajout du module 4/4..." -call npm install duniter-ui@%VER_UI% --save --production REM echo ">> VM: installing peerDependencies installer..." REM call npm i --save-dev @team-griffin/install-self-peers