From a9f64f46150336c8062ffebc4e06a8bf9000181e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 16 Dec 2013 21:00:51 -0700
Subject: [PATCH] MzCOM: fix versioning and collection path

Merge bug fix to v6.0 (pending review)
---
 racket/src/mzcom/mzobj.cxx            |  2 +-
 racket/src/worksp/mzcom/.gitignore    |  1 +
 racket/src/worksp/mzcom/MzCOM.vcproj  |  6 ++++
 racket/src/worksp/mzcom/mzcom.rc      |  4 +--
 racket/src/worksp/mzcom/mzobj.rgs     | 24 --------------
 racket/src/worksp/mzcom/mzobj_rgs.rkt | 46 +++++++++++++++++++++++++++
 6 files changed, 56 insertions(+), 27 deletions(-)
 delete mode 100644 racket/src/worksp/mzcom/mzobj.rgs
 create mode 100644 racket/src/worksp/mzcom/mzobj_rgs.rkt

diff --git a/racket/src/mzcom/mzobj.cxx b/racket/src/mzcom/mzobj.cxx
index e0512e4ec3..c3460f0c93 100644
--- a/racket/src/mzcom/mzobj.cxx
+++ b/racket/src/mzcom/mzobj.cxx
@@ -156,7 +156,7 @@ void setupSchemeEnv(Scheme_Env *in_env)
 
   scheme_add_global("mzcom-exe",scheme_make_utf8_string(exeBuff),env);
   scheme_set_exec_cmd(exeBuff);
-  scheme_set_collects_path(scheme_make_path("collects"));
+  scheme_set_collects_path(scheme_make_path("../collects"));
   scheme_init_collection_paths(env, scheme_make_null());
 
   // initialize namespace
diff --git a/racket/src/worksp/mzcom/.gitignore b/racket/src/worksp/mzcom/.gitignore
index d534dcf016..2492569878 100644
--- a/racket/src/worksp/mzcom/.gitignore
+++ b/racket/src/worksp/mzcom/.gitignore
@@ -2,3 +2,4 @@
 /mzcom_i.c
 /mzcom_p.c
 /dlldata.c
+/mzobj.rgs
diff --git a/racket/src/worksp/mzcom/MzCOM.vcproj b/racket/src/worksp/mzcom/MzCOM.vcproj
index 07aa6e5f4b..d14375a8bd 100644
--- a/racket/src/worksp/mzcom/MzCOM.vcproj
+++ b/racket/src/worksp/mzcom/MzCOM.vcproj
@@ -30,6 +30,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="..\..\..\racket mzobj_rgs.rkt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -113,6 +114,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="..\..\..\racket mzobj_rgs.rkt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -198,6 +200,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="..\..\..\racket mzobj_rgs.rkt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -285,6 +288,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="..\..\..\racket mzobj_rgs.rkt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -374,6 +378,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="..\..\..\racket mzobj_rgs.rkt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -462,6 +467,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="..\..\..\racket mzobj_rgs.rkt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/racket/src/worksp/mzcom/mzcom.rc b/racket/src/worksp/mzcom/mzcom.rc
index 92b2f647c6..27d5001da5 100644
--- a/racket/src/worksp/mzcom/mzcom.rc
+++ b/racket/src/worksp/mzcom/mzcom.rc
@@ -107,10 +107,10 @@ CAPTION "MzCOM"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,76,69,50,14,BS_CENTER
-    CTEXT           "MzCOM v. 5.3",IDC_STATIC,71,8,61,8
+    CTEXT           "MzCOM v"MZSCHEME_VERSION,IDC_STATIC,71,8,61,8
     CTEXT           "Copyright (c) 2000-2013 PLT (Paul Steckler)",IDC_STATIC,
                     41,20,146,9
-    CTEXT           "Racket v. 5.3",IDC_STATIC,64,35,75,8
+    CTEXT           "Racket v"MZSCHEME_VERSION,IDC_STATIC,64,35,75,8
     CTEXT           "Copyright (c) 1995-2013 PLT Inc.",IDC_STATIC,
                     30,47,143,8
     ICON            MZICON,IDC_STATIC,11,16,20,20
diff --git a/racket/src/worksp/mzcom/mzobj.rgs b/racket/src/worksp/mzcom/mzobj.rgs
deleted file mode 100644
index befa6f19c4..0000000000
--- a/racket/src/worksp/mzcom/mzobj.rgs
+++ /dev/null
@@ -1,24 +0,0 @@
-HKCR
-{
-	MzCOM.MzObj.5.3.5.1 = s 'MzObj Class'
-	{
-		CLSID = s '{A3B0AF9E-2AB0-11D4-B6D2-0060089002FE}'
-	}
-	MzCOM.MzObj = s 'MzObj Class'
-	{
-		CLSID = s '{A3B0AF9E-2AB0-11D4-B6D2-0060089002FE}'
-		CurVer = s 'MzCOM.MzObj.5.3.5.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {A3B0AF9E-2AB0-11D4-B6D2-0060089002FE} = s 'MzObj Class'
-		{
-			ProgID = s 'MzCOM.MzObj.0.0.0.0'
-			VersionIndependentProgID = s 'MzCOM.MzObj'
-			ForceRemove 'Programmable'
-			LocalServer32 = s '%MODULE%'
-			val AppID = s '{A604CB9D-2AB5-11D4-B6D3-0060089002FE}'
-			'TypeLib' = s '{A604CB9C-2AB5-11D4-B6D3-0060089002FE}'
-		}
-	}
-}
diff --git a/racket/src/worksp/mzcom/mzobj_rgs.rkt b/racket/src/worksp/mzcom/mzobj_rgs.rkt
new file mode 100644
index 0000000000..0d5a7f7216
--- /dev/null
+++ b/racket/src/worksp/mzcom/mzobj_rgs.rkt
@@ -0,0 +1,46 @@
+#lang racket/base
+
+(define template #<<EOS
+HKCR
+{
+	MzCOM.MzObj.@|VERSION| = s 'MzObj Class'
+	{
+		CLSID = s '{A3B0AF9E-2AB0-11D4-B6D2-0060089002FE}'
+	}
+	MzCOM.MzObj = s 'MzObj Class'
+	{
+		CLSID = s '{A3B0AF9E-2AB0-11D4-B6D2-0060089002FE}'
+		CurVer = s 'MzCOM.MzObj.@|VERSION|'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {A3B0AF9E-2AB0-11D4-B6D2-0060089002FE} = s 'MzObj Class'
+		{
+			ProgID = s 'MzCOM.MzObj.@|VERSION|'
+			VersionIndependentProgID = s 'MzCOM.MzObj'
+			ForceRemove 'Programmable'
+			LocalServer32 = s '%MODULE%'
+			val AppID = s '{A604CB9D-2AB5-11D4-B6D3-0060089002FE}'
+			'TypeLib' = s '{A604CB9C-2AB5-11D4-B6D3-0060089002FE}'
+		}
+	}
+}
+
+EOS
+)
+
+(define content (regexp-replace* #rx"@[|]VERSION[|]" template (version)))
+
+(define file  "mzobj.rgs")
+
+(unless (and (file-exists? file)
+	     (equal? content
+		     (call-with-input-file*
+		      file
+		      (lambda (i)
+			(read-string (add1 (string-length content)) i)))))
+  (call-with-output-file*
+   file
+   #:exists 'truncate
+   (lambda (o)
+     (display content o))))