mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-11 16:32:59 +00:00
a0319d2d7b
make a final pass to make sure we are not leaking memory. After that, I want to clean up the build system, and the samples. M build.xml - Call make export in mozilla directory - Fix clean target M mozilla/Makefile.in - Added export target M classes/org/mozilla/pluglet/PlugletLoader.java - avoid ambiguity by casting + CodeSource codesource = new CodeSource(url,(java.security.cert.Certificate []) null); M examples/MediaPlayer/JMPlayer.java - remove debug printfs M mozilla/npAPInsIInputStreamShim.cpp M mozilla/npAPInsIInputStreamShim.h - remove debug printfs - fix buffer allocation, refactor into its own method. - Use NPN_Mem* methods for memory allocation. - isolate lock access to private methods. Avoids locking when we already own the lock, which would cause an assertion. M mozilla/nppluglet.cpp - in dtor, check for null mScriptablePeer ivar before accessing it. M mozilla/nsScriptablePeer.cpp - whitespace M src/Pluglet.cpp - get the plugletEngine from do_GetService(). M src/PlugletEngine.cpp M src/PlugletFactory.cpp M src/PlugletLoader.cpp - remove debug printfs M test/test.java - added test finalize. build.xml classes/org/mozilla/pluglet/PlugletLoader.java examples/MediaPlayer/JMPlayer.java mozilla/Makefile.in mozilla/npAPInsIInputStreamShim.cpp mozilla/npAPInsIInputStreamShim.h mozilla/nppluglet.cpp mozilla/nsScriptablePeer.cpp src/Pluglet.cpp src/PlugletEngine.cpp src/PlugletFactory.cpp src/PlugletLoader.cpp test/test.java
97 lines
3.0 KiB
Makefile
97 lines
3.0 KiB
Makefile
#
|
|
# ***** 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 *****
|
|
|
|
DEPTH = ../../..
|
|
topsrcdir = @top_srcdir@
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
PLUGIN_SDK=$(DEPTH)/modules/plugin/tools/sdk
|
|
|
|
XPIDL_MODULE = nppluglet
|
|
LIBRARY_NAME = nppluglet
|
|
REQUIRES = xpcom \
|
|
plugin \
|
|
java \
|
|
$(NULL)
|
|
|
|
NO_DIST_INSTALL = 1
|
|
|
|
CPPSRCS = nsScriptablePeer.cpp \
|
|
nppluglet.cpp \
|
|
npAPInsIInputStreamShim.cpp \
|
|
$(NULL)
|
|
|
|
XPIDLSRCS = nsISimplePlugin.idl
|
|
|
|
SHARED_LIBRARY_LIBS = $(PLUGIN_SDK)/samples/common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX) ../src/$(LIB_PREFIX)pluglet.$(LIB_SUFFIX) $(XPCOM_LIBS) $(NSPR_LIBS)
|
|
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
DEFFILE = $(win_srcdir)/nppluglet.def
|
|
RESFILE = nppluglet.res
|
|
endif
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
MS_SDK_HOME=/cygdrive/d/Files_2k/MICROS~1
|
|
INCLUDES += \
|
|
-I$(MS_SDK_HOME)/VC98/Include \
|
|
-I$(MS_SDK_HOME)/VC98/ATL/SRC \
|
|
-I../src \
|
|
-I../src/_xpidlgen \
|
|
-I$(MOZILLA_FIVE_HOME)/../include/string \
|
|
-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
|
|
$(NULL)
|
|
CXXFLAGS += /Zi /Yd
|
|
endif
|
|
|
|
DEFINES += -DMOZILLA_STRICT_API
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt
|
|
endif
|
|
|
|
LOCAL_INCLUDES = -I./$(XPIDL_GEN_DIR) \
|
|
-I$(PLUGIN_SDK)/samples/include \
|
|
-I$(PLUGIN_SDK)/../../base/src \
|
|
$(NULL)
|
|
install::
|
|
$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/bin/plugins
|