From ffc2df4d9de20dd1ecde7daf2d425a32298480b6 Mon Sep 17 00:00:00 2001 From: "jj%netscape.com" Date: Sat, 4 Mar 2000 01:52:50 +0000 Subject: [PATCH] Removed references to MOZ_FULLCIRCLE in mozilla. a=leaf r=sfraser git-svn-id: svn://10.0.0.236/trunk@62201 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/build/mac/BuildNGLayout.pl | 7 ------ mozilla/build/mac/BuildNGLayoutDebug.pl | 7 ------ mozilla/build/mac/NGLayoutBuildList.pm | 22 ------------------- .../xpfe/appshell/src/nsAppShellService.cpp | 8 ------- 4 files changed, 44 deletions(-) diff --git a/mozilla/build/mac/BuildNGLayout.pl b/mozilla/build/mac/BuildNGLayout.pl index 5bf50bf1c4b..7d932b92ebc 100644 --- a/mozilla/build/mac/BuildNGLayout.pl +++ b/mozilla/build/mac/BuildNGLayout.pl @@ -35,7 +35,6 @@ use Moz; $DEBUG = 0; $CARBON = 0; # turn on to build with TARGET_CARBON $NECKO = 1; -$MOZ_FULLCIRCLE = 0; $PROFILE = 0; $GC_LEAK_DETECTOR = 0; # turn on to use GC leak detection @@ -136,12 +135,6 @@ if ($build{most}) chdir("::::"); $MOZ_SRC = cwd(); -if ($MOZ_FULLCIRCLE) -{ - #// Get the Build Number for the Master.ini(Full Circle) n'stuff - $buildnum = Moz::SetBuildNumber(); -} - if ($USE_TIMESTAMPED_LOGS) { #Use time-stamped names so that you don't clobber your previous log file! diff --git a/mozilla/build/mac/BuildNGLayoutDebug.pl b/mozilla/build/mac/BuildNGLayoutDebug.pl index d59810ae78f..4714ce7be41 100644 --- a/mozilla/build/mac/BuildNGLayoutDebug.pl +++ b/mozilla/build/mac/BuildNGLayoutDebug.pl @@ -67,7 +67,6 @@ $BUILD_ROOT = ":"; # then turn off all $pull variables, and set $BUILD_ROOT. $DEBUG = 1; $CARBON = 0; # Turn on to build with TARGET_CARBON -$MOZ_FULLCIRCLE = 0; $PROFILE = 0; $GC_LEAK_DETECTOR = 0; # turn on to use GC leak detection @@ -168,12 +167,6 @@ if ($build{most}) chdir("::::"); $MOZ_SRC = cwd(); -if ($MOZ_FULLCIRCLE) -{ - #// Get the Build Number for the Master.ini(Full Circle) n'stuff - $buildnum = Moz::SetBuildNumber(); -} - if ($USE_TIMESTAMPED_LOGS) { #Use time-stamped names so that you don't clobber your previous log file! diff --git a/mozilla/build/mac/NGLayoutBuildList.pm b/mozilla/build/mac/NGLayoutBuildList.pm index 8e64344dcb1..792de6c469b 100644 --- a/mozilla/build/mac/NGLayoutBuildList.pm +++ b/mozilla/build/mac/NGLayoutBuildList.pm @@ -900,23 +900,6 @@ sub BuildClientDist() #XPINSTALL (the one and only!) _InstallFromManifest(":mozilla:xpinstall:public:MANIFEST", "$distdirectory:xpinstall:"); - #FULL CIRCLE - if ($main::MOZ_FULLCIRCLE) - { - _InstallFromManifest(":ns:fullsoft:public:MANIFEST", "$distdirectory"); - - if ($main::DEBUG) - { - #_InstallFromManifest(":ns:fullsoft:public:MANIFEST", "$distdirectory:viewer_debug:"); - } - else - { - #_InstallFromManifest(":ns:fullsoft:public:MANIFEST", "$distdirectory:viewer:"); - _InstallFromManifest(":ns:fullsoft:public:MANIFEST", "$distdirectory"); - } - } - - # XPFE COMPONENTS _InstallFromManifest(":mozilla:xpfe:components:public:MANIFEST", "$distdirectory:xpfe:components"); _InstallFromManifest(":mozilla:xpfe:components:public:MANIFEST_IDL", "$distdirectory:idl:"); @@ -1010,11 +993,6 @@ sub BuildDist() mkpath([ ":mozilla:dist:viewer:Plugins", ":mozilla:dist:viewer_debug:Plugins"]); mkpath([ ":mozilla:dist:client:Plugins", ":mozilla:dist:client_debug:Plugins"]); - if ($main::MOZ_FULLCIRCLE) - { - mkpath([ $dist_dir."TalkBack"]); - } - BuildRuntimeDist(); BuildClientDist(); diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index d3e4de793a1..b51a76db17a 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -53,10 +53,6 @@ #include "nsWidgetsCID.h" #include "nsIStreamObserver.h" -#ifdef MOZ_FULLCIRCLE -#include "fullsoft.h" -#endif - #include "nsMetaCharsetCID.h" #include "nsIMetaCharsetService.h" @@ -131,10 +127,6 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService, { nsresult rv; -#ifdef MOZ_FULLCIRCLE - FCInitialize(); -#endif - // Remember cmd line service. mCmdLineService = aCmdLineService; NS_IF_ADDREF( mCmdLineService );