changing MacintoshOSX to Mac OS

cck/cckwiz/iniFiles/Branding_page2.ini

@@ -30,7 +30,7 @@ Help=Online;%Root%CCKHelp\brandingpage2.html
 
 [Navigation Controls]
 onNext=
-onEnter=VerifyVal(%CD image%,0);VerifyVal(%lPlatform%,MacintoshOSX);VerifyVal(%lPlatform%,Linux)
+onEnter=VerifyVal(%CD image%,0);VerifyVal(%lPlatform%,Mac OS);VerifyVal(%lPlatform%,Linux)
 Help=Branding2_help.ini
 
 [Image 1]

cck/cckwiz/iniFiles/build_page1.ini

@@ -51,7 +51,7 @@ Help=Online;%Root%CCKHelp\buildpage1.html
 
 [Navigation Controls]
 onNext=Message(Are you ready to build your customized installer?);RunIB();Msg(Installer creation is complete. The build is in %Root%Configs\%CustomizationList%\Output)
-onEnter=VerifyVal(%lPlatform%,MacintoshOSX)
+onEnter=VerifyVal(%lPlatform%,Mac OS)
 Help=InstallerHelp.ini
 
 [Image 1]

cck/driver/WizardMachine.cpp

@@ -884,7 +884,7 @@ BOOL CWizardMachineApp::GoToNextNode()
 
 			strPageName = tmpParentNode->subPages->pages.GetAt(tmpParentNode->currNodeIndex);
 			// skip Mac installer screen
-			if ((strPlatform != "MacintoshOSX") && (strPageName == "MacInstaller"))
+			if ((strPlatform != "Mac OS") && (strPageName == "MacInstaller"))
 				tmpParentNode->currNodeIndex++;
 
 			NODE* siblingNode = tmpParentNode->childNodes[tmpParentNode->currNodeIndex];
@@ -1246,7 +1246,7 @@ BOOL CWizardMachineApp::IsLastNode(NODE* treeNode)
 	// Close Wizard after creating customized Mac files
 	// and do not proceed to the windows installer screen
 	CString strPlatform = GetGlobal("lPlatform");
-	if ((strPlatform == "MacintoshOSX") && 
+	if ((strPlatform == "Mac OS") && 
 		((treeNode->localVars->pageName) == "MacInstaller"))
 		lastNode = TRUE;
 

cck/ib/ib.cpp

@@ -25,7 +25,7 @@
 #define WDISK_SPACE 27577549
 // Required disk space for Linux build
 #define LDISK_SPACE 84934656
-// Required disk space for MacintoshOSX build
+// Required disk space for Mac OS build
 #define MDISK_SPACE 5976884
 
 int interpret(char *cmd);
@@ -189,7 +189,7 @@ int ExtractJARFile(CString xpiname, CString jarname, CString xpifile)
 	CString command;
 	CString jarArchive;
 	
-	if (curPlatform == "MacintoshOSX")
+	if (curPlatform == "Mac OS")
 	{
 		jarname.Replace("/","\\");
 		jarname.Insert(0,"\\");
@@ -222,7 +222,7 @@ int ReplaceJARFiles()
 	{
 		// This copy preserves the existing archive if it exists - do we
 		// need to delete it the first time through?
-		if (curPlatform == "MacintoshOSX")
+		if (curPlatform == "Mac OS")
 			jarArchive = tempPath + jarList[i].jarname;
 		else
 			jarArchive = tempPath + "\\bin\\chrome\\" + jarList[i].jarname;
@@ -2041,7 +2041,7 @@ int StartIB(/*CString parms, WIDGET *curWidget*/)
 			return FALSE;
 		}
 	}
-	else if (curPlatform == "MacintoshOSX")
+	else if (curPlatform == "Mac OS")
 	{
 		if ((nTotalAvailable.QuadPart) < MDISK_SPACE)
 		{
@@ -2283,7 +2283,7 @@ int StartIB(/*CString parms, WIDGET *curWidget*/)
 		CreateLinuxInstaller();
 	}
 
-	else if (curPlatform == "MacintoshOSX")
+	else if (curPlatform == "Mac OS")
 	{
 		CreateMacZipFile();
 	}

cck/makefile.win

@@ -85,9 +85,9 @@ export::
 	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\Windows
 	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\Windows\enus
 	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\Windows\enus\Nscpxpi
-	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\MacintoshOSX
-	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\MacintoshOSX\enus
-	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\MacintoshOSX\enus\Nscpxpi
+	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\"Mac OS"
+	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\"Mac OS"\enus
+	-mkdir $(CCKDIST)\CCKTool\Version\$(VERSION)\"Mac OS"\enus\Nscpxpi
  
 #  We populate empty folders so zip will pick them up.
 	$(MAKE_INSTALL) .\build\DeleteThisFile $(CCKDIST)\CCKTool\Configs\Default\Output