From ea7868f4a4785923ae0a8e7d889238d68b0f61a9 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Tue, 24 Jan 2012 08:32:14 -0600
Subject: [PATCH] issue 632, make_min_web2py on windws, thanks mweissen

---
 VERSION                    |  2 +-
 scripts/make_min_web2py.py | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 952b0a4c..cdb60005 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-01-24 08:31:01) stable
+Version 1.99.4 (2012-01-24 08:32:11) stable
diff --git a/scripts/make_min_web2py.py b/scripts/make_min_web2py.py
index 410e10e2..b98bd4b0 100644
--- a/scripts/make_min_web2py.py
+++ b/scripts/make_min_web2py.py
@@ -41,39 +41,48 @@ gluon/contrib/pysimplesoap/
 import sys, os, shutil, glob
 
 def main():
+    global REQUIRED, IGNORED
+    
     if len(sys.argv)<2:
         print USAGE
     
     # make target folder
     target = sys.argv[1]
     os.mkdir(target)
+    
+    # change to os specificsep
+    REQUIRED = REQUIRED.replace('/',os.sep)
+    IGNORED = IGNORED.replace('/',os.sep)
+    
 
     # make a list of all files to include
     files = [x.strip() for x in REQUIRED.split('\n') \
                  if x and not x[0]=='#']
     ignore = [x.strip() for x in IGNORED.split('\n') \
                    if x and not x[0]=='#']
+                   
     def accept(filename):
         for p in ignore:
             if filename.startswith(p):
                 return False
         return True
-    pattern = 'gluon/*.py'
+    pattern = os.path.join('gluon','*.py')
     while True:
         newfiles = [x for x in glob.glob(pattern) if accept(x)]
         if not newfiles: break
         files += newfiles
-        pattern = pattern[:-3]+'/*.py'
+        pattern = os.path.join(pattern[:-3],'*.py')
     # copy all files, make missing folder, build default.py
     files.sort()
+    defaultpy = os.path.join('applications','welcome','controllers','default.py')
     for f in files:
         dirs = f.split(os.path.sep)
         for i in range(1,len(dirs)):
-            try: os.mkdir(target+'/'+os.path.join(*dirs[:i]))
+            try: os.mkdir(target+os.sep+os.path.join(*dirs[:i]))
             except OSError: pass
-        if f=='applications/welcome/controllers/default.py':
-            open(target+'/'+f,'w').write('def index(): return "hello"\n')
+        if f==defaultpy:
+            open(os.path.join(target,f),'w').write('def index(): return "hello"\n')
         else:
-            shutil.copyfile(f,target+'/'+f)
+            shutil.copyfile(f,os.path.join(target,f))
         
 if __name__=='__main__': main()