Windows package: add a 7z archive (same contents as the zip, but better compressed)

time-shift
Sébastien Villemot 2019-09-17 14:59:25 +02:00
parent 02bd23096a
commit d33d02f62e
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
4 changed files with 12 additions and 5 deletions

1
.gitignore vendored
View File

@ -142,6 +142,7 @@ windows/deps/sources32/
windows/deps/sources64/
windows/deps/tarballs/
windows/exe/
windows/7z/
windows/zip/
dynare++/32-bit/
dynare++/64-bit/

View File

@ -91,6 +91,7 @@ pkg_windows:
artifacts:
paths:
- windows/exe/*
- windows/7z/*
- windows/zip/*
expire_in: 1 week
dependencies:
@ -200,5 +201,6 @@ deploy_snapshot_unstable:
- f=(windows/exe/*) && osslsigncode sign -pkcs12 ~/dynare-object-signing.p12 -n Dynare -i https://www.dynare.org -in ${f[0]} -out ${f[0]}.signed && mv ${f[0]}.signed ${f[0]}
- cp *.tar.xz /srv/www.dynare.org/snapshot/source/ && ln -sf *.tar.xz /srv/www.dynare.org/snapshot/source/dynare-latest-src.tar.xz
- f=(windows/exe/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/windows/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/windows/dynare-latest-win.exe
- f=(windows/7z/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/windows-7z/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/windows-7z/dynare-latest-win.7z
- f=(windows/zip/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/windows-zip/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/windows-zip/dynare-latest-win.zip
- ~/update-snapshot-list.sh

View File

@ -28,7 +28,7 @@ clean-deps:
make -C deps clean-all
clean:
rm -rf exe/ zip/
rm -rf exe/ 7z/ zip/
clean-all: clean-deps clean

View File

@ -1,6 +1,6 @@
#!/bin/bash
# Produces Windows packages of Dynare (Windows installer and zip archive).
# Produces Windows packages of Dynare (executable installer, 7z and zip archives).
#
# The binaries are cross compiled for Windows (32/64bits), Octave and MATLAB
# (all supported versions).
@ -240,9 +240,9 @@ makensis -DVERSION="$VERSION" dynare.nsi
mkdir -p exe
mv dynare-"$VERSION"-win.exe "$ROOT_DIRECTORY"/exe/"$BASENAME"-win.exe
## Create .zip file (for those people that are not allowed to download/execute the installer)
## Create 7z and zip archives (for people not allowed to download/execute the installer)
# Set name of the root directory in the ZIP archive
# Set name of the root directory in the 7z and zip archives
ZIPNAME=dynare-$VERSION
ZIPDIR="$TMP_DIRECTORY"/"$ZIPNAME"
mkdir -p "$ZIPDIR"
@ -282,6 +282,10 @@ cp -p preprocessor/doc/preprocessor/preprocessor.pdf "$ZIPDIR"/doc
cp -p doc/gsa/gsa.pdf "$ZIPDIR"/doc
cp -p dynare++/doc/*.pdf "$ZIPDIR"/doc/dynare++
mkdir -p "$ROOT_DIRECTORY"/zip
cd "$TMP_DIRECTORY"
mkdir -p "$ROOT_DIRECTORY"/zip
zip -9 --quiet --recurse-paths "$ROOT_DIRECTORY"/zip/"$BASENAME"-win.zip "$ZIPNAME"
mkdir -p "$ROOT_DIRECTORY"/7z
7zr a -mx=9 "$ROOT_DIRECTORY"/7z/"$BASENAME"-win.7z "$ZIPNAME"