fix windows build's packaging of web templates

the recent changes to webish's template lookup (to use nevow.util hence
pkg_resources) to support the mac build, needs these changes to the windows
build in match the new lookup path

diff --git a/windows/installer.tmpl b/windows/installer.tmpl
index ea3b4359bdd698e9b3a92828572e50b3d1583ba6..830b7f58d3d086a486d9bf995813a38f8635cfc0 100644 (file)
--- a/windows/installer.tmpl
+++ b/windows/installer.tmpl
@@ -23,7 +23,7 @@ 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}\Install\web"; Flags: recursesubdirs
+Source: ".\pkg_resources\*.*"; DestDir: "{app}\Install\pkg_resources"; Flags: recursesubdirs
 Source: ".\winfuse\*.*"; DestDir: "{app}\Install\winfuse"; Flags: recursesubdirs
 
 [Dirs]

diff --git a/windows/setup.py b/windows/setup.py
index 230aa4d3d9698689ed372456e1f199129cb62dab..9ebf9166635a0ababf0e40fdb22814299c3af69a 100644 (file)
--- a/windows/setup.py
+++ b/windows/setup.py
@@ -58,7 +58,7 @@ setup_args = {
     'data_files': [
         ('.', [
         ],),
-        ('web', glob.glob('../src/allmydata/web/*')),
+        ('pkg_resources/allmydata/web', glob.glob('../src/allmydata/web/*')),
         ('winfuse', glob.glob('./winfuse/*')),
     ],
     'zipfile' : 'library.zip',