Author: cazfi
Date: Sun May 14 10:59:03 2017
New Revision: 35571
URL: http://svn.gna.org/viewcvs/freeciv?rev=35571&view=rev
Log:
installer_cross: Execute gdk-pixbuf-query-loaders.exe when installing
See hrm Feature #660105
Added:
trunk/windows/installer_cross/helpers/
trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd (with
props)
trunk/windows/installer_cross/helpers/installer-helper-qt.cmd (with props)
Modified:
trunk/windows/Makefile.am
trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
trunk/windows/installer_cross/create-freeciv-sdl2-nsi.sh
trunk/windows/installer_cross/installer_build.sh
Modified: trunk/windows/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/Makefile.am?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- trunk/windows/Makefile.am (original)
+++ trunk/windows/Makefile.am Sun May 14 10:59:03 2017
@@ -39,7 +39,9 @@
installer_cross/freeciv-mp-qt.cmd \
installer_cross/freeciv-sdl2.cmd \
installer_cross/freeciv-ruledit.cmd \
- installer_cross/licenses/COPYING.installer
+ installer_cross/licenses/COPYING.installer \
+ installer_cross/helpers/installer-helper-gtk3.cmd \
+ installer_cross/helpers/installer-helper-qt.cmd
if MINGW
nodist_noinst_DATA = \
Modified: trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh (original)
+++ trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh Sun May 14
10:59:03 2017
@@ -56,6 +56,8 @@
!insertmacro MUI_PAGE_STARTMENU "Application" \$STARTMENU_FOLDER
!insertmacro MUI_PAGE_INSTFILES
+
+Page custom HelperScriptFunction
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION RunFreeciv
@@ -263,6 +265,10 @@
cat <<EOF
FunctionEnd
+Function HelperScriptFunction
+ nsExec::Exec '"\$INSTDIR\bin\\installer-helper.cmd"'
+FunctionEnd
+
Function RunFreeciv
nsExec::Exec '"\$INSTDIR\freeciv-\${GUI_ID}.cmd" \$DefaultLanguageCode'
FunctionEnd
Modified: trunk/windows/installer_cross/create-freeciv-sdl2-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/create-freeciv-sdl2-nsi.sh?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- trunk/windows/installer_cross/create-freeciv-sdl2-nsi.sh (original)
+++ trunk/windows/installer_cross/create-freeciv-sdl2-nsi.sh Sun May 14
10:59:03 2017
@@ -56,6 +56,8 @@
!insertmacro MUI_PAGE_STARTMENU "Application" \$STARTMENU_FOLDER
!insertmacro MUI_PAGE_INSTFILES
+
+Page custom HelperScriptFunction
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION RunFreeciv
@@ -281,6 +283,10 @@
cat <<EOF
FunctionEnd
+Function HelperScriptFunction
+ nsExec::Exec '"\$INSTDIR\bin\\installer-helper.cmd"'
+FunctionEnd
+
Function RunFreeciv
nsExec::Exec '"\$INSTDIR\freeciv-sdl2.cmd" \$DefaultLanguageCode'
FunctionEnd
Added: trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd?rev=35571&view=auto
==============================================================================
--- trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd (added)
+++ trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd Sun May
14 10:59:03 2017
@@ -0,0 +1,3 @@
+cd %~dp0\..
+
+bin\gdk-pixbuf-query-loaders.exe > lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
Propchange: trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/windows/installer_cross/helpers/installer-helper-qt.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/helpers/installer-helper-qt.cmd?rev=35571&view=auto
==============================================================================
--- trunk/windows/installer_cross/helpers/installer-helper-qt.cmd (added)
+++ trunk/windows/installer_cross/helpers/installer-helper-qt.cmd Sun May
14 10:59:03 2017
@@ -0,0 +1,3 @@
+cd %~dp0\..
+
+echo "No special install helper actions needed"
Propchange: trunk/windows/installer_cross/helpers/installer-helper-qt.cmd
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/windows/installer_cross/installer_build.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/installer_build.sh?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- trunk/windows/installer_cross/installer_build.sh (original)
+++ trunk/windows/installer_cross/installer_build.sh Sun May 14 10:59:03 2017
@@ -32,7 +32,8 @@
cp $1/bin/libxml2-2.dll $2/ &&
cp $1/bin/libharfbuzz-0.dll $2/ &&
mkdir -p $2/bin &&
- cp $1/bin/gdk-pixbuf-query-loaders.exe $2/bin/
+ cp $1/bin/gdk-pixbuf-query-loaders.exe $2/bin/ &&
+ cp ./helpers/installer-helper-gtk3.cmd $2/bin/installer-helper.cmd
}
add_sdl2_mixer_env() {
@@ -54,7 +55,9 @@
cp -R $1/plugins $2/ &&
cp $1/bin/Qt5Core.dll $2/ &&
cp $1/bin/Qt5Gui.dll $2/ &&
- cp $1/bin/Qt5Widgets.dll $2/
+ cp $1/bin/Qt5Widgets.dll $2/ &&
+ mkdir -p $2/bin &&
+ cp ./helpers/installer-helper-qt.cmd $2/bin/installer-helper.cmd
}
add_common_env() {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
