From 833e27669bf400358fbb48699b13c0f8c4258625 Mon Sep 17 00:00:00 2001 From: Bruno Coudoin Date: Sun, 31 Jan 2010 23:40:58 +0100 Subject: [PATCH] Updated windows installer code from the master branch --- Makefile.mingw.in | 3 +- gcompris-install.ico | Bin 0 -> 9662 bytes gcompris-installer.nsi.in | 195 +++++++++++++++----------------------- gcompris-uninstal.ico | Bin 9662 -> 9662 bytes 4 files changed, 78 insertions(+), 120 deletions(-) create mode 100644 gcompris-install.ico diff --git a/Makefile.mingw.in b/Makefile.mingw.in index 91501fd04..7fdc08a59 100644 --- a/Makefile.mingw.in +++ b/Makefile.mingw.in @@ -61,7 +61,6 @@ include global_win32.mak # These will be copied in the win32-install-dir ready to be packaged. NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC2.dll \ $(GNUCHESS_TOP)/bin/libreadline.dll \ - $(GNUCHESS_TOP)/bin/gnuchess.exe \ $(FONTCONFIG_TOP)/bin/libfontconfig-1.dll \ $(FREETYPE_TOP)/bin/freetype6.dll \ $(GNUCAP_TOP)/src/MSW/gnucap.exe \ @@ -150,6 +149,8 @@ prepack: Makefile.mingw cp -r $(GTK_TOP)/share/locale $(GCOMPRIS_INSTALL_DIR)/lib cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib cp $(LOCAL_PREFIX)/libxml2-2.7.6.win32/bin/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll + mkdir -p $(GCOMPRIS_INSTALL_DIR)/bin + cp $(GNUCHESS_TOP)/bin/gnuchess.exe $(GCOMPRIS_INSTALL_DIR)/bin python: Makefile.mingw cp $(PYTHON_TOP)/DLLs/tcl85.dll $(GCOMPRIS_INSTALL_DIR) diff --git a/gcompris-install.ico b/gcompris-install.ico new file mode 100644 index 0000000000000000000000000000000000000000..056c72faf80370f4252e8ae8ca2d2236b53f5ffc GIT binary patch literal 9662 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 literal 0 HcmV?d00001 diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in index e15b2d117..fbe848704 100644 --- a/gcompris-installer.nsi.in +++ b/gcompris-installer.nsi.in @@ -1,4 +1,4 @@ -; Installer script for win32 Gcompris +; Installer script for win32 GCompris ; Copyed from GAIM By Herman Bloggs ; Bruno Coudoin for GCompris ; @@ -41,7 +41,7 @@ SetDateSave on !define GCOMPRIS_INSTALLER_DEPS "..\win32-dev\gcompris-inst-deps" !define GCOMPRIS_REG_KEY "SOFTWARE\gcompris" -!define GCOMPRIS_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gcompris" +!define GCOMPRIS_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GCompris" !define HKLM_APP_PATHS_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\gcompris.exe" !define GCOMPRIS_STARTUP_RUN_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" !define GCOMPRIS_UNINST_EXE "gcompris-uninst.exe" @@ -50,33 +50,26 @@ SetDateSave on ;-------------------------------- ;Modern UI Configuration - !define MUI_ICON ".\gcompris.ico" + !define MUI_ICON ".\gcompris-install.ico" !define MUI_UNICON ".\gcompris-uninstal.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP ".\nsis\gcompris-intro.bmp" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP ".\nsis\gcompris-header.bmp" - ; Alter License section - !define MUI_LICENSEPAGE_BUTTON $(GCOMPRIS_LICENSE_BUTTON) - !define MUI_LICENSEPAGE_TEXT_BOTTOM $(GCOMPRIS_LICENSE_BOTTOM_TEXT) - - !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_ABORTWARNING ;Finish Page config !define MUI_FINISHPAGE_RUN "$INSTDIR\gcompris.exe" !define MUI_FINISHPAGE_RUN_NOTCHECKED - !define MUI_FINISHPAGE_LINK $(GCOMPRIS_FINISH_VISIT_WEB_SITE) + !define MUI_FINISHPAGE_LINK $(GcomprisFinishVisitWebSite) !define MUI_FINISHPAGE_LINK_LOCATION "http://gcompris.net/" ;-------------------------------- ;Pages !insertmacro MUI_PAGE_WELCOME - !insertmacro MUI_PAGE_LICENSE "./COPYING" - !insertmacro MUI_PAGE_COMPONENTS - ; Gcompris install dir page + ; GCompris install dir page !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES @@ -90,75 +83,7 @@ SetDateSave on ;-------------------------------- ;Languages - ;; English goes first because its the default. The rest are - ;; in alphabetical order (at least the strings actually displayed - ;; will be). - - !insertmacro MUI_LANGUAGE "English" - - !insertmacro MUI_LANGUAGE "Albanian" - !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Catalan" - !insertmacro MUI_LANGUAGE "Czech" - !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "SimpChinese" - !insertmacro MUI_LANGUAGE "TradChinese" - !insertmacro MUI_LANGUAGE "German" - !insertmacro MUI_LANGUAGE "Spanish" - !insertmacro MUI_LANGUAGE "French" - !insertmacro MUI_LANGUAGE "Hebrew" - !insertmacro MUI_LANGUAGE "Italian" - !insertmacro MUI_LANGUAGE "Japanese" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Hungarian" - !insertmacro MUI_LANGUAGE "Dutch" - !insertmacro MUI_LANGUAGE "Norwegian" - !insertmacro MUI_LANGUAGE "Polish" - !insertmacro MUI_LANGUAGE "PortugueseBR" - !insertmacro MUI_LANGUAGE "Portuguese" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Russian" - !insertmacro MUI_LANGUAGE "Serbian" - !insertmacro MUI_LANGUAGE "Slovak" - !insertmacro MUI_LANGUAGE "Slovenian" - !insertmacro MUI_LANGUAGE "Finnish" - !insertmacro MUI_LANGUAGE "Swedish" - -;-------------------------------- -;Translations - - !define GCOMPRIS_DEFAULT_LANGFILE "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\english.nsh" - - !include "${GCOMPRIS_NSIS_INCLUDE_PATH}\langmacros.nsh" - - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "ALBANIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\albanian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "BULGARIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "CATALAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\catalan.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "CZECH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\czech.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "DANISH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\danish.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "DUTCH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\dutch.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "ENGLISH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\english.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "FINNISH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\finnish.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "FRENCH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\french.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "GERMAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\german.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "HEBREW" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\hebrew.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "HUNGARIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\hungarian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "ITALIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\italian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "JAPANESE" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\japanese.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "KOREAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\korean.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "NORWEGIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\norwegian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "POLISH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\polish.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "PORTUGUESE" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\portuguese.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "PORTUGUESEBR" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\portuguese-br.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "ROMANIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\romanian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "RUSSIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\russian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "SERBIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\serbian-latin.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "SIMPCHINESE" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\simp-chinese.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "SLOVAK" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\slovak.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "SLOVENIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\slovenian.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "SPANISH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\spanish.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "SWEDISH" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\swedish.nsh" - !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "TRADCHINESE" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\trad-chinese.nsh" + @INSERT_TRANSLATIONS@ ;-------------------------------- ;Reserve Files @@ -174,7 +99,7 @@ SetDateSave on ;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;-------------------------------- -;Uninstall any old version of Gcompris +;Uninstall any old version of GCompris Section -SecUninstallOldGcompris ; Check install rights.. @@ -217,11 +142,11 @@ Section -SecUninstallOldGcompris IfFileExists $R3 0 uninstall_problem ; Have uninstall string.. go ahead and uninstall. - ; In this case just wipe out previous Gcompris install dir.. + ; In this case just wipe out previous GCompris install dir.. ; We get here because versions 0.60a1 and 0.60a2 don't have versions set in the registry ; and versions 0.60 and lower did not correctly set the uninstall reg string ; (the string was set in quotes) - MessageBox MB_YESNO $(GCOMPRIS_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install + MessageBox MB_YESNO $(GcomprisPromptWipeout) IDYES do_wipeout IDNO cancel_install cancel_install: Quit @@ -243,7 +168,7 @@ Section -SecUninstallOldGcompris Goto uninstall_problem uninstall_problem: - ; In this case just wipe out previous Gcompris install dir.. + ; In this case just wipe out previous GCompris install dir.. ; We get here because versions 0.60a1 and 0.60a2 don't have versions set in the registry ; and versions 0.60 and lower did not correctly set the uninstall reg string ; (the string was set in quotes) @@ -266,9 +191,9 @@ SectionEnd ;-------------------------------- -;Gcompris Install Section +;GCompris Install Section -Section $(GCOMPRIS_SECTION_TITLE) SecGcompris +Section "GCompris" SecGcompris SectionIn 1 RO ; Check install rights.. @@ -285,7 +210,7 @@ Section $(GCOMPRIS_SECTION_TITLE) SecGcompris WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin" WriteRegStr HKLM ${GCOMPRIS_REG_KEY} "" "$INSTDIR" WriteRegStr HKLM ${GCOMPRIS_REG_KEY} "Version" "${GCOMPRIS_VERSION}" - WriteRegStr HKLM "${GCOMPRIS_UNINSTALL_KEY}" "DisplayName" $(GCOMPRIS_UNINSTALL_DESC) + WriteRegStr HKLM "${GCOMPRIS_UNINSTALL_KEY}" "DisplayName" "GCompris Uninstall" WriteRegStr HKLM "${GCOMPRIS_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${GCOMPRIS_UNINST_EXE}" ; Sets scope of the desktop and Start Menu entries for all users. SetShellVarContext "all" @@ -294,7 +219,7 @@ Section $(GCOMPRIS_SECTION_TITLE) SecGcompris gcompris_hkcu: WriteRegStr HKCU ${GCOMPRIS_REG_KEY} "" "$INSTDIR" WriteRegStr HKCU ${GCOMPRIS_REG_KEY} "Version" "${GCOMPRIS_VERSION}" - WriteRegStr HKCU "${GCOMPRIS_UNINSTALL_KEY}" "DisplayName" $(GCOMPRIS_UNINSTALL_DESC) + WriteRegStr HKCU "${GCOMPRIS_UNINSTALL_KEY}" "DisplayName" "GCompris Uninstall" WriteRegStr HKCU "${GCOMPRIS_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${GCOMPRIS_UNINST_EXE}" Goto gcompris_install_files @@ -302,7 +227,7 @@ Section $(GCOMPRIS_SECTION_TITLE) SecGcompris gcompris_install_files: SetOutPath "$INSTDIR" - ; Gcompris files + ; GCompris files SetOverwrite on File /r .\win32-install-dir\*.* @@ -318,16 +243,16 @@ Section $(GCOMPRIS_SECTION_TITLE) SecGcompris nt4_done: - CreateDirectory "$SMPROGRAMS\Gcompris" - CreateShortCut "$SMPROGRAMS\Gcompris\Gcompris.lnk" "$INSTDIR\gcompris.exe" - CreateShortCut "$DESKTOP\Gcompris.lnk" "$INSTDIR\gcompris.exe" - CreateShortCut "$SMPROGRAMS\Gcompris\Gcompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1 - CreateShortCut "$DESKTOP\Gcompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1 + CreateDirectory "$SMPROGRAMS\GCompris" + CreateShortCut "$SMPROGRAMS\GCompris\GCompris.lnk" "$INSTDIR\gcompris.exe" + CreateShortCut "$DESKTOP\GCompris.lnk" "$INSTDIR\gcompris.exe" + CreateShortCut "$SMPROGRAMS\GCompris\GCompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1 + CreateShortCut "$DESKTOP\GCompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1 SetOutPath "$INSTDIR" ; If we don't have install rights.. we're done StrCmp $R0 "NONE" done - CreateShortCut "$SMPROGRAMS\Gcompris\Uninstall.lnk" "$INSTDIR\${GCOMPRIS_UNINST_EXE}" + CreateShortCut "$SMPROGRAMS\GCompris\Uninstall.lnk" "$INSTDIR\${GCOMPRIS_UNINST_EXE}" SetOverwrite off ; Write out installer language @@ -345,7 +270,7 @@ Section $(GCOMPRIS_SECTION_TITLE) SecGcompris WriteRegStr HKLM "${GCOMPRIS_STARTUP_RUN_KEY}" "Gcompris" "$INSTDIR\gcompris.exe" done: -SectionEnd ; end of default Gcompris section +SectionEnd ; end of default GCompris section ;-------------------------------- ;Uninstaller Section @@ -403,7 +328,7 @@ Section Uninstall Delete "$INSTDIR\bz2.pyd" Delete "$INSTDIR\freetype6.dll" Delete "$INSTDIR\gnucap.exe" - Delete "$INSTDIR\gnuchess.exe" + Delete "$INSTDIR\bin\gnuchess.exe" Delete "$INSTDIR\gobject.pyd" Delete "$INSTDIR\gspawn-win32-helper.exe" Delete "$INSTDIR\iconv.dll" @@ -427,7 +352,6 @@ Section Uninstall Delete "$INSTDIR\libpangocairo-1.0-0.dll" Delete "$INSTDIR\libpangoft2-1.0-0.dll" Delete "$INSTDIR\libpangowin32-1.0-0.dll" - Delete "$INSTDIR\libpng13.dll" Delete "$INSTDIR\libreadline.dll" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\msvcr71.dll" @@ -445,38 +369,71 @@ Section Uninstall Delete "$INSTDIR\zlib.pyd" Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\README.mingw" - - ;Try to remove Gcompris install dir .. if empty + Delete "$INSTDIR\config.h.mingw" + Delete "$INSTDIR\libexpat.dll" + Delete "$INSTDIR\libgio-2.0-0.dll" + Delete "$INSTDIR\libogg-0.dll" + Delete "$INSTDIR\libpng12-0.dll" + Delete "$INSTDIR\libvorbis-0.dll" + Delete "$INSTDIR\libvorbisfile-3.dll" + Delete "$INSTDIR\pthreadGC2.dll" + Delete "$INSTDIR\README.translators" + Delete "$INSTDIR\_ctypes.pyd" + Delete "$INSTDIR\_sqlite3.pyd" + Delete "$INSTDIR\cairo._cairo.pyd" + Delete "$INSTDIR\gobject._gobject.pyd" + Delete "$INSTDIR\gtk._gtk.pyd" + Delete "$INSTDIR\libcroco-0.6-3.dll" + Delete "$INSTDIR\libexpat-1.dll" + Delete "$INSTDIR\libgio-2.0-0.dll" + Delete "$INSTDIR\libgsf-1-114.dll" + Delete "$INSTDIR\libjpeg-7.dll" + Delete "$INSTDIR\libogg-0.dll" + Delete "$INSTDIR\libpng12-0.dll" + Delete "$INSTDIR\librsvg-2-2.dll" + Delete "$INSTDIR\libvorbis-0.dll" + Delete "$INSTDIR\libvorbisfile-3.dll" + Delete "$INSTDIR\libxml2-2.dll" + Delete "$INSTDIR\pthreadGC2.dll" + Delete "$INSTDIR\python26.dll" + Delete "$INSTDIR\python26.zip" + Delete "$INSTDIR\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" + Delete "$INSTDIR\Microsoft.VC90.CRT\msvcm90.dll" + Delete "$INSTDIR\Microsoft.VC90.CRT\msvcp90.dll" + Delete "$INSTDIR\Microsoft.VC90.CRT\msvcr90.dll" + Delete "$INSTDIR\manifest\gtk+-bundle_2.18.5-20091215_win32.mft" + Delete "$INSTDIR\manifest\libcroco_0.6.2-1_win32.mft" + Delete "$INSTDIR\manifest\libgsf_1.14.15-1_win32.mft" + Delete "$INSTDIR\manifest\librsvg_2.26.0-1_win32.mft" + Delete "$INSTDIR\manifest\librsvg-dev_2.26.0-1_win32.mft" + Delete "$INSTDIR\manifest\svg-gdk-pixbuf-loader_2.26.0-1_win32.mft" + Delete "$INSTDIR\manifest\svg-gtk-engine_2.26.0-1_win32.mft" + + ;Try to remove GCompris install dir .. if empty RMDir "$INSTDIR" ; Shortcuts.. - RMDir /r "$SMPROGRAMS\Gcompris" - Delete "$DESKTOP\Gcompris.lnk" - Delete "$DESKTOP\Gcompris Admin.lnk" + RMDir /r "$SMPROGRAMS\GCompris" + Delete "$DESKTOP\GCompris.lnk" + Delete "$DESKTOP\GCompris Admin.lnk" Goto done cant_uninstall: IfSilent skip_mb - MessageBox MB_OK $(un.GCOMPRIS_UNINSTALL_ERROR_1) IDOK + MessageBox MB_OK $(unGcomprisUninstallError1) IDOK skip_mb: Quit no_rights: IfSilent skip_mb1 - MessageBox MB_OK $(un.GCOMPRIS_UNINSTALL_ERROR_2) IDOK + MessageBox MB_OK $(unGcomprisUninstallError2) IDOK skip_mb1: Quit done: SectionEnd ; end of uninstall section -;-------------------------------- -;Descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecGcompris} \ - $(GCOMPRIS_SECTION_DESCRIPTION) -!insertmacro MUI_FUNCTION_DESCRIPTION_END ;-------------------------------- ;Functions @@ -642,7 +599,7 @@ FunctionEnd Function RunCheck System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "gcompris_is_running") i .R0' IntCmp $R0 0 done - MessageBox MB_OK|MB_ICONEXCLAMATION $(GCOMPRIS_IS_RUNNING) IDOK + MessageBox MB_OK|MB_ICONEXCLAMATION $(GcomprisIsRunning) IDOK Abort done: FunctionEnd @@ -650,7 +607,7 @@ FunctionEnd Function un.RunCheck System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "gcompris_is_running") i .R0' IntCmp $R0 0 done - MessageBox MB_OK|MB_ICONEXCLAMATION $(GCOMPRIS_IS_RUNNING) IDOK + MessageBox MB_OK|MB_ICONEXCLAMATION $(GcomprisIsRunning) IDOK Abort done: FunctionEnd @@ -659,10 +616,10 @@ Function .onInit System::Call 'kernel32::CreateMutexA(i 0, i 0, t "gcompris_installer_running") i .r1 ?e' Pop $R0 StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING) + MessageBox MB_OK|MB_ICONEXCLAMATION $(InstallerIsRunning) Abort Call RunCheck - StrCpy $name "Gcompris ${GCOMPRIS_VERSION}" + StrCpy $name "GCompris ${GCOMPRIS_VERSION}" StrCpy $ISSILENT "/NOUI" ; GTK installer has two silent states.. one with Message boxes, one without @@ -695,7 +652,7 @@ Function .onInit Pop $0 StrCmp $0 "HKLM" 0 user_dir - StrCpy $INSTDIR "$PROGRAMFILES\Gcompris" + StrCpy $INSTDIR "$PROGRAMFILES\GCompris" Goto instdir_done user_dir: StrCpy $2 "$SMPROGRAMS" @@ -703,7 +660,7 @@ Function .onInit Call GetParent Call GetParent Pop $2 - StrCpy $INSTDIR "$2\Gcompris" + StrCpy $INSTDIR "$2\GCompris" instdir_done: @@ -711,7 +668,7 @@ FunctionEnd Function un.onInit Call un.RunCheck - StrCpy $name "Gcompris ${GCOMPRIS_VERSION}" + StrCpy $name "GCompris ${GCOMPRIS_VERSION}" ; Get stored language prefrence ReadRegStr $LANGUAGE HKCU ${GCOMPRIS_REG_KEY} "${GCOMPRIS_REG_LANG}" diff --git a/gcompris-uninstal.ico b/gcompris-uninstal.ico index 891a2714a097aec98bdb25634845e111d45d673e..65eef0142759f885ced5cfa5cb36b983cb0c585e 100644 GIT binary patch delta 2784 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