songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Scripts/developer_scripts/create_new_release
View File

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