diff --git a/source/vcpp/buildEnv/ac.nsi b/source/vcpp/buildEnv/ac.nsi index 3ae602cf..97496d82 100644 --- a/source/vcpp/buildEnv/ac.nsi +++ b/source/vcpp/buildEnv/ac.nsi @@ -114,12 +114,12 @@ FunctionEnd SetCompressor /SOLID lzma -!define CURPATH "C:\Users\sebastian\Desktop\AssaultCube1.1_NSIS\ac\source\vcpp\buildEnv" ; CHANGE ME -!define AC_FULLVERSION "v1.1.0.4" -!define AC_FULLVERSIONINT "1.1.0.4" +!define CURPATH ".\" ; must include the installer graphics and the \ac\ directory +!define AC_FULLVERSION "v1.1.0.5" +!define AC_FULLVERSIONINT "1.1.0.5" !define AC_SHORTNAME "AssaultCube" -!define AC_FULLNAME "AssaultCube v1.1.0.4" -!define AC_FULLNAMESAVE "AssaultCube_v1.1.0.4" +!define AC_FULLNAME "AssaultCube v1.1.0.5" +!define AC_FULLNAMESAVE "AssaultCube_v1.1.0.5" !define AC_MAJORVERSIONINT 1 !define AC_MINORVERSIONINT 1 @@ -128,7 +128,7 @@ VAR StartMenuFolder OutFile "AssaultCube_${AC_FULLVERSION}.exe" InstallDir "$PROGRAMFILES\${AC_FULLNAMESAVE}" InstallDirRegKey HKLM "Software\${AC_SHORTNAME}" "" -RequestExecutionLevel admin ; require admin in vista/7 +RequestExecutionLevel admin ; require admin in vista/7 ; Interface Configuration @@ -151,7 +151,7 @@ Page custom InstallationTypePage !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${AC_SHORTNAME}\${AC_FULLVERSION}" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${AC_SHORTNAME}" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "start_menu" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES @@ -492,11 +492,6 @@ FunctionEnd Function ConfigureWithoutAppdata - - ; remove shortcuts to user data directory - - ; Delete "$SMPROGRAMS\AssaultCube\AssaultCube User Data.lnk" - ; Delete "$INSTDIR\User Data.lnk" ; configure ac without home dir @@ -517,8 +512,7 @@ Section "AssaultCube ${AC_FULLVERSION}" AC File /r ac\*.* WriteRegStr HKLM "Software\${AC_SHORTNAME}" "" $INSTDIR - WriteRegStr HKLM "Software\${AC_SHORTNAME}\${AC_FULLVERSION}" "" $INSTDIR - WriteRegStr HKLM "Software\${AC_SHORTNAME}\${AC_FULLVERSION}" "version" ${AC_FULLVERSIONINT} + WriteRegStr HKLM "Software\${AC_SHORTNAME}" "version" ${AC_FULLVERSIONINT} ; Create uninstaller WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "DisplayName" "${AC_FULLNAME}" @@ -631,8 +625,7 @@ Section "Uninstall" ; delete reg keys DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" - DeleteRegKey HKLM "SOFTWARE\${AC_SHORTNAME}\${AC_FULLVERSION}" - DeleteRegKey /ifempty HKLM "SOFTWARE\${AC_SHORTNAME}" + DeleteRegKey HKLM "SOFTWARE\${AC_SHORTNAME}" DeleteRegKey HKCR "assaultcube" SectionEnd