diff options
| author | Yves Combe <ycombe@src.gnome.org> | 2006-11-09 09:53:06 (GMT) |
|---|---|---|
| committer | Yves Combe <ycombe@src.gnome.org> | 2006-11-09 09:53:06 (GMT) |
| commit | a9b4f53ad3f94c572f02b1351ccda8dcc4b5bb46 (patch) | |
| tree | 1b418bdd3fd4ea7369b2b28457d3753189bca7a5 /gcompris-installer.nsi.in | |
| parent | df642cc058ca8a81a780b0787040d085198148a3 (diff) | |
Landing of GCOMPRIS_8_2_CROSSCOMPIL branch.
Allow cross compilation for win32 with mingw/Linux.
Use GLib functions instead of unix one .
Adapt Tuxpaint launcher to make it work on Windows.
Diffstat (limited to 'gcompris-installer.nsi.in')
| -rw-r--r-- | gcompris-installer.nsi.in | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in index 1c662fa..49ab163 100644 --- a/gcompris-installer.nsi.in +++ b/gcompris-installer.nsi.in @@ -215,27 +215,32 @@ Section -SecUninstallOldGcompris StrCmp $R2 "" uninstall_problem ; Check if we have uninstall string.. IfFileExists $R3 0 uninstall_problem + ; Have uninstall string.. go ahead and uninstall. - MessageBox MB_YESNO "Uninstall your previous version of GCompris?" IDYES do_uninstall IDNO done - - do_uninstall: - ; Have uninstall string.. go ahead and uninstall. - SetOverwrite on - ; Need to copy uninstaller outside of the install dir - ClearErrors - CopyFiles /SILENT $R3 "$TEMP\${GCOMPRIS_UNINST_EXE}" - SetOverwrite off - IfErrors uninstall_problem - ; Ready to uninstall.. - ClearErrors - ExecWait '"$TEMP\${GCOMPRIS_UNINST_EXE}" /S _?=$R1' - IfErrors exec_error - Delete "$TEMP\${GCOMPRIS_UNINST_EXE}" - Goto done + ; 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 + cancel_install: + Quit - exec_error: - Delete "$TEMP\${GCOMPRIS_UNINST_EXE}" - Goto uninstall_problem + SetOverwrite on + ; Need to copy uninstaller outside of the install dir + ClearErrors + CopyFiles /SILENT $R3 "$TEMP\${GCOMPRIS_UNINST_EXE}" + SetOverwrite off + IfErrors uninstall_problem + ; Ready to uninstall.. + ClearErrors + ExecWait '"$TEMP\${GCOMPRIS_UNINST_EXE}" /S _?=$R1' + IfErrors exec_error + Delete "$TEMP\${GCOMPRIS_UNINST_EXE}" + Goto done + + exec_error: + Delete "$TEMP\${GCOMPRIS_UNINST_EXE}" + Goto uninstall_problem uninstall_problem: ; In this case just wipe out previous Gcompris install dir.. @@ -243,9 +248,7 @@ Section -SecUninstallOldGcompris ; and versions 0.60 and lower did not correctly set the uninstall reg string ; (the string was set in quotes) IfSilent do_wipeout - MessageBox MB_YESNO $(GCOMPRIS_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install - cancel_install: - Quit + MessageBox MB_YESNO "Uninstall previous version?" IDYES do_wipeout IDNO done do_wipeout: StrCmp $R0 "HKLM" gcompris_del_lm_reg gcompris_del_cu_reg @@ -428,7 +431,6 @@ Section Uninstall Delete "$INSTDIR\pangocairo.pyd" Delete "$INSTDIR\popt1.dll" Delete "$INSTDIR\pthreadGC.dll" - Delete "$INSTDIR\python24.dll" Delete "$INSTDIR\python24.zip" Delete "$INSTDIR\select.pyd" Delete "$INSTDIR\setup.py" |