From a9f3655d1af0c3af3276c4526e85e99cb50c4015 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 16 Oct 2012 04:04:37 -0700 Subject: Improved packaging for Windows This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel --- packaging/windows/mingw-make.sh | 5 +++-- packaging/windows/subsurface.nsi | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'packaging/windows') diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index ec1f6ccc7..13a4cf5a9 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -9,6 +9,7 @@ export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH make CC=i686-w64-mingw32-gcc \ PKGCONFIG=i686-w64-mingw32-pkg-config \ - PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/i686-w64-mingw32/lib/pkgconfig/ \ + PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \ + CROSS_LOCALE_PATH=/usr/i686-w64-mingw32/sys-root/mingw/share/ \ XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \ - XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe + XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe install-cross-windows diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi index b19c9a49b..31eaa30ef 100644 --- a/packaging/windows/subsurface.nsi +++ b/packaging/windows/subsurface.nsi @@ -136,7 +136,6 @@ Section File dll\pthreadGC2.dll File dll\zlib1.dll File subsurface.ico - File /r ..\..\locale File /r share # Store installation folder in registry @@ -169,7 +168,6 @@ Section "Uninstall" Delete "$INSTDIR\subsurface.svg" Delete "$INSTDIR\Uninstall.exe" RMDir /r "$INSTDIR\share" - RMDir /r "$INSTDIR\locale" RMDir "$INSTDIR" # Remove shortcuts -- cgit v1.2.3-70-g09d2