[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3753: Remove the po2nsh stuff from the ALL build target, remove th (vidalia/trunk/pkg/win32)
Author: edmanm
Date: 2009-05-01 21:25:44 -0400 (Fri, 01 May 2009)
New Revision: 3753
Modified:
vidalia/trunk/pkg/win32/CMakeLists.txt
Log:
Remove the po2nsh stuff from the ALL build target, remove the
wix-i18n-localizations target entirely and shift the po2wxl output
steps to be dependencies of the dist-win32 target. There's no
reason to generate .wxl files if all we're doing is building Vidalia.
Modified: vidalia/trunk/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/win32/CMakeLists.txt 2009-05-01 20:20:05 UTC (rev 3752)
+++ vidalia/trunk/pkg/win32/CMakeLists.txt 2009-05-02 01:25:44 UTC (rev 3753)
@@ -118,7 +118,7 @@
#vidalia_add_nsh(vidalia_NSH
# zh_TW/vidalia_ZH_TW.po TRADCHINESE GB18030)
-add_custom_target(i18n-win32-installer ALL DEPENDS ${vidalia_NSH})
+add_custom_target(i18n-win32-installer DEPENDS ${vidalia_NSH})
## Convert the .po files to WiX .wxl files at build time
vidalia_add_wxl(vidalia_WXL
@@ -155,8 +155,6 @@
zh_CN/vidalia_zh_CN.po zh-CN 936)
vidalia_add_wxl(vidalia_WXL
zh_TW/vidalia_ZH_TW.po zh-TW 950)
-
-add_custom_target(wix-i18n-localizations ALL DEPENDS ${vidalia_WXL})
add_custom_target(dist-win32
COMMAND ${WIX_CANDLE_EXECUTABLE}
@@ -175,6 +173,8 @@
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
${CMAKE_CURRENT_SOURCE_DIR}/WixUI_Custom.wxs
+ ${vidalia_WXL}
+
COMMENT "Building vidalia-${VERSION}.msi"
)