more minor build tweaks for windows

tweaking version number display, and fixing a couple of small bugs

diff --git a/Makefile b/Makefile
index bf3f90b5d8bab85f21d37399a511b6ec899988e4..5ef5b4287b424ecf6273b6a523d1b661b2c94844 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -424,7 +424,6 @@ hatch-eggs:
        $(PP) $(PYTHON) misc/hatch-eggs.py
 
 windows-exe: hatch-eggs
-       #PYTHON=$(PYTHON) $(PP) $(MAKE) -C windows
        cd windows && $(PP) $(PYTHON) setup.py py2exe
 
 windows-installer: windows-exe

diff --git a/windows/installer.tmpl b/windows/installer.tmpl
index 2d07f8b993e716d2534a65f30cc72e1b6199a10c..db1044327a0289fe5ae0e9bb0ae348b69370498f 100644 (file)
--- a/windows/installer.tmpl
+++ b/windows/installer.tmpl
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Allmydata Tahoe
-AppVerName=Allmydata Tahoe %(major)d.%(minor)d
+AppVerName=Allmydata Tahoe %(major)d.%(minor)d.%(point)d-%(nano)d
 AppVersion=%(major)d.%(minor)d.%(point)d-%(nano)d
 VersionInfoVersion=%(major)d.%(minor)d.%(point)d.%(nano)d
 AppPublisher=Allmydata Inc.
@@ -18,12 +18,12 @@ SetupIconFile=../installer.ico
 UninstallDisplayIcon=../amdicon.ico
 ; license file needs to be build/all dir
 ;LicenseFile=../license.txt
-OutputBaseFilename=Allmydata_Tahoe_Setup_v%(major)d_%(minor)d_%(point)d
+OutputBaseFilename=Allmydata_Tahoe_Setup_v%(major)d_%(minor)d_%(point)d_%(nano)d
 
 [Files]
 ; contents of 'binaries' dir. (consolidated build target)
 Source: "*.*"; DestDir: "{app}\Install"; Flags: restartreplace replacesameversion uninsrestartdelete
-Source: ".\web\*.*"; DestDir: "{app}\web"; Flags: recursesubdirs
+Source: ".\web\*.*"; DestDir: "{app}\Install\web"; Flags: recursesubdirs
 
 [Dirs]
 Name: "{app}\noderoot"
@@ -44,7 +44,7 @@ Filename: "{app}\Install\confwiz.exe"; Flags: hidewizard
 ; Performed before the uninstaller runs to undo things
 Filename: "{sys}\net.exe"; Parameters: "stop Tahoe"; Flags: runhidden
 Filename: "{app}\Install\tahoesvc.exe"; Parameters: "-remove"; Flags: runhidden
-;Filename: "http://www.allmydata.com/redirect/uninstallsurvey.php?build=%(build)%"; Flags: shellexec
+;Filename: "http://www.allmydata.com/redirect/uninstallsurvey.php?build=%(build)s"; Flags: shellexec
 
 [Registry]
 Root: HKLM; Subkey: "Software\Allmydata"; Flags: uninsdeletekeyifempty