Changeset 363

Timestamp:

02/26/06 23:50:08 (3 years ago)

Author:

hipplej

Message:

Made a few adjustments to the packaging stuff for win32.

Location:

trunk/pkg/win32

Files:

• bundle/bundle.nsi (modified) (5 diffs)
• vidalia.nsi (modified) (2 diffs)

trunk/pkg/win32/bundle/bundle.nsi

@@ -10 +10 @@
 !define VIDALIA_NAME "Vidalia"
 !define VIDALIA_EXEC "vidalia.exe"
-!define VIDALIA_VERSION "0.0.1-alpha"
+!define VIDALIA_VERSION "0.0.1"
 
 !define TOR_NAME "Tor"
@@ -22 +22 @@
 !define BUNDLE_REVISION "1"
 
-!define APPNAME "Vidalia-Tor-Privoxy Bundle"
+!define APPNAME "Vidalia-Tor-Privoxy_Bundle"
 !define APPVERSION "${TOR_VERSION}-${VIDALIA_VERSION}"
 !define PRODVERSION "0.0.1.0" ; Product version must be x.x.x.x
 !define APPDESCRIPTION "${APPNAME} ${APPVERSION}"
-!define INSTALLFILE "${APPNAME}_${APPVERSION}_install.exe"
+!define INSTALLFILE "${APPNAME}_${APPVERSION}.exe"
 !define BUNDLE_UNINSTALLER "vidalia-bundle-uninstall.exe"
 
@@ -134 +134 @@
     SectionEnd
 
-    Section "OpenSSL 0.9.7e" TorOpenSSL
+    Section "OpenSSL 0.9.8a" TorOpenSSL
        SectionIn 1 2
        SetOutPath "$INSTDIR\Tor"
@@ -148 +148 @@
        File "tor\${TOR_VERSION}\Documents\rend-spec.txt"
        File "tor\${TOR_VERSION}\Documents\control-spec.txt"
+       File "tor\${TOR_VERSION}\Documents\dir-spec.txt"
+       File "tor\${TOR_VERSION}\Documents\socks-extensions.txt"
        File "tor\${TOR_VERSION}\Documents\tor-doc-win32.html"
+       File "tor\${TOR_VERSION}\Documents\tor-doc-server.html"
+       File "tor\${TOR_VERSION}\Documents\tor-doc-osx.html"
+       File "tor\${TOR_VERSION}\Documents\tor-doc-unix.html"
+       File "tor\${TOR_VERSION}\Documents\tor-hidden-service.html"
+       File "tor\${TOR_VERSION}\Documents\tor-switchproxy.html"
        File "tor\${TOR_VERSION}\Documents\stylesheet.css"
        File "tor\${TOR_VERSION}\Documents\tor-reference.html"
@@ -229 +236 @@
     Section "Run At Startup" VidaliaRunAtStartup
       SectionIn 1 2
-      WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" "$INSTDIR\Vidalia\${VIDALIA_EXEC}"
+      WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
     SectionEnd    
 SectionGroupEnd

trunk/pkg/win32/vidalia.nsi

@@ -9 +9 @@
 ;---------------------------------
 ; Global Definitions
-!define APPVERSION "0.0.1-alpha"
+!define APPVERSION "0.0.1"
 !define PRODVERSION "0.0.1.0" ; Unfortunately, product version must be x.x.x.x
 !define APPNAME "Vidalia"
 !define APPEXEC "vidalia.exe"
-!define APPDESCRIPTION "Vidalia Tor Controller ${APPVERSION}"
+!define APPDESCRIPTION "${APPNAME} ${APPVERSION}"
 !define AUTHOR "Matt Edman, Justin Hipple"
-!define INSTALLFILE "${APPNAME}_${APPVERSION}_install.exe"
+!define INSTALLFILE "${APPNAME}_${APPVERSION}.exe"
 
 
@@ -122 +122 @@
 Section "Run At Startup" RunAtStartup
   SectionIn 1 2
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}" "$INSTDIR\${APPEXEC}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}" '"$INSTDIR\${APPEXEC}"'
 SectionEnd