[vidalia-svn] r2360: Update the Windows installers for out-of-source builds and t (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-02-25 22:50:42 -0500 (Mon, 25 Feb 2008)
New Revision: 2360

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
   vidalia/trunk/pkg/win32/vidalia.nsi.in
Log:
Update the Windows installers for out-of-source builds and to include the
necessary Qt .dlls.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-02-26 03:02:29 UTC (rev 2359)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-02-26 03:50:42 UTC (rev 2360)
@@ -164,6 +164,10 @@
       SetOutPath "$INSTDIR\Vidalia"
       File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_EXEC}"
       File "Vidalia\${VIDALIA_APPVERSION}\mingwm10.dll"
+      File "Vidalia\${VIDALIA_APPVERSION}\QtCore4.dll"
+      File "Vidalia\${VIDALIA_APPVERSION}\QtGui4.dll"
+      File "Vidalia\${VIDALIA_APPVERSION}\QtNetwork4.dll"
+      File "Vidalia\${VIDALIA_APPVERSION}\QtXml4.dll"
       File "Vidalia\${VIDALIA_APPVERSION}\README"
       File "Vidalia\${VIDALIA_APPVERSION}\CHANGELOG"
       File "Vidalia\${VIDALIA_APPVERSION}\LICENSE"

Modified: vidalia/trunk/pkg/win32/vidalia.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-02-26 03:02:29 UTC (rev 2359)
+++ vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-02-26 03:50:42 UTC (rev 2360)
@@ -143,17 +143,21 @@
   
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR    
-  File "..\..\release\${VIDALIA_EXEC}"
-  File "..\..\release\mingwm10.dll"
-  File "..\..\AUTHORS"
-  File "..\..\CHANGELOG"
-  File "..\..\LICENSE"
-  File "..\..\COPYING"
-  File "..\..\README"
+  File "..\..\src\vidalia\${VIDALIA_EXEC}"
+  File "..\..\bin\mingwm10.dll"
+  File "..\..\bin\QtCore4.dll"
+  File "..\..\bin\QtGui4.dll"
+  File "..\..\bin\QtNetwork4.dll"
+  File "..\..\bin\QtXml4.dll"
+  File "@Vidalia_SOURCE_DIR@\AUTHORS"
+  File "@Vidalia_SOURCE_DIR@\CHANGELOG"
+  File "@Vidalia_SOURCE_DIR@\LICENSE"
+  File "@Vidalia_SOURCE_DIR@\COPYING"
+  File "@Vidalia_SOURCE_DIR@\README"
 
   ; Include a prebuilt GeoIP cache
   SetOutPath "$APPDATA\Vidalia"
-  File "..\geoip-cache"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\geoip-cache"
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "DisplayName" "${VIDALIA_DESC}"