ifdefs for phoenix. 161448. not part of main mozilla build.

profile/src/nsProfile.cpp

@@ -936,6 +936,8 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
 		NS_ASSERTION(NS_SUCCEEDED(rv),"failed to determine if we should force migration");
 	}
 
+#ifndef MOZ_PHOENIX // The phoenix doesn't use old profiles.
+
     // Start Migaration activity
     rv = cmdLineArgs->GetCmdLineValue(INSTALLER_CMD_LINE_ARG, getter_Copies(cmdResult));
     if (NS_SUCCEEDED(rv) || forceMigration)
@@ -976,6 +978,8 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
         }
     }
 
+#endif // MOZ_PHOENIX
+
 #ifdef DEBUG_profile_verbose
     printf("Profile Manager : Command Line Options : End\n");
 #endif

xpcom/io/nsAppFileLocationProvider.cpp

@@ -70,11 +70,21 @@
 #endif
 
 // define default product directory
+#ifdef MOZ_PHOENIX
+// Phoenix, the new standalone browser, has its own profile separate from
+// mozmail and other standalone apps.
+#if defined(XP_WIN) || defined(XP_MAC) || defined(XP_OS2) || defined(XP_BEOS)
+#define DEFAULT_PRODUCT_DIR NS_LITERAL_CSTRING("MozBrowser")
+#elif defined (XP_UNIX)
+#define DEFAULT_PRODUCT_DIR NS_LITERAL_CSTRING(".mozbrowser")
+#endif
+#else
 #if defined(XP_WIN) || defined(XP_MAC) || defined(XP_OS2) || defined(XP_BEOS)
 #define DEFAULT_PRODUCT_DIR NS_LITERAL_CSTRING("Mozilla")
 #elif defined (XP_UNIX)
 #define DEFAULT_PRODUCT_DIR NS_LITERAL_CSTRING(".mozilla")
 #endif
+#endif // MOZ_PHOENIX
 
 // Locally defined keys used by nsAppDirectoryEnumerator
 #define NS_ENV_PLUGINS_DIR          "EnvPlugins"    // env var MOZ_PLUGIN_PATH

xpfe/bootstrap/Makefile.in

@@ -66,11 +66,19 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 REQUIRES	+= intl profile appcomps
 endif
 
+ifdef MOZ_PHOENIX
+ifeq ($(USE_SHORT_LIBNAME),1)
+PROGRAM		= mozbrowser$(BIN_SUFFIX)
+else
+PROGRAM		= mozbrowser-bin$(BIN_SUFFIX)
+endif
+else
 ifeq ($(USE_SHORT_LIBNAME),1)
 PROGRAM		= mozilla$(BIN_SUFFIX)
 else
 PROGRAM		= mozilla-bin$(BIN_SUFFIX)
 endif
+endif
 
 CPPSRCS		= \
 		nsAppRunner.cpp \
@@ -283,18 +291,24 @@ libs:: mozilla.1
 install:: mozilla.1
 	$(SYSINSTALL) $(IFLAGS) $< $(DESTDIR)$(mandir)/man1
 
-mozilla:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ifdef MOZ_PHOENIX
+MOZILLA_SCRIPT=mozbrowser
+else
+MOZILLA_SCRIPT=mozilla
+endif
+
+$(MOZILLA_SCRIPT):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
 		-e "s|%MREDIR%|$(mredir)|" > $@
 	chmod +x $@
 
-libs:: mozilla
+libs:: $(MOZILLA_SCRIPT)
 	$(INSTALL) $< $(DIST)/bin
 
-install:: mozilla
+install:: $(MOZILLA_SCRIPT)
 	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
 
-GARBAGE += mozilla.1 mozilla
+GARBAGE += mozilla.1 $(MOZILLA_SCRIPT)
 
 endif