Revision: 2188 http://geany.svn.sourceforge.net/geany/?rev=2188&view=rev Author: eht16 Date: 2008-01-23 06:45:53 -0800 (Wed, 23 Jan 2008)

Log Message: ----------- Fix created documentation shortcut in the Start Menu. Fixes for bundled GTK 2.12 runtime environment.

Modified Paths: -------------- trunk/geany.nsi

Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2008-01-23 14:32:52 UTC (rev 2187) +++ trunk/geany.nsi 2008-01-23 14:45:53 UTC (rev 2188) @@ -8,9 +8,9 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "0.13" -!define PRODUCT_VERSION_ID "0.13.0.0" -!define PRODUCT_PUBLISHER "Enrico Tröger" +!define PRODUCT_VERSION "0.13svn_r2188" +!define PRODUCT_VERSION_ID "0.12.9.4" +!define PRODUCT_PUBLISHER "Enrico Troeger" !define PRODUCT_WEB_SITE "http://geany.uvena.de" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Geany.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall${PRODUCT_NAME}" @@ -25,15 +25,17 @@ SetCompressor /SOLID lzma XPStyle on Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" + +InstallDir "$PROGRAMFILES\Geany" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails hide +ShowUnInstDetails hide + !ifdef INCLUDE_GTK OutFile "geany-${PRODUCT_VERSION}_setup.exe" !else OutFile "geany-${PRODUCT_VERSION}_nogtk_setup.exe" !endif -InstallDir "$PROGRAMFILES\Geany" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails hide -ShowUnInstDetails hide

;;;;;;;;;;;;;;;;;;;;; ; Version resource ; @@ -55,7 +57,6 @@ StrCmp $R0 0 +3 MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." Abort - ; warn about a new install over an existing installation ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" StrCmp $R0 "" done @@ -163,7 +164,7 @@

; Shortcuts !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" "$INSTDIR\doc\index.html" + WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" "$INSTDIR\doc\Manual.html" CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Documentation.lnk" "$INSTDIR\Documentation.url" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -181,7 +182,7 @@

; Include GTK runtime library but only if desired from command line !ifdef INCLUDE_GTK -Section "GTK 2.10 Runtime Environment" SEC06 +Section "GTK 2.12 Runtime Environment" SEC06 SectionIn 1 SetOutPath "$INSTDIR" SetOverwrite ifnewer @@ -190,8 +191,6 @@ File /r "gtk\etc*" SetOutPath "$INSTDIR\lib" File /r "gtk\lib*" - SetOutPath "$INSTDIR\share" - File /r "gtk\share*" /* code to embed GTK+ installer executable File ${GTK_INSTALLER} ExecWait ${GTK_INSTALLER} @@ -226,6 +225,7 @@ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" SectionEnd

+ ;;;;;;;;;;;;;;;;;;;;;;;;; ; Section descriptions ; ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -242,7 +242,6 @@ !insertmacro MUI_FUNCTION_DESCRIPTION_END

- ;;;;;;;;;;;;;;;;;;;;; ; helper functions ; ;;;;;;;;;;;;;;;;;;;;; @@ -292,6 +291,7 @@ Delete "$INSTDIR\gspawn-win32-helper-console.exe" Delete "$INSTDIR\iconv.dll" Delete "$INSTDIR\intl.dll" + Delete "$INSTDIR\jpeg62.dll" Delete "$INSTDIR\libgthread-2.0-0.dll" Delete "$INSTDIR\libgtk-win32-2.0-0.dll" Delete "$INSTDIR\libpangocairo-1.0-0.dll" @@ -306,6 +306,7 @@ Delete "$INSTDIR\libgdk-win32-2.0-0.dll" Delete "$INSTDIR\libglib-2.0-0.dll" Delete "$INSTDIR\libgmodule-2.0-0.dll" + Delete "$INSTDIR\libtiff3.dll" Delete "$INSTDIR\zlib1.dll"

Delete "$SMPROGRAMS$ICONS_GROUP\Uninstall.lnk" @@ -330,4 +331,3 @@ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" SetAutoClose true SectionEnd -

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.