Commit a378da49 authored by Bruno Coudoin's avatar Bruno Coudoin Committed by Bruno Coudoin

windows, set a bat file as a startup entry point

by setting the path to empty we propably solve the Windows ERROR R6034
parent a4397f12
...@@ -150,6 +150,10 @@ prepack: Makefile.mingw ...@@ -150,6 +150,10 @@ prepack: Makefile.mingw
cp $(LOCAL_PREFIX)/libxml2-2.7.6.win32/bin/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll cp $(LOCAL_PREFIX)/libxml2-2.7.6.win32/bin/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll
mkdir -p $(GCOMPRIS_INSTALL_DIR)/bin mkdir -p $(GCOMPRIS_INSTALL_DIR)/bin
cp $(GNUCHESS_TOP)/bin/gnuchess.exe $(GCOMPRIS_INSTALL_DIR)/bin cp $(GNUCHESS_TOP)/bin/gnuchess.exe $(GCOMPRIS_INSTALL_DIR)/bin
cp gcompris.bat $(GCOMPRIS_INSTALL_DIR)
cp gcompris.ico $(GCOMPRIS_INSTALL_DIR)
cp gc_admin.ico $(GCOMPRIS_INSTALL_DIR)
rm -rf $(GCOMPRIS_INSTALL_DIR)/build
python: Makefile.mingw python: Makefile.mingw
cp $(PYTHON_TOP)/DLLs/tcl85.dll $(GCOMPRIS_INSTALL_DIR) cp $(PYTHON_TOP)/DLLs/tcl85.dll $(GCOMPRIS_INSTALL_DIR)
...@@ -198,4 +202,3 @@ prep: Makefile.mingw ...@@ -198,4 +202,3 @@ prep: Makefile.mingw
rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/tuxpaint.py rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/tuxpaint.py
find $(GCOMPRIS_INSTALL_DIR) -name "Makefile*" -exec rm -f {} \; find $(GCOMPRIS_INSTALL_DIR) -name "Makefile*" -exec rm -f {} \;
find $(GCOMPRIS_INSTALL_DIR) -name "*~" -exec rm -f {} \; find $(GCOMPRIS_INSTALL_DIR) -name "*~" -exec rm -f {} \;
...@@ -59,7 +59,7 @@ SetDateSave on ...@@ -59,7 +59,7 @@ SetDateSave on
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
;Finish Page config ;Finish Page config
!define MUI_FINISHPAGE_RUN "$INSTDIR\gcompris.exe" !define MUI_FINISHPAGE_RUN "$INSTDIR\gcompris.bat"
!define MUI_FINISHPAGE_RUN_NOTCHECKED !define MUI_FINISHPAGE_RUN_NOTCHECKED
!define MUI_FINISHPAGE_LINK $(GcomprisFinishVisitWebSite) !define MUI_FINISHPAGE_LINK $(GcomprisFinishVisitWebSite)
!define MUI_FINISHPAGE_LINK_LOCATION "http://gcompris.net/" !define MUI_FINISHPAGE_LINK_LOCATION "http://gcompris.net/"
...@@ -240,10 +240,10 @@ Section "GCompris" SecGcompris ...@@ -240,10 +240,10 @@ Section "GCompris" SecGcompris
nt4_done: nt4_done:
CreateDirectory "$SMPROGRAMS\GCompris" CreateDirectory "$SMPROGRAMS\GCompris"
CreateShortCut "$SMPROGRAMS\GCompris\GCompris.lnk" "$INSTDIR\gcompris.exe" CreateShortCut "$SMPROGRAMS\GCompris\GCompris.lnk" "$INSTDIR\gcompris.bat" "" "$INSTDIR\gcompris.ico" "" SW_SHOWMINIMIZED
CreateShortCut "$DESKTOP\GCompris.lnk" "$INSTDIR\gcompris.exe" CreateShortCut "$DESKTOP\GCompris.lnk" "$INSTDIR\gcompris.bat" "" "$INSTDIR\gcompris.ico" "" SW_SHOWMINIMIZED
CreateShortCut "$SMPROGRAMS\GCompris\GCompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1 CreateShortCut "$SMPROGRAMS\GCompris\GCompris Admin.lnk" "$INSTDIR\gcompris.bat" `-a` "$INSTDIR\gc_admin.ico" "" SW_SHOWMINIMIZED
CreateShortCut "$DESKTOP\GCompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1 CreateShortCut "$DESKTOP\GCompris Admin.lnk" "$INSTDIR\gcompris.bat" `-a` "$INSTDIR\gc_admin.ico" "" SW_SHOWMINIMIZED
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
; If we don't have install rights.. we're done ; If we don't have install rights.. we're done
...@@ -261,9 +261,9 @@ Section "GCompris" SecGcompris ...@@ -261,9 +261,9 @@ Section "GCompris" SecGcompris
; If we previously had gcompris setup to run on startup, make it do so again ; If we previously had gcompris setup to run on startup, make it do so again
StrCmp $STARTUP_RUN_KEY "HKCU" +1 +2 StrCmp $STARTUP_RUN_KEY "HKCU" +1 +2
WriteRegStr HKCU "${GCOMPRIS_STARTUP_RUN_KEY}" "Gcompris" "$INSTDIR\gcompris.exe" WriteRegStr HKCU "${GCOMPRIS_STARTUP_RUN_KEY}" "Gcompris" "$INSTDIR\gcompris.bat"
StrCmp $STARTUP_RUN_KEY "HKLM" +1 +2 StrCmp $STARTUP_RUN_KEY "HKLM" +1 +2
WriteRegStr HKLM "${GCOMPRIS_STARTUP_RUN_KEY}" "Gcompris" "$INSTDIR\gcompris.exe" WriteRegStr HKLM "${GCOMPRIS_STARTUP_RUN_KEY}" "Gcompris" "$INSTDIR\gcompris.bat"
done: done:
SectionEnd ; end of default GCompris section SectionEnd ; end of default GCompris section
...@@ -308,6 +308,9 @@ Section Uninstall ...@@ -308,6 +308,9 @@ Section Uninstall
RMDir /r "$INSTDIR\lib" RMDir /r "$INSTDIR\lib"
RMDir /r "$INSTDIR\share" RMDir /r "$INSTDIR\share"
Delete "$INSTDIR\gcompris.exe" Delete "$INSTDIR\gcompris.exe"
Delete "$INSTDIR\gcompris.bat"
Delete "$INSTDIR\gcompris.ico"
Delete "$INSTDIR\gc_admin.ico"
Delete "$INSTDIR\${GCOMPRIS_UNINST_EXE}" Delete "$INSTDIR\${GCOMPRIS_UNINST_EXE}"
Delete "$INSTDIR\COPYING" Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\README" Delete "$INSTDIR\README"
...@@ -316,6 +319,7 @@ Section Uninstall ...@@ -316,6 +319,7 @@ Section Uninstall
Delete "$INSTDIR\cairo._cairo.pyd" Delete "$INSTDIR\cairo._cairo.pyd"
Delete "$INSTDIR\gtk._gtk.pyd" Delete "$INSTDIR\gtk._gtk.pyd"
Delete "$INSTDIR\_hashlib.pyd" Delete "$INSTDIR\_hashlib.pyd"
Delete "$INSTDIR\pyexpat.pyd"
Delete "$INSTDIR\_socket.pyd" Delete "$INSTDIR\_socket.pyd"
Delete "$INSTDIR\_ssl.pyd" Delete "$INSTDIR\_ssl.pyd"
Delete "$INSTDIR\_tkinter.pyd" Delete "$INSTDIR\_tkinter.pyd"
...@@ -862,4 +866,3 @@ Function GetWindowsVersion ...@@ -862,4 +866,3 @@ Function GetWindowsVersion
Pop $R1 Pop $R1
Exch $R0 Exch $R0
FunctionEnd FunctionEnd
echo off
set PATH=
gcompris.exe %*
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment