From 28d26264cc266e8784a38e72139a057ec9b0f7b1 Mon Sep 17 00:00:00 2001 From: sfraser Date: Thu, 28 May 1998 01:24:19 +0000 Subject: [PATCH] First Checked In. git-svn-id: svn://10.0.0.236/trunk@2457 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/mac/ComponentConfig.h | 50 +++++++++++++++++++++ mozilla/config/mac/DefinesMac.h | 59 ++++++++++++++++++++++++ mozilla/config/mac/DefinesMozilla.h | 65 +++++++++++++++++++++++++++ mozilla/config/mac/JavaDefines.h | 25 +++++++++++ mozilla/config/mac/MacConfig.h | 21 +++++++++ mozilla/config/mac/MacConfigInclude.h | 42 +++++++++++++++++ mozilla/config/mac/MacPrefix.h | 25 +++++++++++ mozilla/config/mac/MacPrefix_debug.h | 25 +++++++++++ mozilla/config/mac/export.mac | 16 +++++++ 9 files changed, 328 insertions(+) create mode 100644 mozilla/config/mac/ComponentConfig.h create mode 100644 mozilla/config/mac/DefinesMac.h create mode 100644 mozilla/config/mac/DefinesMozilla.h create mode 100644 mozilla/config/mac/JavaDefines.h create mode 100644 mozilla/config/mac/MacConfig.h create mode 100644 mozilla/config/mac/MacConfigInclude.h create mode 100644 mozilla/config/mac/MacPrefix.h create mode 100644 mozilla/config/mac/MacPrefix_debug.h create mode 100644 mozilla/config/mac/export.mac diff --git a/mozilla/config/mac/ComponentConfig.h b/mozilla/config/mac/ComponentConfig.h new file mode 100644 index 00000000000..150e6e6d72c --- /dev/null +++ b/mozilla/config/mac/ComponentConfig.h @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +/* +* ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ +* Component_Config.h +* ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ +* This file is the Mac equivalent to ns/config/liteness.mak on Windows. +* Set different #define's to control what components get built. +*/ + +#if defined(MOZ_LITE) /* Nav-only */ + #define MOZ_JSD + #define MOZ_NAV_BUILD_PREFIX +#elif defined(MOZ_MEDIUM) /* Nav + Composer */ + #define EDITOR + #define MOZ_JSD + #define MOZ_COMMUNICATOR_CONFIG_JS + #define MOZ_SPELLCHK +#else /* The WHOLE enchilada */ + #define MOZ_MAIL_NEWS + #define EDITOR + #define MOZ_OFFLINE + #define MOZ_LOC_INDEP + #define MOZ_TASKBAR + #define MOZ_LDAP + #define MOZ_ADMIN_LIB + #define MOZ_COMMUNICATOR_NAME + #define MOZ_JSD + #define MOZ_IFC_TOOLS + #define MOZ_NETCAST + #define MOZ_COMMUNICATOR_ABOUT + #define MOZ_COMMUNICATOR_CONFIG_JS + #define MOZ_SPELLCHK +#endif diff --git a/mozilla/config/mac/DefinesMac.h b/mozilla/config/mac/DefinesMac.h new file mode 100644 index 00000000000..97a93c47fda --- /dev/null +++ b/mozilla/config/mac/DefinesMac.h @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +/* + This is a common prefix file, included for both projects like + NSStdLib and Mozilla. +*/ + +/* Some build-wide Mac-related defines */ +#define macintosh /* macintosh is defined for GUSI */ +#define XP_MAC 1 + +/* We have to do this here because ConditionalMacros.h will be included from + * within OpenTptInternet.h and will stupidly define these to 1 if they + * have not been previously defined. The new PowerPlant (CWPro1) requires that + * this be set to 0. (pinkerton) + */ +#define OLDROUTINENAMES 0 +#ifndef OLDROUTINELOCATIONS +#define OLDROUTINELOCATIONS 0 +#endif + +/* OpenTransport.h has changed to not include the error messages we need from + * it unless this is defined. Why? dunnno...(pinkerton) + */ +#define OTUNIXERRORS 1 + +#ifdef DEBUG +#define DEVELOPER_DEBUG 1 +#else +#define NDEBUG +#endif + +/* Some NSPR defines */ +#ifndef NSPR20 +#define NSPR20 1 +#endif +#define _NSPR 1 + +/* Some other random defines */ +#define _NO_FAST_STRING_INLINES_ 1 +#define _PR_NO_PREEMPT 1 +///#define HAVE_BOOLEAN 1 // used by JPEG lib + diff --git a/mozilla/config/mac/DefinesMozilla.h b/mozilla/config/mac/DefinesMozilla.h new file mode 100644 index 00000000000..60a6529ce87 --- /dev/null +++ b/mozilla/config/mac/DefinesMozilla.h @@ -0,0 +1,65 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +// ΡΡΡ Security +//#define NADA_VERSION +//#define EXPORT_VERSION +#define US_VERSION + +// ΡΡΡ Misc +//#define NO_DBM // define this to kill DBM +#define NEW_BOOKMARKS +// Enables us to switch profiling from project preferences + +// ΡΡΡ Version +//#define ALPHA +//#define BETA +// Comment out both ALPHA and BETA for the final version + +// ΡΡΡ Do we have an editor? +// 98-03-10 pchen -- moved into Component_Config.h +// #define EDITOR + +// ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ +// ₯ You typically will not need to change things below here +// ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ + +#define MOCHA +#define MOZILLA_CLIENT +#ifndef NETSCAPE +#define NETSCAPE +#endif + +// #define JAVA 1 + +#ifdef JAVA + #define UNICODE_FONTLIST 1 +#endif + +#define LAYERS + +#define CASTED_READ_OBJECT(stream, type, reference) (reference = NULL) + +/* Defined in javaStubs prefix files +#define VERSION_NUMBER "4_0b0" +#define ZIP_NAME "java"##VERSION_NUMBER +*/ + +// 97/05/05 jrm -- use phil's new search scope api +#define B3_SEARCH_API + diff --git a/mozilla/config/mac/JavaDefines.h b/mozilla/config/mac/JavaDefines.h new file mode 100644 index 00000000000..24848d04629 --- /dev/null +++ b/mozilla/config/mac/JavaDefines.h @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +/* This file is included from the nav-java and sun-java projects */ + +#define MOCHAFILE 1 +#define COMPILER 0 + +#define VERSION_NUMBER "40" +#define JAR_NAME "java"##VERSION_NUMBER##".jar" diff --git a/mozilla/config/mac/MacConfig.h b/mozilla/config/mac/MacConfig.h new file mode 100644 index 00000000000..0d4940a3b56 --- /dev/null +++ b/mozilla/config/mac/MacConfig.h @@ -0,0 +1,21 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +#define MOZ_MEDIUM + +#define NO_SECURITY diff --git a/mozilla/config/mac/MacConfigInclude.h b/mozilla/config/mac/MacConfigInclude.h new file mode 100644 index 00000000000..a95b50bcee2 --- /dev/null +++ b/mozilla/config/mac/MacConfigInclude.h @@ -0,0 +1,42 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +/* + This is included as a prefix file in all Mac projects. It ensures that + the correct #defines are set up for this build. + + Since this is included from C files, comments should be C-style. + + Order below does matter. +*/ + +/* Read compiler options */ +#include "IDE_Options.h" + +/* Read file of defines global to the Mac build */ +#include "DefinesMac.h" + +/* Read the configuration options (which build we are doing) */ +#include "MacConfig.h" + +/* Read component defines */ +#include "ComponentConfig.h" + +/* Read build-wide defines (e.g. MOZILLA_CLIENT) */ +#include "DefinesMozilla.h" + diff --git a/mozilla/config/mac/MacPrefix.h b/mozilla/config/mac/MacPrefix.h new file mode 100644 index 00000000000..dbd4158712d --- /dev/null +++ b/mozilla/config/mac/MacPrefix.h @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +#undef DEBUG +#undef Debug_Throw +#undef Debug_Signal +#undef txtnDebug + +/* Read the common configuration file */ +#include "MacConfigInclude.h" diff --git a/mozilla/config/mac/MacPrefix_debug.h b/mozilla/config/mac/MacPrefix_debug.h new file mode 100644 index 00000000000..3aa77478179 --- /dev/null +++ b/mozilla/config/mac/MacPrefix_debug.h @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +#define DEBUG 1 +#define Debug_Throw +#define Debug_Signal +#define txtnDebug + +/* Read the common configuration file */ +#include "MacConfigInclude.h" diff --git a/mozilla/config/mac/export.mac b/mozilla/config/mac/export.mac new file mode 100644 index 00000000000..0d652bd8295 --- /dev/null +++ b/mozilla/config/mac/export.mac @@ -0,0 +1,16 @@ +# +# This is a list of local files which get copied to the mozilla:dist directory +# + +DefinesMac.h +DefinesMozilla.h + +JavaDefines.h + +MacConfigInclude.h + +MacPrefix.h +MacPrefix_debug.h + +MacConfig.h +ComponentConfig.h