From 0b86f67a2970403d1b1b6d34ce49f5485ef5dbb3 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 18 Apr 2010 19:15:07 +0300 Subject: [PATCH] Add wpa_gui-qt4 translation files into build --- build_release | 2 ++ wpa_supplicant/Makefile | 5 ++++- wpa_supplicant/wpa_supplicant.nsi | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build_release b/build_release index fb46bc806..22dcd4219 100755 --- a/build_release +++ b/build_release @@ -131,6 +131,8 @@ EOF qmake -spec win32-x-g++ make -j2 cp release/wpa_gui.exe ../../../"$WDIR" + lrelease wpa_gui.pro + cp lang/wpa_gui_de.qm ../../../"$WDIR" cd ../../.. rm -rf "$PDIR" zip "$WDIR.zip" "$WDIR"/* diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index f9eebd813..56e514323 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -1346,7 +1346,10 @@ wpa_gui: wpa_gui/Makefile wpa_gui-qt4/Makefile: qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro -wpa_gui-qt4: wpa_gui-qt4/Makefile +wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts + lrelease wpa_gui-qt4/wpa_gui.pro + +wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm $(MAKE) -C wpa_gui-qt4 TEST_EAP_SIM_COMMON_OBJS = $(SHA1OBJS) $(MD5OBJS) \ diff --git a/wpa_supplicant/wpa_supplicant.nsi b/wpa_supplicant/wpa_supplicant.nsi index 2783ca3c8..69bc9b4d3 100644 --- a/wpa_supplicant/wpa_supplicant.nsi +++ b/wpa_supplicant/wpa_supplicant.nsi @@ -24,6 +24,7 @@ section setOutPath $INSTDIR File wpa_gui.exe + File wpa_gui_de.qm File wpa_cli.exe File COPYING File README @@ -82,6 +83,7 @@ section "uninstall" DeleteRegKey HKLM "Software\wpa_supplicant" delete "$INSTDIR\wpa_gui.exe" + delete "$INSTDIR\wpa_gui_de.qm" delete "$INSTDIR\wpa_cli.exe" delete "$INSTDIR\COPYING" delete "$INSTDIR\README"