1
0
Fork 0

Installation of runtimes libraries for Installer is incorporated in automatical build

This commit is contained in:
= 2014-05-02 11:44:25 +02:00
parent 7cd6cb1039
commit 83869cb8d2
3 changed files with 64 additions and 0 deletions

View File

@ -246,6 +246,8 @@ pack-winXX-cmake:
cd Build$(BITS) && cmake --build . --config Release cd Build$(BITS) && cmake --build . --config Release
cd Build$(BITS) && cpack -G NSIS cd Build$(BITS) && cpack -G NSIS
./installer-generator.sh $(BITS)
################################################################################ ################################################################################
### @brief Windows Vista 64-bit bundle ### @brief Windows Vista 64-bit bundle

View File

@ -0,0 +1,52 @@
; arango-packer-template.nsi
;
; this script copies the installation program
; for arango and the corresponding window runtime
; libraries which the arango installation program needs
;
; The installation program and the runtimes are
; copied to the TEMP directory and then the arango
; installer is started
;--------------------------------
; !include "Library.nsh"
; The name of the installer
Name "arango-unpacker"
; The file to write
OutFile "arango-unpacker-@BITS@.exe"
; The default installation directory
!define APPNAME "Unpacker"
!define COMPANYNAME "Triagens"
InstallDir $TEMP\${COMPANYNAME}\${APPNAME}
; Request application privileges for Windows Vista
RequestExecutionLevel user
;--------------------------------
; Pages
Page instfiles
;--------------------------------
; The stuff to install
Section "" ;No components page, name is not important
; Set output path to the installation directory.
SetOutPath $INSTDIR
; Put file there
; !insertmacro InstallLib DLL SHARED NOREBOOT_PROTECTED "exdll.dll" $INSTDIR $TEMP
file "..\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll"
file "@INSTALLERNAME@.exe"
Rename "$INSTDIR\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll" "$INSTDIR\msvcr120.dll"
; Rename "$INSTDIR\Build@BITS@\@INSTALLERNAME@.exe" "$INSTDIR\@INSTALLERNAME@.exe"
Exec "$INSTDIR\@INSTALLERNAME@.exe"
Quit
SectionEnd ; end the section

10
installer-generator.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/bash
NSIS_PATH="/cygdrive/c/Program Files (x86)/NSIS"
bits=$1
INSTALLERNAME=`grep CPACK_PACKAGE_FILE_NAME Build$bits/CPackConfig.cmake | grep -o '".*"' | awk -F\" '{print $2}'`
cat Installation/Windows/Templates/arango-packer-template.nsi | sed -e "s/@BITS@/$bits/g" | sed -e "s/@INSTALLERNAME@/${INSTALLERNAME}/g" > Build$bits/arango-packer-$bits.nsi
"$NSIS_PATH"/bin/makensis.exe Build$bits/arango-packer-$bits.nsi