From 146b290597afb8e77c4190c7aa8fa26d55bca2de Mon Sep 17 00:00:00 2001
From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Tue, 15 Jan 2008 17:38:06 -0700
Subject: [PATCH] more minor build tweaks for windows
tweaking version number display, and fixing a couple of small bugs
---
Makefile | 1 -
windows/installer.tmpl | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index bf3f90b5..5ef5b428 100644
--- 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 2d07f8b9..db104432 100644
--- 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
--
2.45.2