зеркало из https://github.com/mozilla/pjs.git
Bug 549291 - Remove leftovers from MOZ_STATIC_COMPONENTS; r=ted
This commit is contained in:
Ed Morley
Родитель
dd7c106ff4
Коммит
21e7c66428
|
|
@ -1,104 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
# This makefile links all the static components which have EXPORT_LIBRARY
|
||||
# set into a single component DLL.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = appmeta
|
||||
IS_COMPONENT = 1
|
||||
FORCE_SHARED_LIB = 1
|
||||
|
||||
CPPSRCS = nsMetaModule.cpp
|
||||
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
FINAL_COMPONENT_LIBS := $(shell cat $(FINAL_LINK_COMPS))
|
||||
FINAL_LINK_LIBS := $(shell cat $(FINAL_LINK_LIBS))
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(foreach c,$(FINAL_COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(c).$(LIB_SUFFIX)) \
|
||||
$(foreach l,$(FINAL_LINK_LIBS),$(DIST)/lib/$(LIB_PREFIX)$(l).$(LIB_SUFFIX)) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
OS_LIBS += -framework QuickTime
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool imm32)
|
||||
# XXX temporary workaround until link ordering issue is solved
|
||||
ifdef GNU_CC
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,winmm wsock32 gdi32)
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, usp10)
|
||||
endif
|
||||
|
||||
ifneq (,$(MOZ_ENABLE_GTK2))
|
||||
OS_LIBS += $(XLDFLAGS) $(XT_LIBS)
|
||||
endif
|
||||
|
||||
OS_LIBS += $(TK_LIBS)
|
||||
|
||||
GARBAGE += module_list.h
|
||||
|
||||
LOCAL_INCLUDES += -I.
|
||||
|
||||
FINAL_COMPONENT_NAMES := $(shell cat $(FINAL_LINK_COMP_NAMES))
|
||||
|
||||
nsMetaModule.$(OBJ_SUFFIX): module_list.h
|
||||
|
||||
module_list.h: $(GLOBAL_DEPS)
|
||||
echo '#define MODULES \' > $@
|
||||
awk '{ print "MODULE(" $$1 ") \\" }' < $(FINAL_LINK_COMP_NAMES) >> $@
|
||||
echo >> $@
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Christopher Seawood <cls@seawood.org>
|
||||
* Doug Turner <dougt@netscape.com>
|
||||
* Chris Waterson <waterson@netscape.com>
|
||||
* Benjamin Smedberg <benjamin@smedbergs.us>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsXPCOM.h"
|
||||
#include "nsIModule.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsCOMArray.h"
|
||||
#include "nsMemory.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
#include "module_list.h"
|
||||
|
||||
#define NSGETMODULE(_name) _name##_NSGetModule
|
||||
|
||||
#define MODULE(_name) \
|
||||
NSGETMODULE_ENTRY_POINT(_name) (nsIComponentManager*, nsIFile*, nsIModule**);
|
||||
|
||||
MODULES
|
||||
|
||||
#undef MODULE
|
||||
|
||||
#define MODULE(_name) NSGETMODULE(_name),
|
||||
|
||||
static const nsGetModuleProc kGetModules[] = {
|
||||
MODULES
|
||||
};
|
||||
|
||||
#undef MODULE
|
||||
|
||||
class MetaModule : public nsIModule
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIMODULE
|
||||
|
||||
MetaModule() { }
|
||||
nsresult Init(nsIComponentManager*, nsIFile*);
|
||||
|
||||
private:
|
||||
~MetaModule() { }
|
||||
|
||||
nsCOMArray<nsIModule> mModules;
|
||||
};
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(MetaModule, nsIModule)
|
||||
|
||||
nsresult
|
||||
MetaModule::Init(nsIComponentManager* aCompMgr, nsIFile* aLocation)
|
||||
{
|
||||
if (!mModules.SetCapacity(NS_ARRAY_LENGTH(kGetModules)))
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
// eat all errors
|
||||
nsGetModuleProc const *end = kGetModules + NS_ARRAY_LENGTH(kGetModules);
|
||||
|
||||
nsCOMPtr<nsIModule> module;
|
||||
for (nsGetModuleProc const *cur = kGetModules; cur < end; ++cur) {
|
||||
nsresult rv = (*cur)(aCompMgr, aLocation, getter_AddRefs(module));
|
||||
if (NS_SUCCEEDED(rv))
|
||||
mModules.AppendObject(module);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MetaModule::GetClassObject(nsIComponentManager* aCompMgr, REFNSCID aCID,
|
||||
REFNSIID aIID, void **aResult)
|
||||
{
|
||||
for (PRInt32 i = mModules.Count() - 1; i >= 0; --i) {
|
||||
nsresult rv = mModules[i]->GetClassObject(aCompMgr, aCID,
|
||||
aIID, aResult);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
return rv;
|
||||
}
|
||||
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MetaModule::RegisterSelf(nsIComponentManager* aCompMgr, nsIFile* aLocation,
|
||||
const char *aStr, const char *aType)
|
||||
{
|
||||
for (PRInt32 i = mModules.Count() - 1; i >= 0; --i) {
|
||||
mModules[i]->RegisterSelf(aCompMgr, aLocation, aStr, aType);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MetaModule::UnregisterSelf(nsIComponentManager* aCompMgr, nsIFile* aLocation,
|
||||
const char *aStr)
|
||||
{
|
||||
for (PRInt32 i = mModules.Count() - 1; i >= 0; --i) {
|
||||
mModules[i]->UnregisterSelf(aCompMgr, aLocation, aStr);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MetaModule::CanUnload(nsIComponentManager* aCompMgr, PRBool *aResult)
|
||||
{
|
||||
for (PRInt32 i = mModules.Count() - 1; i >= 0; --i) {
|
||||
nsresult rv = mModules[i]->CanUnload(aCompMgr, aResult);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
// Any submodule may veto unloading
|
||||
if (!*aResult)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
extern "C" NS_EXPORT nsresult
|
||||
NSGetModule(nsIComponentManager *servMgr,
|
||||
nsIFile *location,
|
||||
nsIModule **result)
|
||||
{
|
||||
nsRefPtr<MetaModule> mmodule = new MetaModule();
|
||||
nsresult rv = mmodule->Init(servMgr, location);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
NS_ADDREF(*result = mmodule);
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1125,12 +1125,6 @@ if [ "$MOZ_XTF" ]; then
|
|||
"
|
||||
fi
|
||||
|
||||
if [ "$MOZ_STATIC_COMPONENTS" ]; then
|
||||
add_makefiles "
|
||||
modules/staticmod/Makefile
|
||||
"
|
||||
fi
|
||||
|
||||
if [ "$MOZ_MEDIA" ]; then
|
||||
add_makefiles "
|
||||
content/media/Makefile
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче