Use Docker NSIS image

Instead of calling NSIS directly, launch an image that handles this.
This commit is contained in:
Philipp Möller 2015-09-30 15:08:36 +02:00
parent 0100e321a3
commit 30d4951f3f
1 changed files with 7 additions and 17 deletions

View File

@ -120,12 +120,6 @@ VERSION_FILE="version_number"
HTML_DIR="/u/agrion/geometrica/CGAL/Members/Releases"
URL="http://cgal.inria.fr/CGAL/Members/Releases"
# Wine: run Windows application under Linux.
# Uncomment the lines with WINE and MAKENSIS to make the Windows installer
#WINE=wine
# The NSIS tool
#MAKENSIS=makensis.exe
# CGAL manual tool
# Needed by the making of the public release
CGAL_MANUAL=cgal_manual
@ -344,17 +338,13 @@ fi
if [ -n "$DO_PUBLIC" ]; then
# Build the Windows installer
rm -rf "${public_release_name}-NSIS"
mkdir ${public_release_name}-NSIS
mv ${public_release_name} ${public_release_name}-NSIS
cp ${SOURCES_DIR}/wininst/developer_scripts/* ${public_release_name}-NSIS
sed -i -e "/define *CGAL_SRC/,+20 s/CGAL-${MAJOR_NUMBER}.${MINOR_NUMBER}/${public_release_name}/g" ${public_release_name}-NSIS/script_cgal.nsi
pushd ${public_release_name}-NSIS
if [ -n "${WINE}" -a -n "${MAKENSIS}" ]; then
"${WINE}" "${MAKENSIS}" "script_cgal.nsi"
mv *.exe "${HTML_DIR}/${release_name}-public/"
fi
popd
docker pull cgal/cgal-nsis-dockerfile
docker create -v `realpath ${public_release_name}`:/mnt/cgal_release \
-v ${SOURCES_DIR}:/mnt/cgal_sources \
cgal/cgal-nsis-dockerfile
container_id=`docker ps -q -l`
docker start -a ${container_id}
docker cp ${container_id}:/nsis_release/${public_release_name}-Setup.exe "${HTML_DIR}/${release_name}-public/"
fi
# Remove local directory and tarball