[or-cvs] r20619: {torvm} Correct geoip iso path in MSI package. (in torvm/trunk/build/win32: files src/pkg)

[coderman@xxxxxxxx]

Author: coderman
Date: 2009-09-19 22:21:03 -0400 (Sat, 19 Sep 2009)
New Revision: 20619

Modified:
   torvm/trunk/build/win32/files/buildall.sh
   torvm/trunk/build/win32/src/pkg/geoip.wxs
Log:
Correct geoip iso path in MSI package.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-09-19 16:27:46 UTC (rev 20618)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-09-20 02:21:03 UTC (rev 20619)
@@ -1348,10 +1348,9 @@
     cp $GEOIP_IMAGE lib/
     heat.exe dir lib -gg -ke -sfrag -nologo -out torgeoip.wxs -template:product
     tail +4c torgeoip.wxs > torgeoip.wxs.tmp; dos2unix torgeoip.wxs.tmp; cat torgeoip.wxs.tmp > torgeoip.wxs; rm -f torgeoip.wxs.tmp
-    wixtool.exe splice -i geoip.wxs -o geoip-tmpdir.wxs Directory:ProgramsLibDir=torgeoip.wxs:Directory:TARGETDIR
-    wixtool.exe splice -i geoip-tmpdir.wxs -o geoip-tmpall.wxs Feature:MainApplication=torgeoip.wxs:Feature:ProductFeature
-    wixtool.exe userlocal -i geoip-tmpall.wxs -o geoip-all.wxs "Software\\Tor GeoIP Data:MainApplication"
-    rm -f geoip-tmpdir.wxs geoip-tmpall.wxs
+    wixtool.exe splice -i geoip.wxs -o geoip-tmpdir.wxs Directory:ProgramsInstDir=torgeoip.wxs:Directory:TARGETDIR
+    wixtool.exe splice -i geoip-tmpdir.wxs -o geoip-all.wxs Feature:MainApplication=torgeoip.wxs:Feature:ProductFeature
+    rm -f geoip-tmpdir.wxs
     candle.exe $CANDLE_OPTS geoip-all.wxs
     WIX_CAB_CACHE=_geoip.cabcache
     WIX_LINKOUT=_geoip.wixout

Modified: torvm/trunk/build/win32/src/pkg/geoip.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/geoip.wxs	2009-09-19 16:27:46 UTC (rev 20618)
+++ torvm/trunk/build/win32/src/pkg/geoip.wxs	2009-09-20 02:21:03 UTC (rev 20619)
@@ -52,8 +52,6 @@
               <RegistryValue Name="Version" Value="$(var.ThisProductVersion)" Type="string" KeyPath="yes" />
             </RegistryKey>
           </Component>
-          <Directory Id="ProgramsLibDir" Name="lib">
-          </Directory>
         </Directory>
       </Directory>
     </Directory>