Skip to content
Snippets Groups Projects
Commit adc9f85d authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

fix(desktop) Fix indows build script

parent 89e7db0f
No related branches found
No related tags found
No related merge requests found
Pipeline #32892 failed
...@@ -5,6 +5,7 @@ Vagrant.configure("2") do |config| ...@@ -5,6 +5,7 @@ Vagrant.configure("2") do |config|
config.vm.define "duniter-release-windows" config.vm.define "duniter-release-windows"
config.vm.box = "https://s3.eu-central-1.amazonaws.com/duniter/vagrant/duniter_win7.box" config.vm.box = "https://s3.eu-central-1.amazonaws.com/duniter/vagrant/duniter_win7.box"
config.vm.box_url = "duniter_win7.box" config.vm.box_url = "duniter_win7.box"
config.vm.provision :shell, path: "build.bat", run: 'always' config.vm.provision :shell, path: "build.bat", run: 'always'
#config.vm.boot_timeout = 900 #config.vm.boot_timeout = 900
......
...@@ -13,12 +13,17 @@ REM InnoSetup ...@@ -13,12 +13,17 @@ REM InnoSetup
set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH% set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
cd C:\Users\vagrant cd C:\Users\vagrant
REM echo "Suppression des anciennes sources..." REM echo "Deleting old source..."
del /s /q cesium-v*-web.zip del /s /q cesium-v*-web.zip
rd /s /q cesium rd /s /q cesium
rd /s /q cesium_release rd /s /q cesium_release
echo "Clonage de Cesium..." echo "Cloning Cesium (from git.duniter.org)..."
echo "Cloning Cesium (from github.com)..."
git clone https://github.com/duniter/cesium.git git clone https://github.com/duniter/cesium.git
if not exist C:\Users\vagrant\cesium (
echo "ERROR: Cannot clone Cesium source!"
exit 1
)
cd cesium cd cesium
for /f "delims=" %%a in ('git rev-list --tags --max-count=1') do @set CESIUM_REV=%%a for /f "delims=" %%a in ('git rev-list --tags --max-count=1') do @set CESIUM_REV=%%a
...@@ -32,7 +37,7 @@ echo %CESIUM_ZIP% ...@@ -32,7 +37,7 @@ echo %CESIUM_ZIP%
cd .. cd ..
if not exist C:\vagrant\%NW_GZ% ( if not exist C:\vagrant\%NW_GZ% (
echo "Telechargement de %NW%.zip..." echo "Downloading %NW%.zip..."
REM powershell -Command "Invoke-WebRequest -Uri https://dl.nwjs.io/v%NW_VERSION%/%NW%.zip -OutFile C:\vagrant\%NW_GZ%" REM powershell -Command "Invoke-WebRequest -Uri https://dl.nwjs.io/v%NW_VERSION%/%NW%.zip -OutFile C:\vagrant\%NW_GZ%"
powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"https://dl.nwjs.io/v%NW_VERSION%/%NW%.zip\", \"C:\vagrant\%NW_GZ%\")" powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"https://dl.nwjs.io/v%NW_VERSION%/%NW%.zip\", \"C:\vagrant\%NW_GZ%\")"
) )
...@@ -68,3 +73,5 @@ cd .. ...@@ -68,3 +73,5 @@ cd ..
iscc C:\vagrant\cesium.iss /DROOT_PATH=%cd% iscc C:\vagrant\cesium.iss /DROOT_PATH=%cd%
move %cd%\Cesium.exe C:\vagrant\cesium-desktop-%CESIUM_TAG%-windows-x64.exe move %cd%\Cesium.exe C:\vagrant\cesium-desktop-%CESIUM_TAG%-windows-x64.exe
echo "Build done: binary available at cesium-desktop-%CESIUM_TAG%-windows-x64.exe" echo "Build done: binary available at cesium-desktop-%CESIUM_TAG%-windows-x64.exe"
exit 0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment