Commit b4a37d00 authored by Jussi Lindgren's avatar Jussi Lindgren

Release: Bumped version to 2.0.1

+ Made the NSIS installer a bit more maintainable
parent c7d5cc6a
......@@ -13,7 +13,7 @@ PROJECT(OpenViBE)
# If you wish to maintain specific version numbers for a subproject, please do so in the projects CMakeLists.txt
SET(OV_GLOBAL_VERSION_MAJOR 2)
SET(OV_GLOBAL_VERSION_MINOR 0)
SET(OV_GLOBAL_VERSION_PATCH 0)
SET(OV_GLOBAL_VERSION_PATCH 1)
SET(OV_GLOBAL_VERSION_STRING "${OV_GLOBAL_VERSION_MAJOR}.${OV_GLOBAL_VERSION_MINOR}.${OV_GLOBAL_VERSION_PATCH}")
SET(DOCUMENTATION_TEMP_DIRECTORY "${CMAKE_INSTALL_PREFIX}/doc-tmp")
......
......@@ -3,8 +3,11 @@
!define DEPENDENCIES_DIR "..\..\dependencies"
!endif
!define OV_VERSION "2.0.1"
!define OV_VERSION_SHORT "201"
!ifndef OUTFILE
!define OUTFILE "openvibe-2.0.0-setup.exe"
!define OUTFILE "openvibe-${OV_VERSION}-setup.exe"
!endif
SetCompressor /FINAL /SOLID lzma
......@@ -14,11 +17,15 @@
!include "zipdll.nsh"
;Name and file
Name "OpenViBE 2.0.0"
!define OV_NAME "OpenViBE ${OV_VERSION}"
Name "${OV_NAME}"
OutFile ${OUTFILE}
;To detect a previous installation
!define OV_REGKEY "openvibe${OV_VERSION_SHORT}"
;Default installation folder
InstallDir "$PROGRAMFILES\openvibe-2.0"
InstallDir "$PROGRAMFILES\openvibe-${OV_VERSION}"
Var OLDINSTDIR
Var DIRECTX_MISSING
......@@ -69,11 +76,11 @@ Function .onInit
Quit
has_admin_rights:
ReadRegStr $0 HKLM SOFTWARE\openvibe20 InstallDir
ReadRegStr $0 HKLM SOFTWARE\${OV_REGKEY} InstallDir
${If} $0 != ""
IfFileExists "$0\Uninstall.exe" +1 +5
MessageBox MB_YESNO "A previous installation of OpenViBE 2.0 is installed under $0.$\nContinuing the install procedure will remove previous installation of OpenViBE 2.0 (including all files you eventually added in the installation directory).$\nWould you like to accept this removal and continue on installation process ?" /SD IDYES IDNO +1 IDYES +2
MessageBox MB_YESNO "A previous installation of ${OV_NAME} is installed under $0.$\nContinuing the install procedure will remove previous installation of ${OV_NAME} (including all files you eventually added in the installation directory).$\nWould you like to accept this removal and continue on installation process ?" /SD IDYES IDNO +1 IDYES +2
Abort
StrCpy $OLDINSTDIR $0
StrCpy $INSTDIR $0
......@@ -119,11 +126,11 @@ Section "!OpenViBE" Section1
${If} $OLDINSTDIR != ""
RMDir /r $OLDINSTDIR
RMDir /r "$SMPROGRAMS\OpenViBE 2.0"
RMDir /r "$SMPROGRAMS\${OV_NAME}"
${EndIf}
SetOutPath $INSTDIR
WriteRegStr HKLM "SOFTWARE\openvibe20" "InstallDir" "$INSTDIR"
WriteRegStr HKLM "SOFTWARE\${OV_REGKEY}" "InstallDir" "$INSTDIR"
WriteUninstaller Uninstall.exe
CreateDirectory "$INSTDIR\dependencies\arch"
......@@ -249,16 +256,16 @@ no_need_to_patch_3d_functionnality:
FileWrite $0 "widget_class $\"*$\" style $\"user-font$\"$\r$\n"
FileClose $0
CreateDirectory "$SMPROGRAMS\OpenViBE 2.0"
CreateDirectory "$SMPROGRAMS\OpenViBE 2.0\Developer tools"
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\Developer tools\openvibe id generator.lnk" "$INSTDIR\openvibe-id-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\Developer tools\openvibe plugin inspector.lnk" "$INSTDIR\openvibe-plugin-inspector.cmd" "" "%SystemRoot%\system32\shell32.dll" 57
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\Developer tools\openvibe skeleton generator.lnk" "$INSTDIR\openvibe-skeleton-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe designer.lnk" "$INSTDIR\openvibe-designer.cmd" "" "%SystemRoot%\system32\shell32.dll" 137
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe acquisition server.lnk" "$INSTDIR\openvibe-acquisition-server.cmd" "" "%SystemRoot%\system32\shell32.dll" 18
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe vr-demo spaceship.lnk" "$INSTDIR\openvibe-vr-demo-spaceship.cmd" "" "%SystemRoot%\system32\shell32.dll" 200
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe vr-demo handball.lnk" "$INSTDIR\openvibe-vr-demo-handball.cmd" "" "%SystemRoot%\system32\shell32.dll" 200
CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\uninstall.lnk" "$INSTDIR\Uninstall.exe"
CreateDirectory "$SMPROGRAMS\${OV_NAME}"
CreateDirectory "$SMPROGRAMS\${OV_NAME}\Developer tools"
CreateShortCut "$SMPROGRAMS\${OV_NAME}\Developer tools\openvibe id generator.lnk" "$INSTDIR\openvibe-id-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57
CreateShortCut "$SMPROGRAMS\${OV_NAME}\Developer tools\openvibe plugin inspector.lnk" "$INSTDIR\openvibe-plugin-inspector.cmd" "" "%SystemRoot%\system32\shell32.dll" 57
CreateShortCut "$SMPROGRAMS\${OV_NAME}\Developer tools\openvibe skeleton generator.lnk" "$INSTDIR\openvibe-skeleton-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57
CreateShortCut "$SMPROGRAMS\${OV_NAME}\openvibe designer.lnk" "$INSTDIR\openvibe-designer.cmd" "" "%SystemRoot%\system32\shell32.dll" 137
CreateShortCut "$SMPROGRAMS\${OV_NAME}\openvibe acquisition server.lnk" "$INSTDIR\openvibe-acquisition-server.cmd" "" "%SystemRoot%\system32\shell32.dll" 18
CreateShortCut "$SMPROGRAMS\${OV_NAME}\openvibe vr-demo spaceship.lnk" "$INSTDIR\openvibe-vr-demo-spaceship.cmd" "" "%SystemRoot%\system32\shell32.dll" 200
CreateShortCut "$SMPROGRAMS\${OV_NAME}\openvibe vr-demo handball.lnk" "$INSTDIR\openvibe-vr-demo-handball.cmd" "" "%SystemRoot%\system32\shell32.dll" 200
CreateShortCut "$SMPROGRAMS\${OV_NAME}\uninstall.lnk" "$INSTDIR\Uninstall.exe"
; AccessControl::EnableFileInheritance "$INSTDIR"
......@@ -269,7 +276,7 @@ SectionEnd
Section "Uninstall"
RMDir /r $INSTDIR
RMDir /r "$SMPROGRAMS\OpenViBE 2.0"
RMDir /r "$SMPROGRAMS\${OV_NAME}"
SectionEnd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment