mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

removed BUILD_PROFILE ifdef

This commit is contained in:
gayatrib%netscape.com 1999-04-11 05:13:58 +00:00
Родитель 4fda80d9f5
Коммит 75f3b87c97
7 изменённых файлов: 20 добавлений и 41 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
makefile.win
Просмотреть файл

@ -45,9 +45,6 @@ DIRS = \
jpeg \
modules\libreg \
xpcom \
!if defined(BUILD_PROFILE)
profile \
!endif
modules\zlib \
modules\libjar \
modules\libutil \
@ -64,6 +61,7 @@ DIRS = \
lib\xp \
lib\libpwcac \
network \
profile \
!endif
!if defined(LAYOUT_DIRS)
# the following are associated with the layout engine

2
webshell/tests/viewer/makefile.win
Просмотреть файл

@ -60,9 +60,7 @@ LINCS= \
-I$(PUBLIC)\java \
-I$(PUBLIC)\plugin \
-I$(PUBLIC)\pref \
!ifdef BUILD_PROFILE
-I$(PUBLIC)\profile \
!endif
-I$(PUBLIC)\editor \
-I$(PUBLIC)\uconv \
-I$(PUBLIC)\strres \

8
webshell/tests/viewer/nsSetupRegistry.cpp
Просмотреть файл

@ -59,10 +59,8 @@
#ifdef XP_PC
#include "nsIObserverService.h"
#include "nsIObserver.h"
#ifdef BUILD_PROFILE
#include "nsIProfile.h"
#endif
#endif
#include "nsIAllocator.h"
#include "nsIGenericFactory.h"
@ -79,9 +77,7 @@
#define WEB_DLL "raptorweb.dll"
#define PLUGIN_DLL "raptorplugin.dll"
#define PREF_DLL "xppref32.dll"
#ifdef BUILD_PROFILE
#define PROFILE_DLL "xpprofile32.dll"
#endif
#define PARSER_DLL "raptorhtmlpars.dll"
#define DOM_DLL "jsdom.dll"
#define LAYOUT_DLL "raptorhtml.dll"
@ -216,10 +212,8 @@ static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
#ifdef XP_PC
static NS_DEFINE_IID(kObserverServiceCID, NS_OBSERVERSERVICE_CID);
static NS_DEFINE_IID(kObserverCID, NS_OBSERVER_CID);
#ifdef BUILD_PROFILE
static NS_DEFINE_IID(kProfileCID, NS_PROFILE_CID);
#endif
#endif
//#define NEW_CLIPBOARD_SUPPORT
@ -370,10 +364,8 @@ NS_SetupRegistry()
#ifdef XP_PC
nsComponentManager::RegisterComponent(kObserverServiceCID, "ObserverService", NS_OBSERVERSERVICE_PROGID, BASE_DLL,PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kObserverCID, "Observer", NS_OBSERVER_PROGID, BASE_DLL,PR_FALSE, PR_FALSE);
#ifdef BUILD_PROFILE
nsComponentManager::RegisterComponent(kProfileCID, NULL, NULL, PROFILE_DLL, PR_FALSE, PR_FALSE);
#endif
#endif
#if 0 // autoregistration now works on all platforms, and RDF self-registers, so commenting out
#if defined(XP_MAC) || defined (XP_UNIX)

4
xpfe/appshell/src/makefile.win
Просмотреть файл

@ -55,9 +55,7 @@ LINCS=-I$(PUBLIC)\raptor \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\js \
-I$(PUBLIC)\pref \
!ifdef BUILD_PROFILE
-I$(PUBLIC)\profile \
!endif
-I$(PUBLIC)\profile \
-I$(PUBLIC)\appcores \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\rdf

25
xpfe/appshell/src/nsFileLocations.cpp
Просмотреть файл

@ -47,7 +47,7 @@
#endif
// header file for profiles
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
#include "nsIProfile.h"
#endif //XP_PC
@ -57,7 +57,7 @@
static NS_DEFINE_IID(kIFileLocatorIID, NS_IFILELOCATOR_IID);
// for profile manager
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
#endif // XP_PC
@ -151,33 +151,28 @@ void nsSpecialFileSpec::operator = (Type aType)
// WIN : ./profile
// MAC : ./profile
#ifdef XP_PC
#ifdef BUILD_PROFILE
#ifdef XP_PC
nsIProfile *profile = nsnull;
static nsFileSpec* profileDir = nsnull;
if (!profileDir)
{
nsIProfile* profile = nsnull;
nsresult rv = nsServiceManager::GetService(kProfileCID,
nsIProfile* profile = nsnull;
nsresult rv = nsServiceManager::GetService(kProfileCID,
nsIProfile::GetIID(),
(nsISupports **)&profile);
if (NS_FAILED(rv)) {
return;
if (NS_FAILED(rv)) {
return;
}
profile->Startup(nsnull);
profile->Startup(nsnull);
profileDir = new nsFileSpec;
profile->GetCurrentProfileDir(&profileDir);
profileDir = new nsFileSpec;
profile->GetCurrentProfileDir(&profileDir);
}
if (profileDir) {
*this = *profileDir;
}
#else
*this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentWorkingDirectory);
*this += "profile";
#endif
#endif // XP_PC
#ifdef XP_UNIX

2
xpfe/bootstrap/makefile.win
Просмотреть файл

@ -39,9 +39,7 @@ LINCS=-I$(PUBLIC)\raptor \
-I$(PUBLIC)\js \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\pref \
!ifdef BUILD_PROFILE
-I$(PUBLIC)\profile \
!endif
-I$(PUBLIC)\rdf \
-I$(PUBLIC)\editor \
-I$(PUBLIC)\caps \

16
xpfe/bootstrap/nsAppRunner.cpp
Просмотреть файл

@ -33,7 +33,7 @@
// header file for profile manager
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
// include this for _getcwd call
#include <direct.h>
@ -57,7 +57,7 @@ static NS_DEFINE_IID(kIAppShellServiceIID, NS_IAPPSHELL_SERVICE_IID);
static NS_DEFINE_IID(kICmdLineServiceIID, NS_ICOMMANDLINE_SERVICE_IID);
// defined for profileManager
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
#endif // XP_PC
@ -118,7 +118,7 @@ int main(int argc, char* argv[])
nsIPref *prefs;
// initializations for profile manager
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
char * currProfileName=nsnull;
char * currProfileDir=nsnull;
PRBool profileDirSet = PR_FALSE;
@ -137,7 +137,7 @@ int main(int argc, char* argv[])
char* cmdResult = nsnull;
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
profile = nsnull;
#endif // XP_PC
@ -153,7 +153,7 @@ int main(int argc, char* argv[])
NS_SetupRegistry_1();
// get and start the ProfileManager service
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
rv = nsServiceManager::GetService(kProfileCID,
nsIProfile::GetIID(),
(nsISupports **)&profile);
@ -202,7 +202,7 @@ int main(int argc, char* argv[])
if (nsnull == urlstr){
// check for command line arguments for profile manager
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
// -P command line option works this way:
// apprunner -P profilename
@ -314,7 +314,7 @@ int main(int argc, char* argv[])
* check if we have a profile directory
*/
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
if (!profileDirSet) {
int numProfiles = 0;
profile->GetProfileCount(&numProfiles);
@ -536,7 +536,7 @@ done:
nsServiceManager::ReleaseService(kPrefCID, prefs);
}
#if defined(XP_PC) && defined(BUILD_PROFILE)
#if defined(XP_PC)
/* Release the global profile... */
if (profile) {
profile->Shutdown();