Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
silx
bob
silx
Commits
2bbcb269
Commit
2bbcb269
authored
Nov 05, 2021
by
Thomas Vincent
Browse files
Merge branch 'tvincent-main-patch-85176' into 'main'
Update to match windows fat binary updates See merge request
!2
parents
e5861e5d
2247fb4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
2bbcb269
...
...
@@ -250,19 +250,20 @@ windows_exe:
-
pip install --find-links http://www.silx.org/pub/wheelhouse/ --trusted-host www.silx.org --prefer-binary pyopencl
-
pip install .[full,test]
# Install pyinstaller
-
pip install pyinstaller
==4.1
-
pip install pyinstaller
# Generate fat binary
-
cd package
-
cd windows
-
pyinstaller pyinstaller.spec
-
pyinstaller pyinstaller-silx-view.spec
-
cd dist
-
dir
-
xcopy silx-view\silx-view.exe silx
-
xcopy silx-view\silx-view.exe.manifest silx
-
python -m zipfile -c %BOB_WINDOWS_APPLICATION% silx
-
xcopy %BOB_WINDOWS_APPLICATION% "..\\..\\..\\..\\..\\artifacts"
-
cd ..
-
cd artifacts
-
dir
-
xcopy "*.exe" "..\\..\\..\\..\\..\\artifacts"
-
cd ..
-
cd ..
-
cd ..
artifacts
:
...
...
@@ -279,7 +280,9 @@ windows_test_exe:
-
rd /s /q silx
-
python -m zipfile -e "artifacts\\silx-windows-application.zip" .
-
cd silx
-
silx.exe test --no-gui --no-opencl
-
silx-view.exe
-
timeout
10
-
taskkill /IM "silx-view.exe" /F
-
cd ..
-
rmdir silx /s /q
needs
:
[
"
windows_exe"
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment