[or-cvs] r19183: {torvm} Fix non-existant bitmap in vidalia patch and make sure we sk (in torvm/trunk/build/win32: files patches)

[coderman at seul.org]

Author: coderman
Date: 2009-03-29 20:17:01 -0400 (Sun, 29 Mar 2009)
New Revision: 19183

Modified:
   torvm/trunk/build/win32/files/buildall.sh
   torvm/trunk/build/win32/patches/vidalia-torvm.patch
Log:
Fix non-existant bitmap in vidalia patch and make sure we skip intl builds if the zero codepage package failed.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-03-29 19:19:39 UTC (rev 19182)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-03-30 00:17:01 UTC (rev 19183)
@@ -1169,7 +1169,7 @@
     if [ -f vidalia-intl.msi ]; then
       export BASEMSI=vidalia-intl.msi
     fi
-    if [[ "$BUILD_IND_LANGS" == "yes" ]]; then
+    if [[ "$BASEMSI" != "" && "$BUILD_IND_LANGS" == "yes" ]]; then
       for LANG in $VIDALIA_LANGS; do
         WIXCULTURE=$DEF_WXL_LANG
         for WIXLANG in $WXL_LANGS; do
@@ -1298,7 +1298,7 @@
   if [ -f torvm-intl.msi ]; then
     export BASEMSI=torvm-intl.msi
   fi
-  if [[ "$BUILD_IND_LANGS" == "yes" ]]; then
+  if [[ "$BASEMSI" != "" && "$BUILD_IND_LANGS" == "yes" ]]; then
     for LANG in $VIDALIA_LANGS; do
       WIXCULTURE=$DEF_WXL_LANG
       for WIXLANG in $WXL_LANGS; do
@@ -1357,7 +1357,7 @@
   if [ -f tor-intl.msi ]; then
     export BASEMSI=tor-intl.msi
   fi
-  if [[ "$BUILD_IND_LANGS" == "yes" ]]; then
+  if [[ "$BASEMSI" != "" && "$BUILD_IND_LANGS" == "yes" ]]; then
     for LANG in $VIDALIA_LANGS; do
       WIXCULTURE=$DEF_WXL_LANG
       for WIXLANG in $WXL_LANGS; do
@@ -1413,7 +1413,7 @@
   if [ -f polipo-intl.msi ]; then
     export BASEMSI=polipo-intl.msi
   fi
-  if [[ "$BUILD_IND_LANGS" == "yes" ]]; then
+  if [[ "$BASEMSI" != "" && "$BUILD_IND_LANGS" == "yes" ]]; then
     for LANG in $VIDALIA_LANGS; do
       WIXCULTURE=$DEF_WXL_LANG
       for WIXLANG in $WXL_LANGS; do
@@ -1471,7 +1471,7 @@
     if [ -f torbutton-intl.msi ]; then
       export BASEMSI=torbutton-intl.msi
     fi
-    if [[ "$BUILD_IND_LANGS" == "yes" ]]; then
+    if [[ "$BASEMSI" != "" && "$BUILD_IND_LANGS" == "yes" ]]; then
       for LANG in $VIDALIA_LANGS; do
         WIXCULTURE=$DEF_WXL_LANG 
         for WIXLANG in $WXL_LANGS; do
@@ -1528,7 +1528,7 @@
   if [ -f thandy-intl.msi ]; then
     export BASEMSI=thandy-intl.msi
   fi
-  if [[ "$BUILD_IND_LANGS" == "yes" ]]; then
+  if [[ "$BASEMSI" != "" && "$BUILD_IND_LANGS" == "yes" ]]; then
     for LANG in $VIDALIA_LANGS; do
       WIXCULTURE=$DEF_WXL_LANG 
       for WIXLANG in $WXL_LANGS; do

Modified: torvm/trunk/build/win32/patches/vidalia-torvm.patch
===================================================================
--- torvm/trunk/build/win32/patches/vidalia-torvm.patch	2009-03-29 19:19:39 UTC (rev 19182)
+++ torvm/trunk/build/win32/patches/vidalia-torvm.patch	2009-03-30 00:17:01 UTC (rev 19183)
@@ -50,7 +50,7 @@
  ### HTTP
 diff -Naur a/pkg/win32/vidalia.wxs.in b/pkg/win32/vidalia.wxs.in
 --- a/pkg/win32/vidalia.wxs.in	2009-03-21 04:03:31.345626000 +0000
-+++ b/pkg/win32/vidalia.wxs.in	2009-03-15 07:01:31.000000000 +0000
++++ b/pkg/win32/vidalia.wxs.in	2009-03-30 00:08:08.452635944 +0000
 @@ -1,345 +1,371 @@
  <?xml version="1.0" encoding="Windows-1252" ?>
  <!-- 
@@ -679,8 +679,8 @@
      <UIRef Id="WixUI_Custom" />
 -    <Icon Id="vidalia.ico" SourceFile="@Vidalia_SOURCE_DIR@\src\vidalia\res\icons\vidalia.ico" />
 +    <Icon Id="vidalia.ico" SourceFile="src\vidalia\res\icons\vidalia.ico" />
-+    <WixVariable Id="WixUIBannerBmp" Value="pkg\win32\msi-header.bmp" />
-+    <WixVariable Id="WixUIDialogBmp" Value="pkg\win32\msi-welcome.bmp" />
++    <WixVariable Id="WixUIBannerBmp" Value="pkg\win32\default-header.bmp" />
++    <WixVariable Id="WixUIDialogBmp" Value="pkg\win32\default-welcome.bmp" />
    </Product>
  </Wix>
 diff -Naur a/src/common/win32.cpp b/src/common/win32.cpp