diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2006-09-05 15:40:24 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2006-09-05 15:40:24 +0000 |
| commit | 1bed8f37855ec36f0bb63e97c10a64edeb5251a5 (patch) | |
| tree | f372b4f8b752451c311197732712022e26cf5c16 /gaim-installer.nsi | |
| parent | f035a27e9f22538ecb74e2502a9a52721a80ef06 (diff) | |
| download | pidgin-1bed8f37855ec36f0bb63e97c10a64edeb5251a5.tar.gz | |
[gaim-migrate @ 17168]
Use NSIS' built-in language registry key stuff. This fixes the installer forgetting which language you've selected.
Fill the installer file versioning information - Unfortunately, there doesn't appear to be a way to manipulate the value to use for the ProductVersion inside the NSIS script, so the Makefile needs to massage the data.
Diffstat (limited to 'gaim-installer.nsi')
| -rw-r--r-- | gaim-installer.nsi | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/gaim-installer.nsi b/gaim-installer.nsi index ef70f26415..8bfe36a513 100644 --- a/gaim-installer.nsi +++ b/gaim-installer.nsi @@ -59,7 +59,6 @@ SetDateSave on !define HKLM_APP_PATHS_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\gaim.exe" !define GAIM_STARTUP_RUN_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" !define GAIM_UNINST_EXE "gaim-uninst.exe" -!define GAIM_REG_LANG "Installer Language" !define GTK_VERSION "2.6.10" !define GTK_REG_KEY "SOFTWARE\GTK\2.0" @@ -75,6 +74,23 @@ SetDateSave on !define DOWNLOADER_URL "http://gaim.sourceforge.net/win32/download_redir.php" ;-------------------------------- +;Version resource +VIProductVersion "${GAIM_PRODUCT_VERSION}" +VIAddVersionKey "ProductName" "Gaim" +VIAddVersionKey "FileVersion" "${GAIM_VERSION}" +VIAddVersionKey "ProductVersion" "${GAIM_VERSION}" +VIAddVersionKey "LegalCopyright" "" +!ifdef WITH_GTK +VIAddVersionKey "FileDescription" "Gaim Installer (w/ GTK+ Installer)" +!else +!ifdef DEBUG +VIAddVersionKey "FileDescription" "Gaim Installer (Debug Version)" +!else +VIAddVersionKey "FileDescription" "Gaim Installer (w/o GTK+ Installer)" +!endif +!endif + +;-------------------------------- ;Modern UI Configuration !define MUI_ICON ".\gtk\pixmaps\gaim-install.ico" @@ -87,6 +103,10 @@ SetDateSave on !define MUI_LICENSEPAGE_BUTTON $(GAIM_LICENSE_BUTTON) !define MUI_LICENSEPAGE_TEXT_BOTTOM $(GAIM_LICENSE_BOTTOM_TEXT) + !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" + !define MUI_LANGDLL_REGISTRY_KEY ${GAIM_REG_KEY} + !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_ABORTWARNING @@ -459,9 +479,6 @@ Section $(GAIM_SECTION_TITLE) SecGaim StrCmp $R0 "NONE" done SetOverwrite off - ; Write out installer language - WriteRegStr HKCU "${GAIM_REG_KEY}" "${GAIM_REG_LANG}" "$LANGUAGE" - ; write out uninstaller SetOverwrite on WriteUninstaller "$INSTDIR\${GAIM_UNINST_EXE}" @@ -1184,8 +1201,8 @@ Function un.onInit Call un.RunCheck StrCpy $name "Gaim ${GAIM_VERSION}" - ; Get stored language prefrence - ReadRegStr $LANGUAGE HKCU ${GAIM_REG_KEY} "${GAIM_REG_LANG}" + ; Get stored language preference + !insertmacro MUI_UNGETLANGUAGE FunctionEnd |