diff --git a/mozilla/js2/tests/cpp/macbuild/js2.pbproj/beard.pbxuser b/mozilla/js2/tests/cpp/macbuild/js2.pbproj/beard.pbxuser
new file mode 100644
index 00000000000..8ecee483eef
--- /dev/null
+++ b/mozilla/js2/tests/cpp/macbuild/js2.pbproj/beard.pbxuser
@@ -0,0 +1,177 @@
+// !$*UTF8*$!
+{
+	08FB7793FE84155DC02AAC07 = {
+		activeBuildStyle = 014CEA460018CE2711CA2923;
+		activeTarget = 08FB779FFE84155DC02AAC07;
+		addToTargets = (
+			08FB779FFE84155DC02AAC07,
+		);
+		breakpoints = (
+			F50B72A501C1AB840100017F,
+			F5F1989301C68CFB01A969CC,
+			F5F1989401C68D7A01A969CC,
+			F5F1989501C68D7A01A969CC,
+			F5F1989701C691BC01A969CC,
+			F5F1989801C691BC01A969CC,
+			F5DA043701C967DA01000102,
+		);
+		perUserDictionary = {
+			PBXWorkspaceConfiguration = {
+				ContentSize = "{946, 549}";
+				LeftSlideOut = {
+					ActiveTab = 0;
+					Frame = "{{0, 23}, {946, 526}}";
+					Split0 = {
+						ActiveTab = 2;
+						Frame = "{{224, 0}, {722, 526}}";
+						Split0 = {
+							Frame = "{{0, 196}, {722, 330}}";
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Debugger = {
+								Frame = "{{0, 0}, {924, 256}}";
+								Split0 = {
+									Frame = "{{0, 24}, {924, 232}}";
+									Split0 = {
+										Frame = "{{0, 0}, {453, 232}}";
+									};
+									Split1 = {
+										Frame = "{{462, 0}, {462, 232}}";
+									};
+									SplitCount = 2;
+								};
+								SplitCount = 1;
+								Tab0 = {
+									Frame = "{{0, 0}, {924, 173}}";
+								};
+								Tab1 = {
+									Frame = "{{0, 0}, {924, 276}}";
+								};
+								TabCount = 2;
+							};
+							Frame = "{{0, 0}, {924, 256}}";
+							LauncherConfigVersion = 4;
+						};
+						Tab1 = {
+							Frame = "{{0, 0}, {484, 208}}";
+							LauncherConfigVersion = 3;
+							Runner = {
+								Frame = "{{0, 0}, {484, 208}}";
+							};
+						};
+						Tab2 = {
+							BuildMessageFrame = "{{0, 0}, {724, 165}}";
+							BuildTranscriptFrame = "{{0, 174}, {724, 0}}";
+							Frame = "{{0, 0}, {722, 172}}";
+						};
+						Tab3 = {
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						TabCount = 4;
+					};
+					SplitCount = 1;
+					Tab0 = {
+						Frame = "{{0, 0}, {200, 526}}";
+					};
+					Tab1 = {
+						ClassesFrame = "{{0, 0}, {202, 56}}";
+						Frame = "{{0, 0}, {200, 100}}";
+						MembersFrame = "{{0, 65}, {202, 35}}";
+						OptionsSetName = "Hierarchy, all classes";
+					};
+					Tab2 = {
+						Frame = "{{0, 0}, {200, 100}}";
+					};
+					Tab3 = {
+						Frame = "{{0, 0}, {16, 651}}";
+						Split0 = {
+							Frame = "{{0, 0}, {16, 316}}";
+						};
+						Split1 = {
+							Frame = "{{0, 325}, {16, 326}}";
+						};
+						SplitCount = 2;
+					};
+					Tab4 = {
+						Frame = "{{0, 0}, {250, 100}}";
+					};
+					TabCount = 5;
+				};
+				WindowLocation = "{16, 135}";
+			};
+		};
+		wantsIndex = 1;
+		wantsSCM = -1;
+	};
+	08FB779FFE84155DC02AAC07 = {
+		activeExec = 0;
+		targetExecs = {
+			macosx = (
+				F5F243C601C19FF80100017F,
+			);
+		};
+	};
+	F50B72A501C1AB840100017F = {
+		fileReference = F5C501D901C01FBF0100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 283;
+		state = 1;
+	};
+	F5C501E701C024100100017F = {
+		uiCtxt = {
+			sepNavWindowFrame = "{{203, 71}, {750, 502}}";
+		};
+	};
+	F5DA043701C967DA01000102 = {
+		fileReference = F5C501DD01C022330100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 219;
+		state = 1;
+	};
+	F5F1989301C68CFB01A969CC = {
+		fileReference = F5C501D901C01FBF0100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 269;
+		state = 1;
+	};
+	F5F1989401C68D7A01A969CC = {
+		fileReference = F5C501E101C023340100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 372;
+		state = 2;
+	};
+	F5F1989501C68D7A01A969CC = {
+		fileReference = F5C501E101C023340100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 365;
+		state = 2;
+	};
+	F5F1989701C691BC01A969CC = {
+		fileReference = F5C501E701C024100100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 329;
+		state = 2;
+	};
+	F5F1989801C691BC01A969CC = {
+		fileReference = F5C501D901C01FBF0100017F;
+		isa = PBXFileBreakpoint;
+		lineNumber = 156;
+		state = 1;
+	};
+	F5F243C601C19FF80100017F = {
+		activeArgIndex = 2147483647;
+		argumentStrings = (
+		);
+		debuggerPlugin = GDBDebugging;
+		dylibVariantSuffix = "";
+		enableDebugStr = 1;
+		environmentEntries = (
+		);
+		isa = PBXExecutable;
+		shlibInfoDictList = (
+		);
+		sourceDirectories = (
+		);
+	};
+}
diff --git a/mozilla/js2/tests/cpp/macbuild/js2.pbproj/project.pbxproj b/mozilla/js2/tests/cpp/macbuild/js2.pbproj/project.pbxproj
index c76deb75c8a..6b3851be330 100644
--- a/mozilla/js2/tests/cpp/macbuild/js2.pbproj/project.pbxproj
+++ b/mozilla/js2/tests/cpp/macbuild/js2.pbproj/project.pbxproj
@@ -112,6 +112,7 @@
 				F5C501F501C024BF0100017F,
 				F5C501F601C024BF0100017F,
 				F5C501FB01C025870100017F,
+				F5E974C201EE3D040100017F,
 				F5C501FC01C025870100017F,
 				F5C501FF01C025B80100017F,
 				F5C5020001C025B80100017F,
@@ -131,7 +132,7 @@
 			);
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = ../../../src;
+				HEADER_SEARCH_PATHS = "../../../src ../../../src/regexp";
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O0";
@@ -177,6 +178,7 @@
 				F5F243C301C19ED30100017F,
 				F5F243C401C19ED30100017F,
 				F5F243C501C19ED30100017F,
