Author: cazfi
Date: Sun Dec 21 23:53:00 2014
New Revision: 27378
URL: http://svn.gna.org/viewcvs/freeciv?rev=27378&view=rev
Log:
Added menu entry for ruledit in Windows Qt-client package.
See patch #5575
Added:
trunk/win32/installer/freeciv-ruledit.cmd
Modified:
trunk/win32/Makefile.am
trunk/win32/installer/Makefile
trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh
Modified: trunk/win32/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/Makefile.am?rev=27378&r1=27377&r2=27378&view=diff
==============================================================================
--- trunk/win32/Makefile.am (original)
+++ trunk/win32/Makefile.am Sun Dec 21 23:53:00 2014
@@ -20,6 +20,7 @@
installer/freeciv-qt.cmd \
installer/freeciv-sdl.cmd \
installer/freeciv-server.cmd \
+ installer/freeciv-ruledit.cmd \
installer/Freeciv.url \
installer/Makefile
Modified: trunk/win32/installer/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=27378&r1=27377&r2=27378&view=diff
==============================================================================
--- trunk/win32/installer/Makefile (original)
+++ trunk/win32/installer/Makefile Sun Dec 21 23:53:00 2014
@@ -76,8 +76,8 @@
mv install-$(GUI)/usr/local/share/doc install-$(GUI)/doc
# delete unneeded files
rm -r install-$(GUI)/usr
- # strip 'freeciv-manual' and 'freeciv-mp-<gui>' executables
- strip install-$(GUI)/freeciv-m*
+ # strip 'freeciv-manual', 'freeciv-mp-<gui>', and freeciv-ruledit
executables
+ strip install-$(GUI)/freeciv-m* install-$(GUI)/freeciv-ruledit.exe
# add start menu files
cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd
Freeciv.url install-$(GUI)/
@@ -95,6 +95,7 @@
cp /opt/un-fonts/COPYING
install-sdl/data/themes/gui-sdl/human/COPYING.UnDotum
install-freeciv-qt: install-freeciv-common
+ cp freeciv-ruledit.cmd install-$(GUI)/
# install Freeciv environment
Modified: trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh?rev=27378&r1=27377&r2=27378&view=diff
==============================================================================
--- trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh (original)
+++ trunk/win32/installer/create-freeciv-gtk-qt-nsi.sh Sun Dec 21 23:53:00 2014
@@ -107,6 +107,14 @@
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv.lnk"
"\$INSTDIR\freeciv-\${GUI_ID}.cmd" "\$DefaultLanguageCode"
"\$INSTDIR\freeciv-\${GUI_ID}.exe" 0 SW_SHOWMINIMIZED
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Server.lnk"
"\$INSTDIR\freeciv-server.cmd" "\$DefaultLanguageCode"
"\$INSTDIR\freeciv-server.exe" 0 SW_SHOWMINIMIZED
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Modpack
Installer.lnk" "\$INSTDIR\freeciv-mp-\${GUI_ID}.cmd" "\$DefaultLanguageCode"
"\$INSTDIR\freeciv-mp-\${GUI_ID}.exe" 0 SW_SHOWMINIMIZED
+EOF
+
+if test "x$3" = "xqt" ; then
+ echo "CreateShortCut \"\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Ruleset
Editor.lnk\" \"\$INSTDIR\freeciv-ruledit.cmd\" \"\$DefaultLanguageCode\"
\"\$INSTDIR\freeciv-ruledit.exe\" 0 SW_SHOWMINIMIZED"
+fi
+
+cat <<EOF
+
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Uninstall.lnk"
"\$INSTDIR\uninstall.exe"
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Website.lnk"
"\$INSTDIR\Freeciv.url"
!insertmacro MUI_STARTMENU_WRITE_END
Added: trunk/win32/installer/freeciv-ruledit.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/freeciv-ruledit.cmd?rev=27378&view=auto
==============================================================================
--- trunk/win32/installer/freeciv-ruledit.cmd (added)
+++ trunk/win32/installer/freeciv-ruledit.cmd Sun Dec 21 23:53:00 2014
@@ -0,0 +1,4 @@
+@echo off
+if %1 NEQ auto set LANG=%1
+set QT_PLUGIN_PATH=./plugins
+start freeciv-ruledit.exe %2 %3 %4 %5 %6 %7 %8 %9
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
