[or-cvs] r18798: {torvm} Localized language setting in torvm package. (in torvm/trunk/build/win32: files src/pkg)

[coderman@xxxxxxxx]

Author: coderman
Date: 2009-03-07 13:16:06 -0500 (Sat, 07 Mar 2009)
New Revision: 18798

Modified:
   torvm/trunk/build/win32/files/buildall.sh
   torvm/trunk/build/win32/src/pkg/torvm.wxs
Log:
Localized language setting in torvm package.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-03-07 16:22:36 UTC (rev 18797)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-03-07 18:16:06 UTC (rev 18798)
@@ -1013,7 +1013,9 @@
       cp $MARBLE_DEST/libmarblewidget.dll bin/
       mkdir -p plugins/imageformats
       cp $MARBLE_DEST/plugins/*.dll plugins/
+      cp $MARBLE_DEST/plugins/*.dll bin/
       cp /$sysdrive/Qt/$QT_VER/plugins/imageformats/*.dll plugins/imageformats/
+      cp /$sysdrive/Qt/$QT_VER/plugins/imageformats/*.dll bin/
     fi
     if [[ "$DEBUG_NO_STRIP" == "" ]]; then
       echo "Stripping debug symbols from binaries and libraries ..."
@@ -1034,6 +1036,7 @@
     # light.exe -sloc -out vid.wixout -xo -cc cabcache WixUI_Custom.wixobj vidalia.wixobj -ext /wix/WixUIExtension.dll
     # light.exe "-cultures:es-es;de-de;en-us" -loc WixUI_es-es.wxl -loc WixUI_de-de.wxl -loc WixUI_en-us.wxl -loc vidalia_es.wxl -loc vidalia_de.wxl -loc vidalia_en.wxl -out test.msi -cc cabcache -reusecab vid.wixout
 
+    cp pkg/win32/*.vbs ./
     cp $WIXSRC_WXLDIR/*.wxl ./
     cp pkg/win32/*.wxl ./
     candle.exe pkg/win32/*.wxs
@@ -1079,7 +1082,7 @@
       fi
     fi
   fi
-  cd /usr/src/pkg
+  cd /src/pkg
   echo "Copying various package dependencies into place ..."
   cp $WIXSRC_WXLDIR/*.wxl ./
   cp /src/$VIDALIA_DIR/src/tools/wixtool/wixtool.exe ./

Modified: torvm/trunk/build/win32/src/pkg/torvm.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/torvm.wxs	2009-03-07 16:22:36 UTC (rev 18797)
+++ torvm/trunk/build/win32/src/pkg/torvm.wxs	2009-03-07 18:16:06 UTC (rev 18798)
@@ -18,16 +18,15 @@
   <?define CurrStartupGUID="37319e3d-57e4-4c06-860b-a0bc2a305963" ?>
 
   <Product Name="Tor VM $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
-           Language="1033" Codepage="1252"
+           Language="!(loc.LCID)"
            Version="$(var.ThisProductVersion)"
-           Manufacturer="vidalia-project.net"
+           Manufacturer="www.torproject.org"
            UpgradeCode="$(var.UpgradeCode)">
     
     <Package Id="*" Keywords="Installer"
              Description="Tor VM $(var.ThisProductVersionDisp) Installer"
-             Manufacturer="vidalia-project.net"
-             InstallerVersion="100" Compressed="yes"
-             Languages="1033"  SummaryCodepage="1252"
+             Manufacturer="www.torproject.org"
+             InstallerVersion="200" Compressed="yes"
              InstallPrivileges="elevated" />
 
     <Media Id="1" Cabinet="TorVM.cab" CompressionLevel="high"