+				F5E974C001EE3C090100017F,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -191,11 +193,9 @@
 				F5C501E201C023340100017F,
 				F5C501E501C023D50100017F,
 				F5C501E601C023D50100017F,
-				F5C501E801C024110100017F,
 				F5C501EE01C0247F0100017F,
 				F5C501EF01C0247F0100017F,
 				F5C501F001C0247F0100017F,
-				F5C501F101C0247F0100017F,
 				F5C501F201C0247F0100017F,
 				F5C501F701C024BF0100017F,
 				F5C501F801C024BF0100017F,
@@ -207,6 +207,9 @@
 				F5C5020401C025B80100017F,
 				F5C5020501C025B80100017F,
 				F5C5020601C025B80100017F,
+				F5E974C301EE3D040100017F,
+				F52EF06701EE461C0100017F,
+				F52EF06801EE46510100017F,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -254,6 +257,18 @@
 //F52
 //F53
 //F54
+		F52EF06701EE461C0100017F = {
+			fileRef = F5C501EC01C0247F0100017F;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52EF06801EE46510100017F = {
+			fileRef = F5C501E701C024100100017F;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F5C501D901C01FBF0100017F = {
 			isa = PBXFileReference;
 			name = DikDik_Shell.cpp;
@@ -344,12 +359,6 @@
 			path = ../../../src/js2runtime.cpp;
 			refType = 2;
 		};
-		F5C501E801C024110100017F = {
-			fileRef = F5C501E701C024100100017F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F5C501E901C0247F0100017F = {
 			isa = PBXFileReference;
 			name = jsarray.cpp;
@@ -398,12 +407,6 @@
 			settings = {
 			};
 		};
-		F5C501F101C0247F0100017F = {
-			fileRef = F5C501EC01C0247F0100017F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F5C501F201C0247F0100017F = {
 			fileRef = F5C501ED01C0247F0100017F;
 			isa = PBXBuildFile;
@@ -530,6 +533,38 @@
 			settings = {
 			};
 		};
+		F5E974BC01EE3B4A0100017F = {
+			children = (
+				F5E974BF01EE3C090100017F,
+			);
+			isa = PBXGroup;
+			name = regexp;
+			refType = 4;
+		};
+		F5E974BF01EE3C090100017F = {
+			isa = PBXFileReference;
+			name = regexp.h;
+			path = /Users/beard/Projects/JS2/mozilla/js2/src/regexp/regexp.h;
+			refType = 0;
+		};
+		F5E974C001EE3C090100017F = {
+			fileRef = F5E974BF01EE3C090100017F;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5E974C201EE3D040100017F = {
+			isa = PBXFileReference;
+			name = regexpwrapper.cpp;
+			path = /Users/beard/Projects/JS2/mozilla/js2/src/regexpwrapper.cpp;
+			refType = 0;
+		};
+		F5E974C301EE3D040100017F = {
+			fileRef = F5E974C201EE3D040100017F;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F5F2439901C19AC60100017F = {
 			children = (
 				F5F2439C01C19B920100017F,
@@ -548,6 +583,7 @@
 				F5F243AE01C19ED30100017F,
 				F5F243AF01C19ED30100017F,
 				F5F243B001C19ED30100017F,
+				F5E974BC01EE3B4A0100017F,
 				F5F243B101C19ED30100017F,
 				F5F243B201C19ED30100017F,
 				F5F243B301C19ED30100017F,