From 30d4951f3f72692fb30c89e6289747bd69640e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Wed, 30 Sep 2015 15:08:36 +0200 Subject: [PATCH] Use Docker NSIS image Instead of calling NSIS directly, launch an image that handles this. --- Scripts/developer_scripts/create_new_release | 24 ++++++-------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Scripts/developer_scripts/create_new_release b/Scripts/developer_scripts/create_new_release index 18f7eb64bb2..27e9e4d479c 100755 --- a/Scripts/developer_scripts/create_new_release +++ b/Scripts/developer_scripts/create_new_release @@ -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