From a41226ade5b176346e4858a76e3509dd0b06946d Mon Sep 17 00:00:00 2001 From: "Rhea@.(none)" Date: Wed, 2 Sep 2009 18:11:10 -0700 Subject: [PATCH] fix newlines --- src/win32/GoldenCheetahInstall.nsi | 228 ++++++++++++++--------------- src/windowsico.rc | 2 +- 2 files changed, 115 insertions(+), 115 deletions(-) diff --git a/src/win32/GoldenCheetahInstall.nsi b/src/win32/GoldenCheetahInstall.nsi index f9941af03..371c9fe3e 100644 --- a/src/win32/GoldenCheetahInstall.nsi +++ b/src/win32/GoldenCheetahInstall.nsi @@ -1,114 +1,114 @@ - -;!include "MUI2.nsh" -;!define MUI_ICON "..\images\gc.ico" ;Value - - -Name "Golden Cheetah" - -Icon "..\images\gc.ico" - -SetCompressor /SOLID lzma - -OutFile "GoldenCheetahInstall.exe" - -InstallDir $PROGRAMFILES\GoldenCheetah - -; Registry key to check for directory (so if you install again, it will -; overwrite the old one automatically) -InstallDirRegKey HKLM "Software\GoldenCheetah" "Install_Dir" - -; Request application privileges for Windows Vista -RequestExecutionLevel admin - -;-------------------------------- - -; Pages - - ;!insertmacro MUI_PAGE_WELCOME - ;!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt" - ;!insertmacro MUI_PAGE_COMPONENTS - ;!insertmacro MUI_PAGE_DIRECTORY - ;!insertmacro MUI_PAGE_INSTFILES - - ;!insertmacro MUI_UNPAGE_CONFIRM - ;!insertmacro MUI_UNPAGE_INSTFILES - -Page components -Page directory -Page instfiles - -UninstPage uninstConfirm -UninstPage instfiles - -;-------------------------------- -;Languages - - ;!insertmacro MUI_LANGUAGE "English" -;-------------------------------- - -; The stuff to install -Section "Golden Cheetah (required)" - - SectionIn RO - - ; Set output path to the installation directory. - SetOutPath $INSTDIR - - ; Put file there - File "..\release\GoldenCheetah.exe" - File "..\release\qwt5.dll" - File "..\release\mingwm10.dll" - File "..\release\QtCore4.dll" - File "..\release\QtGui4.dll" - File "..\release\QtSql4.dll" - File "..\release\QtXml4.dll" - - ; Write the installation path into the registry - WriteRegStr HKLM SOFTWARE\GoldenCheetah "Install_Dir" "$INSTDIR" - - ; Write the uninstall keys for Windows - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "DisplayName" "Golden Cheetah" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "UninstallString" '"$INSTDIR\uninstall.exe"' - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "NoModify" 1 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "NoRepair" 1 - WriteUninstaller "uninstall.exe" - -SectionEnd - -; Optional section (can be disabled by the user) -Section "Start Menu Shortcuts" - - CreateDirectory "$SMPROGRAMS\GoldenCheetah" - CreateShortCut "$SMPROGRAMS\GoldenCheetah\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\GoldenCheetah\Golden Cheetah.lnk" "$INSTDIR\GoldenCheetah.exe" "" "$INSTDIR\GoldenCheetah.exe" 0 - -SectionEnd - -;-------------------------------- - -; Uninstaller - -Section "Uninstall" - - ; Remove registry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" - DeleteRegKey HKLM SOFTWARE\GoldenCheetah - - ; Remove files and uninstaller - Delete $INSTDIR\GoldenCheetah.exe - Delete $INSTDIR\qwt5.dll - Delete $INSTDIR\mingwm10.dll - Delete $INSTDIR\QtCore4.dll - Delete $INSTDIR\QtGui4.dll - Delete $INSTDIR\QtSql4.dll - Delete $INSTDIR\QtXml4.dll - Delete $INSTDIR\uninstall.exe - - ; Remove shortcuts, if any - Delete "$SMPROGRAMS\GoldenCheetah\*.*" - - ; Remove directories used - RMDir "$SMPROGRAMS\GoldenCheetah" - RMDir "$INSTDIR" - -SectionEnd + +;!include "MUI2.nsh" +;!define MUI_ICON "..\images\gc.ico" ;Value + + +Name "Golden Cheetah" + +Icon "..\images\gc.ico" + +SetCompressor /SOLID lzma + +OutFile "GoldenCheetahInstall.exe" + +InstallDir $PROGRAMFILES\GoldenCheetah + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKLM "Software\GoldenCheetah" "Install_Dir" + +; Request application privileges for Windows Vista +RequestExecutionLevel admin + +;-------------------------------- + +; Pages + + ;!insertmacro MUI_PAGE_WELCOME + ;!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt" + ;!insertmacro MUI_PAGE_COMPONENTS + ;!insertmacro MUI_PAGE_DIRECTORY + ;!insertmacro MUI_PAGE_INSTFILES + + ;!insertmacro MUI_UNPAGE_CONFIRM + ;!insertmacro MUI_UNPAGE_INSTFILES + +Page components +Page directory +Page instfiles + +UninstPage uninstConfirm +UninstPage instfiles + +;-------------------------------- +;Languages + + ;!insertmacro MUI_LANGUAGE "English" +;-------------------------------- + +; The stuff to install +Section "Golden Cheetah (required)" + + SectionIn RO + + ; Set output path to the installation directory. + SetOutPath $INSTDIR + + ; Put file there + File "..\release\GoldenCheetah.exe" + File "..\release\qwt5.dll" + File "..\release\mingwm10.dll" + File "..\release\QtCore4.dll" + File "..\release\QtGui4.dll" + File "..\release\QtSql4.dll" + File "..\release\QtXml4.dll" + + ; Write the installation path into the registry + WriteRegStr HKLM SOFTWARE\GoldenCheetah "Install_Dir" "$INSTDIR" + + ; Write the uninstall keys for Windows + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "DisplayName" "Golden Cheetah" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" "NoRepair" 1 + WriteUninstaller "uninstall.exe" + +SectionEnd + +; Optional section (can be disabled by the user) +Section "Start Menu Shortcuts" + + CreateDirectory "$SMPROGRAMS\GoldenCheetah" + CreateShortCut "$SMPROGRAMS\GoldenCheetah\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\GoldenCheetah\Golden Cheetah.lnk" "$INSTDIR\GoldenCheetah.exe" "" "$INSTDIR\GoldenCheetah.exe" 0 + +SectionEnd + +;-------------------------------- + +; Uninstaller + +Section "Uninstall" + + ; Remove registry keys + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GoldenCheetah" + DeleteRegKey HKLM SOFTWARE\GoldenCheetah + + ; Remove files and uninstaller + Delete $INSTDIR\GoldenCheetah.exe + Delete $INSTDIR\qwt5.dll + Delete $INSTDIR\mingwm10.dll + Delete $INSTDIR\QtCore4.dll + Delete $INSTDIR\QtGui4.dll + Delete $INSTDIR\QtSql4.dll + Delete $INSTDIR\QtXml4.dll + Delete $INSTDIR\uninstall.exe + + ; Remove shortcuts, if any + Delete "$SMPROGRAMS\GoldenCheetah\*.*" + + ; Remove directories used + RMDir "$SMPROGRAMS\GoldenCheetah" + RMDir "$INSTDIR" + +SectionEnd diff --git a/src/windowsico.rc b/src/windowsico.rc index 2d288aa85..2c3f81b7f 100644 --- a/src/windowsico.rc +++ b/src/windowsico.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "images/gc.ico" +IDI_ICON1 ICON DISCARDABLE "images/gc.ico"