[or-cvs] r18797: {torvm} Fix errors in license and vidalia MSI packages. (in torvm/trunk/build/win32: files src/pkg)

[coderman at seul.org]

Author: coderman
Date: 2009-03-07 11:22:36 -0500 (Sat, 07 Mar 2009)
New Revision: 18797

Modified:
   torvm/trunk/build/win32/files/buildall.sh
   torvm/trunk/build/win32/src/pkg/license.wxs
Log:
Fix errors in license and vidalia MSI packages.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-03-07 15:52:50 UTC (rev 18796)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-03-07 16:22:36 UTC (rev 18797)
@@ -1011,7 +1011,9 @@
     cp pkg/win32/polipo.conf bin/
     if [ -d $MARBLE_DEST ]; then
       cp $MARBLE_DEST/libmarblewidget.dll bin/
-      cp $MARBLE_DEST/plugins/*.dll bin/
+      mkdir -p plugins/imageformats
+      cp $MARBLE_DEST/plugins/*.dll plugins/
+      cp /$sysdrive/Qt/$QT_VER/plugins/imageformats/*.dll plugins/imageformats/
     fi
     if [[ "$DEBUG_NO_STRIP" == "" ]]; then
       echo "Stripping debug symbols from binaries and libraries ..."
@@ -1020,6 +1022,8 @@
       strip $ddir/*.exe
       strip bin/*.dll
       strip bin/*.exe
+      strip plugins/*.dll
+      strip plugins/imageformats/*.dll
     fi
 
     # typical work flow using generated component fragments from heat.exe:
@@ -1079,7 +1083,6 @@
   echo "Copying various package dependencies into place ..."
   cp $WIXSRC_WXLDIR/*.wxl ./
   cp /src/$VIDALIA_DIR/src/tools/wixtool/wixtool.exe ./
-  cp /src/$VIDALIA_DIR/pkg/win32/*.bmp ./
   cp /src/$VIDALIA_DIR/pkg/win32/*.vbs ./
   cp /src/$VIDALIA_DIR/pkg/win32/*.wxs ./
   cp /src/$VIDALIA_DIR/pkg/win32/*.wxl ./
@@ -1087,11 +1090,7 @@
   cp ../torvm-w32/tor-icon-32.ico ./tor.ico
   # DONT STRIP PY2EXEs!
   cp $thandir/Thandy.exe bin/
-  cp /src/$TOR_DIR/contrib/*.wxs ./
   cp /src/$TOR_DIR/bin/*.exe bin/
-  mkdir -p src/config
-  mkdir -p share/tor
-  mkdir -p contrib
   cp /src/$TOR_DIR/contrib/*.ico ./
   cp /src/$TOR_DIR/share/tor/geoip ./
   cp /src/$TOR_DIR/src/config/torrc.sample ./
@@ -1103,11 +1102,9 @@
   candle.exe *.wxs
 
   echo "Building Tor Vidalia bundle license docs package ..."
-  (
-    cd $licensedir;cd ../
-    heat.exe dir License -gg -ke -sfrag -nologo -out license-dir.wxs -template:product
-    if [ -f license-dir.wxs ]; then mv license-dir.wxs /src/pkg/; fi
-  )
+  cp -a $licensedir ./
+  find License -type f -exec unix2dos {} \;
+  heat.exe dir License -gg -ke -sfrag -nologo -out license-dir.wxs -template:product
   if [ ! -f license-dir.wxs ]; then
     echo "Failed to generate directory tree component for $licensedir ."
   else

Modified: torvm/trunk/build/win32/src/pkg/license.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/license.wxs	2009-03-07 15:52:50 UTC (rev 18796)
+++ torvm/trunk/build/win32/src/pkg/license.wxs	2009-03-07 16:22:36 UTC (rev 18797)
@@ -48,7 +48,7 @@
         </Directory>
       </Directory>
       <Directory Id="DesktopFolder" Name="Desktop">
-        <Component Id="AddTorDocsToDesktop" Guid="$(var.CurrDesktopGUID)">
+        <Component Id="AddTorDocsToDesktop" Guid="$(var.CurrDocsOnDesktopGUID)">
           <RegistryKey Root="HKCU" Key="Software\Tor Vidalia License Docs" Action="createAndRemoveOnUninstall">
             <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
           </RegistryKey>
@@ -62,11 +62,10 @@
     <!-- Build up the feature hierarchy -->
     <Feature Id="Complete" Title="Tor Vidalia License Docs"
              Level="1" Display="expand"
-             Description="" />
+             Description="Tor Vidalia License Docs">
       <Feature Id="MainApplication" Title="Tor Vidalia License Docs $(var.ThisProductVersionDisp)"
                AllowAdvertise="no" Absent="disallow" Level="1"
                Description="Main application">
-        <ComponentRef Id="DocFolder" />
       </Feature>
       <Feature Id="Shortcuts" Title="Shortcuts"
                AllowAdvertise="no" Absent="allow" Level="1"