suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ polish x64 installer

Browse Source
This commit is contained in:
wmayer 2014-03-11 00:23:26 +01:00
parent e45dab501c
commit 7e9e416c6c
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi
View File

@ -98,11 +98,12 @@ section "install"
ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"VCREDI~1.EXE /q:a /c:""msiexec /i vcredist.msi /qb!"" "' ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"VCREDI~1.EXE /q:a /c:""msiexec /i vcredist.msi /qb!"" "'
# Uninstaller - See function un.onInit and section "uninstall" for configuration # Uninstaller - See function un.onInit and section "uninstall" for configuration
writeUninstaller "$INSTDIR\uninstall.exe" WriteUninstaller "$INSTDIR\Uninstall.exe"
# Start Menu # Start Menu
createDirectory "$SMPROGRAMS\${FULLNAME}" CreateDirectory "$SMPROGRAMS\${FULLNAME}"
createShortCut "$SMPROGRAMS\${FULLNAME}\${APPNAME}.lnk" "$INSTDIR\bin\FreeCAD.exe" "" "" CreateShortCut "$SMPROGRAMS\${FULLNAME}\${APPNAME}.lnk" "$INSTDIR\bin\FreeCAD.exe" "" ""
CreateShortCut "$SMPROGRAMS\${FULLNAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" ""
# Access the right location for 64-bit applications # Access the right location for 64-bit applications
SetRegView 64 SetRegView 64
@ -112,7 +113,7 @@ section "install"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "InstallLocation" "$\"$INSTDIR$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "InstallLocation" "$\"$INSTDIR$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "DisplayIcon" "$\"$INSTDIR\logo.ico$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "DisplayIcon" "$\"$INSTDIR\bin\FreeCAD.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "Publisher" "${PUPNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "Publisher" "${PUPNAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "HelpLink" "$\"${HELPURL}$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "HelpLink" "$\"${HELPURL}$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "URLUpdateInfo" "$\"${UPDATEURL}$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "URLUpdateInfo" "$\"${UPDATEURL}$\""
@ -141,24 +142,29 @@ function un.onInit
!insertmacro VerifyUserIsAdmin !insertmacro VerifyUserIsAdmin
functionEnd functionEnd
section "uninstall" section "Uninstall"
# Remove Start Menu launcher # Remove Start Menu launcher
delete "$SMPROGRAMS\${FULLNAME}\${FULLNAME}.lnk" Delete "$SMPROGRAMS\${FULLNAME}\${APPNAME}.lnk"
Delete "$SMPROGRAMS\${FULLNAME}\Uninstall.lnk"
# Try to remove the Start Menu folder - this will only happen if it is empty # Try to remove the Start Menu folder - this will only happen if it is empty
rmDir "$SMPROGRAMS\${FULLNAME}" RMDir "$SMPROGRAMS\${FULLNAME}"
# Remove files # Remove files
rmDir /r "$INSTDIR\bin" RMDir /r "$INSTDIR\bin"
rmDir /r "$INSTDIR\doc" RMDir /r "$INSTDIR\doc"
rmDir /r "$INSTDIR\data" RMDir /r "$INSTDIR\data"
rmDir /r "$INSTDIR\Mod" RMDir /r "$INSTDIR\Mod"
# Always delete uninstaller as the last action # Always delete uninstaller as the last action
delete $INSTDIR\uninstall.exe Delete $INSTDIR\uninstall.exe
# Try to remove the install directory - this will only happen if it is empty # Try to remove the install directory - this will only happen if it is empty
rmDir $INSTDIR RMDir $INSTDIR
# Access the right location for 64-bit applications
SetRegView 64
# Remove uninstaller information from the registry # Remove uninstaller information from the registry
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}"
DeleteRegKey HKLM "Software\Python\PythonCore\2.7\PythonPath\${FULLNAME}"
sectionEnd sectionEnd