Fixes to make distribution scripts:

 * Fixed cacert.pem path used in WinRT demo projects
 * Replaced regexp to match "README" with quotes so that regexp
   don't get confused with README.txt

2 files changed, 8 insertions, 2 deletions

diff --git a/distribution/lib/FixUtil.py b/distribution/lib/FixUtil.py
index 6c6d0499f27..ba8bf3f1a70 100755
--- a/distribution/lib/FixUtil.py
+++ b/distribution/lib/FixUtil.py
@@ -150,7 +150,10 @@ def fileMatchAndReplace(filename, matchAndReplaceExps, verbose=True):
             match = regexp.search(line)
             if match != None:
                 oldLine = line
-                line = oldLine.replace(match.group(1), replace)
+                if len(match.groups()) == 0:
+                    line = oldLine.replace(match.group(), replace)
+                else:
+                    line = oldLine.replace(match.group(1), replace)
                 #print oldLine + line
                 updated = True
                 break
diff --git a/distribution/makedist.py b/distribution/makedist.py
index 8cbcea2801c..c532e6a393c 100755
--- a/distribution/makedist.py
+++ b/distribution/makedist.py
@@ -344,7 +344,10 @@ for d in ["demo", "democs", "demovb"]:
         for f in filesnames:
             for m in [ "*.vcproj", "*.vcxproj", "*.vcxproj.filters", "*.csproj", "*.vbproj" ]:
                 if fnmatch.fnmatch(f, m):
-                    FixUtil.fileMatchAndReplace(os.path.join(root, f), [("(/^README$/)", "README.txt")], False)
+                    FixUtil.fileMatchAndReplace(os.path.join(root, f), [(re.escape('"README"'), '"README.txt"')], False)
+                    FixUtil.fileMatchAndReplace(os.path.join(root, f), 
+                                                [(re.escape("..\\..\\..\\..\\..\\certs\\cacert.pem"), 
+                                                  "..\\..\\..\\..\\certs\\cacert.pem")], False)
 
 for f in rmFiles: remove(os.path.join(winDemoDir, f))