Updated windows installer
This commit is contained in:
Yevgen Muntyan
parent
f4a1646415
commit
485ae543cd
32
configure.ac
32
configure.ac
@ -60,7 +60,7 @@ AM_PROG_CC_C_O
|
||||
AC_ARG_VAR([WINDRES], [windres])
|
||||
AC_CHECK_TOOL(WINDRES, windres, :)
|
||||
|
||||
AC_ARG_VAR([PYTHON], [Python executable, required to run build scripts])
|
||||
AC_ARG_VAR([MOO_PYTHON], [Python executable, required to run build scripts])
|
||||
AC_CHECK_PROGS(MOO_PYTHON, [python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python], [none])
|
||||
if test "x$MOO_PYTHON" = "x"; then
|
||||
AC_MSG_ERROR([Python not found, it is required for the build])
|
||||
@ -153,15 +153,37 @@ if test "x$MOO_ENABLE_COVERAGE" = "xyes"; then
|
||||
fi
|
||||
|
||||
if $MOO_OS_WIN32; then
|
||||
if test -d $HOME/.wine/drive_c/windows/syswow64 -o -d "/cygdrive/c/Program Files (x86)"; then
|
||||
MEDIT_INNO_COMPILER='wine "c:\\program files (x86)\\inno setup 5\\ISCC.exe"'
|
||||
else
|
||||
MEDIT_INNO_COMPILER='wine "c:\\program files\\inno setup 5\\ISCC.exe"'
|
||||
fi
|
||||
AC_MSG_CHECKING([Inno compiler])
|
||||
AC_MSG_RESULT([$MEDIT_INNO_COMPILER])
|
||||
|
||||
_moo_win32_config=release
|
||||
if test "$MOO_DEBUG_ENABLED" = "yes"; then
|
||||
_moo_win32_config="debug"
|
||||
fi
|
||||
if test -n "$mgwconfig"; then
|
||||
_moo_win32_config="$mgwconfig"
|
||||
fi
|
||||
AC_ARG_VAR([MOO_WIN32_CONFIG], [$_moo_win32_config])
|
||||
AC_MSG_CHECKING([Win32 build configuration])
|
||||
AC_MSG_RESULT([$MOO_WIN32_CONFIG])
|
||||
|
||||
AC_SUBST(MEDIT_WIN32_APP_UID,"7F9F899F-EE8A-47F0-9981-8C525AF78E4D")
|
||||
AC_SUBST(MEDIT_INNO_TOP_SRCDIR,"Z:`cd $srcdir && pwd`")
|
||||
AC_SUBST(MEDIT_INNO_TOP_BUILDDIR,"Z:`pwd`")
|
||||
AC_SUBST(MEDIT_INNO_INSTDIR,"Z:`cd $prefix && pwd`")
|
||||
AC_SUBST(MEDIT_INNO_COMPILER,'wine "c:\\program files\\inno setup 5\\ISCC.exe"')
|
||||
AC_SUBST(MEDIT_INNO_INSTALLER_SUFFIX,"")
|
||||
if test "x$MOO_DEBUG_ENABLED" = "xyes"; then
|
||||
MEDIT_INNO_INSTALLER_SUFFIX="-debug"
|
||||
AC_SUBST(MEDIT_INNO_COMPILER)
|
||||
MEDIT_INNO_INSTALLER_SUFFIX=""
|
||||
if test -n "$MOO_WIN32_CONFIG" -a "$MOO_WIN32_CONFIG" != "release"; then
|
||||
MEDIT_INNO_INSTALLER_SUFFIX="-$MOO_WIN32_CONFIG"
|
||||
fi
|
||||
AC_SUBST(MEDIT_SETUP_NAME, "medit-$MOO_DISPLAY_VERSION$MEDIT_INNO_INSTALLER_SUFFIX")
|
||||
AC_MSG_CHECKING([Win32 setup name])
|
||||
AC_MSG_RESULT([$MEDIT_SETUP_NAME])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(install-hooks,
|
||||
|
||||
@ -20,8 +20,10 @@ if $mgwlinux; then
|
||||
export mgwpythoninstdir=$HOME/.wine/drive_c/Python$mgwpythonver
|
||||
if [ -d $HOME/.wine/drive_c/windows/syswow64 ]; then
|
||||
export mgwpythonsystem32dir=$HOME/.wine/drive_c/windows/syswow64
|
||||
export mgwprogramfilesdir="$HOME/.wine/drive_c/Program Files (x86)"
|
||||
else
|
||||
export mgwpythonsystem32dir=$HOME/.wine/drive_c/windows/system32
|
||||
export mgwprogramfilesdir="$HOME/.wine/drive_c/Program Files"
|
||||
fi
|
||||
else
|
||||
export mgwpythoninstdir=/cygdrive/c/Tools/Python$mgwpythonver
|
||||
|
||||
@ -14,7 +14,7 @@ DefaultGroupName="medit"
|
||||
AllowNoIcons=yes
|
||||
;LicenseFile="@MEDIT_INNO_TOP_SRCDIR@/COPYING.GPL"
|
||||
OutputDir="@MEDIT_INNO_TOP_BUILDDIR@"
|
||||
OutputBaseFilename="medit-@MOO_DISPLAY_VERSION@@MEDIT_INNO_INSTALLER_SUFFIX@"
|
||||
OutputBaseFilename="@MEDIT_SETUP_NAME@"
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
DisableReadyPage=true
|
||||
@ -23,31 +23,27 @@ ShowLanguageDialog=auto
|
||||
; Run plat/win32/istrans.sh to get language files
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
|
||||
Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.islu"
|
||||
Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
|
||||
Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
|
||||
Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
|
||||
Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
|
||||
Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
|
||||
Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
|
||||
Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
|
||||
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
|
||||
Name: "german"; MessagesFile: "compiler:Languages\German.isl"
|
||||
Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
|
||||
Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
|
||||
Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
|
||||
Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
|
||||
Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
|
||||
Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
|
||||
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
|
||||
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
|
||||
Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
|
||||
Name: "serbian"; MessagesFile: "compiler:Languages\Serbian.isl"
|
||||
Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
|
||||
Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
|
||||
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
|
||||
Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
|
||||
Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\brazilianportuguese.isl"
|
||||
Name: "catalan"; MessagesFile: "compiler:Languages\catalan.isl"
|
||||
Name: "czech"; MessagesFile: "compiler:Languages\czech.isl"
|
||||
Name: "danish"; MessagesFile: "compiler:Languages\danish.isl"
|
||||
Name: "dutch"; MessagesFile: "compiler:Languages\dutch.isl"
|
||||
Name: "finnish"; MessagesFile: "compiler:Languages\finnish.isl"
|
||||
Name: "french"; MessagesFile: "compiler:Languages\french.isl"
|
||||
Name: "greek"; MessagesFile: "compiler:Languages\greek.isl"
|
||||
Name: "hebrew"; MessagesFile: "compiler:Languages\hebrew.isl"
|
||||
Name: "hungarian"; MessagesFile: "compiler:Languages\hungarian.isl"
|
||||
Name: "italian"; MessagesFile: "compiler:Languages\italian.isl"
|
||||
Name: "japanese"; MessagesFile: "compiler:Languages\japanese.isl"
|
||||
Name: "norwegian"; MessagesFile: "compiler:Languages\norwegian.isl"
|
||||
Name: "polish"; MessagesFile: "compiler:Languages\polish.isl"
|
||||
Name: "portuguese"; MessagesFile: "compiler:Languages\portuguese.isl"
|
||||
Name: "russian"; MessagesFile: "compiler:Languages\russian.isl"
|
||||
Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\serbiancyrillic.isl"
|
||||
Name: "serbianlatin"; MessagesFile: "compiler:Languages\serbianlatin.isl"
|
||||
Name: "slovenian"; MessagesFile: "compiler:Languages\slovenian.isl"
|
||||
Name: "spanish"; MessagesFile: "compiler:Languages\spanish.isl"
|
||||
Name: "ukrainian"; MessagesFile: "compiler:Languages\ukrainian.isl"
|
||||
|
||||
[Files]
|
||||
Source: "@MEDIT_INNO_INSTDIR@/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
|
||||
33
plat/win32/istrans.sh
Normal file → Executable file
33
plat/win32/istrans.sh
Normal file → Executable file
@ -1,10 +1,14 @@
|
||||
islangsdir="$HOME/.wine/drive_c/Program Files/Inno Setup 5/Languages/"
|
||||
#! /bin/sh
|
||||
|
||||
export mgwdir=`dirname $0`/gtk-win
|
||||
. $mgwdir/config.sh || exit 1
|
||||
|
||||
islangsdir="$mgwprogramfilesdir/Inno Setup 5/Languages/"
|
||||
|
||||
mkdir /tmp/isfiles || exit 1
|
||||
cd /tmp/isfiles
|
||||
|
||||
wget `echo '
|
||||
http://www.jrsoftware.org/files/istrans/Basque-1/Basque-1-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Catalan-4/Catalan-4-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Czech-5/Czech-5-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Danish-4/Danish-4-5.1.11.isl
|
||||
@ -12,29 +16,44 @@ http://www.jrsoftware.org/files/istrans/Dutch-8/Dutch-8-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Finnish/Finnish-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/French-15/French-15-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/German-2/German-2-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Greek-8/Greek-8-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Hebrew-3/Hebrew-3-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Hungarian/Hungarian-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Italian-14/Italian-14-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Japanese-5/Japanese-5-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Norwegian/Norwegian-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Polish-8/Polish-8-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/PortugueseBr-16/BrazilianPortuguese-16-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/PortugueseBr-17/BrazilianPortuguese-17-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/PortugueseStd-1/PortugueseStd-1-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Russian-19/Russian-19-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/SerbianCyrillic-2/SerbianCyrillic-2-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Serbian-6/Serbian-6-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Slovak-6/Slovak-6-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Slovenian-3/Slovenian-3-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/SpanishStd-5/SpanishStd-5-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Ukrainian-7/Ukrainian-7-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Albanian-2/Albanian-2-5.1.11.isl
|
||||
http://www.jrsoftware.org/files/istrans/Armenian-1/Armenian-1-5.1.11.islu
|
||||
http://www.jrsoftware.org/files/istrans/Arabic-4/Arabic-4-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Armenian-1/Armenian-1-5.5.0.islu
|
||||
http://www.jrsoftware.org/files/istrans/Belarusian-2/Belarusian-2-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Bosnian-2/Bosnian-2-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Bulgarian/Bulgarian-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/ChineseSimp-12/ChineseSimp-12-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Slovak-7/Slovak-7-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Tatar-2/Tatar-2-5.5.0.isl
|
||||
http://www.jrsoftware.org/files/istrans/Turkish-7/Turkish-7-5.5.0.isl
|
||||
'`
|
||||
|
||||
islangs=/tmp/medit-islangs
|
||||
echo "Name: \"english\"; MessagesFile: \"compiler:Default.isl\"" > $islangs
|
||||
for file in *.isl *.islu; do
|
||||
mv $file `echo $file | sed -r 's/(\w+)-.*\.(\w+)/\1.\2/'` || exit 1
|
||||
lang=`echo $file | sed -r 's/(\w+)-.*\.(\w+)/\1/'`
|
||||
ext=`echo $file | sed -r 's/(\w+)-.*\.(\w+)/\2/'`
|
||||
echo mv $file $lang.$ext
|
||||
mv $file $lang.$ext || exit 1
|
||||
lang=`echo $lang | tr [A-Z] [a-z]`
|
||||
echo "Name: \"$lang\"; MessagesFile: \"compiler:Languages\\$lang.$ext\"" >> $islangs
|
||||
done
|
||||
|
||||
echo mv *.isl *.islu "$islangsdir"
|
||||
mv *.isl *.islu "$islangsdir" || exit 1
|
||||
cd /tmp
|
||||
rmdir isfiles
|
||||
|
||||
@ -82,7 +82,7 @@ export PYTHON_VERSION=$mgwpythondotver
|
||||
|
||||
configure_args="--build=i686-pc-linux-gnu --host=i586-pc-mingw32msvc --target=i586-pc-mingw32msvc \
|
||||
AR=$AR RANLIB=$RANLIB STRIP=$STRIP AS=$AS DLLTOOL=$DLLTOOL OBJDUMP=$OBJDUMP NM=$NM WINDRES=$WINDRES RC=$RC \
|
||||
INSTALL=`which install-check` \
|
||||
INSTALL=`which install-check` MOO_WIN32_CONFIG=$mgwconfig \
|
||||
--prefix=$destdir"
|
||||
|
||||
if $en_only; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user