Drop unneeded java build rules & variables since blackwood now builds using ant.
Bug #161617 r=edburns sr=beard
This commit is contained in:
seawood%netscape.com
Родитель
27ed5b201a
Коммит
7830b8a6ef
|
|
@ -934,13 +934,6 @@ if [ ! "$SYSTEM_MNG" ]; then
|
|||
MAKEFILES_libimg="$MAKEFILES_libimg modules/libimg/mng/Makefile"
|
||||
fi
|
||||
|
||||
#
|
||||
# java/
|
||||
#
|
||||
if [ "$MOZ_JAVA_SUPPLEMENT" ]; then
|
||||
MAKEFILES_java_supplement=`cat ${srcdir}/java/makefiles`
|
||||
fi
|
||||
|
||||
#
|
||||
# l10n/
|
||||
#
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
INCLUDED_AUTOCONF_MK = 1
|
||||
USE_AUTOCONF = 1
|
||||
MOZILLA_CLIENT = 1
|
||||
NO_MDUPDATE = 1
|
||||
BUILD_MODULES = @BUILD_MODULES@
|
||||
MOZILLA_VERSION = @MOZILLA_VERSION@
|
||||
|
||||
|
|
|
|||
192
config/config.mk
192
config/config.mk
|
|
@ -43,10 +43,6 @@ include $(topsrcdir)/config/insure.mk
|
|||
endif
|
||||
endif
|
||||
|
||||
ifndef INCLUDED_COMMON_MK
|
||||
include $(topsrcdir)/config/common.mk
|
||||
endif
|
||||
|
||||
BUILD_TOOLS = $(topsrcdir)/build/unix
|
||||
CONFIG_TOOLS = $(DEPTH)/config
|
||||
AUTOCONF_TOOLS = $(topsrcdir)/build/autoconf
|
||||
|
|
@ -433,39 +429,10 @@ endif
|
|||
MY_CONFIG := $(DEPTH)/config/myconfig.mk
|
||||
MY_RULES := $(DEPTH)/config/myrules.mk
|
||||
|
||||
#
|
||||
# Relative pathname from top-of-tree to current source directory
|
||||
#
|
||||
ifneq ($(OS_ARCH),OS2)
|
||||
REVDEPTH = $(CONFIG_TOOLS)/revdepth
|
||||
endif
|
||||
|
||||
#
|
||||
# Provide the means to easily override our tool directory locations.
|
||||
#
|
||||
ifdef NETSCAPE_HIERARCHY
|
||||
CONTRIB_BIN := /tools/contrib/bin/
|
||||
JAVA_BIN := /usr/local/java/bin/
|
||||
LOCAL_BIN := /usr/local/bin/
|
||||
LOCAL_SUN4 := /usr/local/sun4/bin/
|
||||
NS_BIN := /tools/ns/bin/
|
||||
NS_LIB := /tools/ns/lib
|
||||
JAVA_LIB := /usr/local/netscape/java/lib
|
||||
else
|
||||
NS_LIB := .
|
||||
JAVA_LIB := .
|
||||
endif
|
||||
|
||||
# Allow NETSCAPE_COMMERCIAL to include XFEPRIVDIR
|
||||
ifdef NETSCAPE_COMMERCIAL
|
||||
XFEPRIVDIR := $(DEPTH)/../ns/cmd/xfe/
|
||||
endif
|
||||
|
||||
#
|
||||
# Default command macros; can be overridden in <arch>.mk.
|
||||
#
|
||||
CCC = $(CXX)
|
||||
CCF = $(CC) $(CFLAGS)
|
||||
NFSPWD = $(CONFIG_TOOLS)/nfspwd
|
||||
PURIFY = purify $(PURIFYOPTIONS)
|
||||
QUANTIFY = quantify $(QUANTIFYOPTIONS)
|
||||
|
|
@ -477,62 +444,14 @@ XPIDL_COMPILE = $(DIST)/bin/xpidl$(BIN_SUFFIX)
|
|||
XPIDL_LINK = $(DIST)/bin/xpt_link$(BIN_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
PATH_SEPARATOR := \;
|
||||
else
|
||||
PATH_SEPARATOR := :
|
||||
ifeq ($(AWT_11),1)
|
||||
JAVA_PROG = $(NS_BIN)java
|
||||
JAVAC_ZIP = $(NS_LIB)/classes.zip
|
||||
else
|
||||
JAVA_PROG = $(LOCAL_BIN)java
|
||||
ifdef JDKHOME
|
||||
JAVAC_ZIP = $(JAVA_LIB)/classes.zip
|
||||
else
|
||||
JAVAC_ZIP = $(JAVA_LIB)/javac.zip
|
||||
endif
|
||||
endif
|
||||
TAR = tar
|
||||
endif # OS2
|
||||
|
||||
ifeq ($(OS_ARCH),OpenVMS)
|
||||
include $(topsrcdir)/config/$(OS_ARCH).mk
|
||||
endif
|
||||
|
||||
XBCFLAGS =
|
||||
ifdef MOZ_DEBUG
|
||||
JAVA_OPTIMIZER = -g
|
||||
XBCFLAGS = -FR$*
|
||||
endif
|
||||
|
||||
REQ_INCLUDES = $(foreach d,$(REQUIRES),-I$(DIST)/include/$d)
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) -I$(PUBLIC) -I$(DIST)/include $(OS_INCLUDES)
|
||||
|
||||
LIBNT = $(DIST)/lib/libnt.$(LIB_SUFFIX)
|
||||
LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX)
|
||||
LIBMMEDIA = $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
|
||||
|
||||
NSPRDIR = nsprpub
|
||||
LIBNSPR = $(DIST)/lib/libplds3.$(LIB_SUFFIX) $(DIST)/lib/libnspr3.$(LIB_SUFFIX)
|
||||
PURELIBNSPR = $(DIST)/lib/purelibplds3.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr3.$(LIB_SUFFIX)
|
||||
|
||||
ifdef DBMALLOC
|
||||
LIBNSPR += $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
ifneq ($(MOZ_WIDGET_TOOLKIT), os2)
|
||||
LIBNSJAVA = $(DIST)/lib/jrt$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
|
||||
LIBMD = $(DIST)/lib/libjmd.$(LIB_SUFFIX)
|
||||
LIBJAVA = $(DIST)/lib/libjrt.$(LIB_SUFFIX)
|
||||
LIBNSPR = $(DIST)/lib/pr$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
|
||||
LIBXP = $(DIST)/lib/libxp.$(LIB_SUFFIX)
|
||||
endif
|
||||
else
|
||||
LIBNSJAVA = $(DIST)/lib/nsjava32.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
CFLAGS = $(OS_CFLAGS)
|
||||
CXXFLAGS = $(OS_CXXFLAGS)
|
||||
LDFLAGS = $(OS_LDFLAGS)
|
||||
|
|
@ -600,14 +519,6 @@ endif # WINNT
|
|||
COMPILE_CFLAGS = $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS)
|
||||
COMPILE_CXXFLAGS = $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
|
||||
|
||||
#
|
||||
# Some platforms (Solaris) might require builds using either
|
||||
# (or both) compiler(s).
|
||||
#
|
||||
ifdef SHOW_CC_TYPE
|
||||
COMPILER = _$(notdir $(CC))
|
||||
endif
|
||||
|
||||
#
|
||||
# Name of the binary code directories
|
||||
#
|
||||
|
|
@ -712,33 +623,8 @@ endif
|
|||
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
|
||||
DEFINES += -DOSARCH=\"$(OS_ARCH)\"
|
||||
|
||||
#
|
||||
# Platform dependent switching off of JAVA
|
||||
#
|
||||
ifdef MOZ_JAVA
|
||||
DEFINES += -DJAVA
|
||||
ifdef MOZ_OJI
|
||||
error You can't define both MOZ_JAVA and MOZ_OJI anymore.
|
||||
endif
|
||||
JAVA_OR_OJI = 1
|
||||
JAVA_OR_NSJVM = 1
|
||||
endif
|
||||
|
||||
ifdef NSJVM
|
||||
JAVA_OR_NSJVM = 1
|
||||
endif
|
||||
|
||||
ifdef MOZ_OJI
|
||||
DEFINES += -DOJI
|
||||
JAVA_OR_OJI = 1
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM # XXX fix -- su can't depend on java
|
||||
MOZ_SMARTUPDATE = 1
|
||||
endif
|
||||
|
||||
ifdef FORTEZZA
|
||||
DEFINES += -DFORTEZZA
|
||||
endif
|
||||
|
||||
# For profiling
|
||||
|
|
@ -783,81 +669,3 @@ endif # WINNT
|
|||
|
||||
# Use nsinstall in copy mode to install files on the system
|
||||
SYSINSTALL = $(NSINSTALL) -t
|
||||
|
||||
######################################################################
|
||||
### Java Stuff - see common.mk
|
||||
######################################################################
|
||||
|
||||
# where the bytecode will go
|
||||
JAVA_DESTPATH = $(DIST)/classes
|
||||
|
||||
# where the sources for the module you are compiling are
|
||||
# default is sun-java/classsrc, override for other modules
|
||||
ifndef JAVA_SOURCEPATH
|
||||
JAVA_SOURCEPATH = $(DEPTH)/sun-java/classsrc
|
||||
endif
|
||||
|
||||
ifndef JAVAH_IN_JAVA
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
JAVAH_PROG = flipper $(DIST)/bin/javah
|
||||
else
|
||||
JAVAH_PROG = $(DIST)/bin/javah
|
||||
endif
|
||||
else
|
||||
JAVAH_PROG = $(JAVA) netscape.tools.jric.Main
|
||||
endif
|
||||
|
||||
ifneq ($(JDKHOME),)
|
||||
JAVAH_PROG = $(JDKHOME)/bin/javah
|
||||
JAVAC_PROG = $(JDKHOME)/bin/javac $(JAVAC_FLAGS)
|
||||
JAVAC = $(JAVAC_PROG)
|
||||
endif
|
||||
|
||||
ifeq ($(STAND_ALONE_JAVA),1)
|
||||
STAND_ALONE_JAVA_DLL_SUFFIX = s
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),OLD_IBM_BUILD) # These DLL names are no longer valid for OS/2
|
||||
AWTDLL = awt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
|
||||
AWTSDLL = awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
|
||||
CONDLL = con.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
JBNDLL = jbn.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
JDBCDLL = jdb.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
JITDLL = jit.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
JPWDLL = jpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
JRTDLL = jrt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
|
||||
JSJDLL = jsj.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
MMDLL = mm$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
|
||||
NETDLL = net.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
NSCDLL = nsc.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
ZIPDLL = zip.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
ZPWDLL = zpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
|
||||
else
|
||||
AWTDLL = libawt.$(DLL_SUFFIX)
|
||||
AWTSDLL = libawt$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
|
||||
CONDLL = libcon.$(DLL_SUFFIX)
|
||||
JBNDLL = libjbn.$(DLL_SUFFIX)
|
||||
JDBCDLL = libjdb.$(DLL_SUFFIX)
|
||||
JITDLL = libjit.$(DLL_SUFFIX)
|
||||
JPWDLL = libjpw.$(DLL_SUFFIX)
|
||||
JRTDLL = libjrt.$(DLL_SUFFIX)
|
||||
JSJDLL = libjsj.$(DLL_SUFFIX)
|
||||
MMDLL = libmm.$(DLL_SUFFIX)
|
||||
NETDLL = libnet.$(DLL_SUFFIX)
|
||||
NSCDLL = libnsc.$(DLL_SUFFIX)
|
||||
ZIPDLL = libzip.$(DLL_SUFFIX)
|
||||
ZPWDLL = libzpw.$(DLL_SUFFIX)
|
||||
endif
|
||||
|
||||
JAVA_DEFINES += -DAWTSDLL=\"$(AWTSDLL)\" -DCONDLL=\"$(CONDLL)\" -DJBNDLL=\"$(JBNDLL)\" -DJDBDLL=\"$(JDBDLL)\" \
|
||||
-DJSJDLL=\"$(JSJDLL)\" -DNETDLL=\"$(NETDLL)\" -DNSCDLL=\"$(NSCDLL)\" -DZPWDLL=\"$(ZPWDLL)\" \
|
||||
-DJAR_NAME=\"$(JAR_NAME)\"
|
||||
|
||||
ifeq ($(AWT_11),1)
|
||||
JAVA_DEFINES += -DAWT_11
|
||||
else
|
||||
JAVA_DEFINES += -DAWT_102
|
||||
endif
|
||||
|
||||
#caca:
|
||||
# @echo $(PROFILER_CFLAGS)
|
||||
|
|
|
|||
358
config/rules.mk
358
config/rules.mk
|
|
@ -44,24 +44,6 @@
|
|||
# SIMPLE_PROGRAMS -- Compiles Foo.cpp Bar.cpp into Foo, Bar executables.
|
||||
# e)
|
||||
# LIBRARY_NAME -- the target library name to create from $OBJS
|
||||
# f)
|
||||
# JSRCS -- java source files to compile into class files
|
||||
# (if you don't specify this it will default to *.java)
|
||||
# g)
|
||||
# PACKAGE -- the package to put the .class files into
|
||||
# (e.g. netscape/applet)
|
||||
# h)
|
||||
# JMC_EXPORT -- java files to be exported for use by JMC_GEN
|
||||
# (this is a list of Class names)
|
||||
# i)
|
||||
# JRI_GEN -- files to run through javah to generate headers and stubs
|
||||
# (output goes into the _jri sub-dir)
|
||||
# j)
|
||||
# JNI_GEN -- files to run through javah to generate headers and stubs
|
||||
# (output goes into the _jni sub-dir)
|
||||
# k)
|
||||
# JMC_GEN -- files to run through jmc to generate headers and stubs
|
||||
# (output goes into the _jmc sub-dir)
|
||||
#
|
||||
################################################################################
|
||||
ifndef topsrcdir
|
||||
|
|
@ -270,22 +252,6 @@ MDDEPFILES = $(addprefix $(MDDEPDIR)/,$(OBJS:.$(OBJ_SUFFIX)=.pp))
|
|||
endif
|
||||
endif
|
||||
|
||||
ifndef PACKAGE
|
||||
PACKAGE = .
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM
|
||||
ALL_TRASH = \
|
||||
$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
|
||||
$(JDK_HEADER_CFILES) $(JDK_STUB_CFILES) \
|
||||
$(JRI_HEADER_CFILES) $(JRI_STUB_CFILES) $(JMC_STUBS) \
|
||||
$(JMC_HEADERS) $(JMC_EXPORT_FILES) \
|
||||
so_locations _gen _stubs _jmc _jri \
|
||||
$(wildcard gts_tmp_*) \
|
||||
$(wildcard $(JAVA_DESTPATH)/$(PACKAGE)/*.class)
|
||||
ALL_TRASH_DIRS = \
|
||||
$(GARBAGE_DIRS) /no-such-file
|
||||
else
|
||||
ALL_TRASH = \
|
||||
$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
|
||||
$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
|
||||
|
|
@ -298,13 +264,6 @@ ALL_TRASH = \
|
|||
$(wildcard gts_tmp_*) $(LIBRARY:%.a=.%.timestamp)
|
||||
ALL_TRASH_DIRS = \
|
||||
$(GARBAGE_DIRS) /no-such-file
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM
|
||||
ifdef JDIRS
|
||||
GARBAGE += $(addprefix $(JAVA_DESTPATH)/,$(JDIRS))
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef QTDIR
|
||||
GARBAGE += $(MOCSRCS)
|
||||
|
|
@ -328,17 +287,6 @@ GARBAGE_DIRS += SunWS_cache
|
|||
endif
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM
|
||||
JMC_SUBDIR = _jmc
|
||||
else
|
||||
JMC_SUBDIR = $(LOCAL_JMC_SUBDIR)
|
||||
endif
|
||||
|
||||
JDK_GEN_DIR = _gen
|
||||
JMC_GEN_DIR = $(JMC_SUBDIR)
|
||||
JRI_GEN_DIR = _jri
|
||||
JNI_GEN_DIR = _jni
|
||||
JDK_STUB_DIR = _stubs
|
||||
XPIDL_GEN_DIR = _xpidlgen
|
||||
|
||||
ifdef MOZ_UPDATE_XTERM
|
||||
|
|
@ -584,62 +532,6 @@ $(NFSPWD):
|
|||
cd $(@D); $(MAKE) $(@F)
|
||||
endif
|
||||
|
||||
#
|
||||
# JDIRS -- like JSRCS, except you can give a list of directories and it will
|
||||
# compile all the out-of-date java files in those directories.
|
||||
#
|
||||
# NOTE: recursing through these can speed things up, but they also cause
|
||||
# some builds to run out of memory
|
||||
#
|
||||
ifneq ($(JDIRS),)
|
||||
ifeq ($(JAVA_OR_NSJVM),1)
|
||||
export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
|
||||
@for d in $(JDIRS); do \
|
||||
if test -d $$d; then \
|
||||
$(EXIT_ON_ERROR) \
|
||||
files=`echo $$d/*.java`; \
|
||||
list=`$(PERL) $(topsrcdir)/config/outofdate.pl $(PERLARG) \
|
||||
-d $(JAVA_DESTPATH)/$(PACKAGE) $$files`; \
|
||||
if test "$${list}x" != "x"; then \
|
||||
echo Building all java files in $$d; \
|
||||
echo $(JAVAC) $$list; \
|
||||
$(JAVAC) $$list; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
set +e; \
|
||||
else \
|
||||
echo "Skipping non-directory $$d..."; \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
ifneq ($(JDIRS),)
|
||||
ifeq ($(JAVA_OR_NSJVM),1)
|
||||
export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
|
||||
@for d in $(JDIRS); do \
|
||||
if test -d $$d; then \
|
||||
$(EXIT_ON_ERROR) \
|
||||
files=`echo $$d/*.java`; \
|
||||
list=`$(PERL) $(topsrcdir)/config/outofdate.pl $(PERLARG) \
|
||||
-d $(JAVA_DESTPATH)/$(PACKAGE) $$files`; \
|
||||
if test "$${list}x" != "x"; then \
|
||||
echo Building all java files in $$d; \
|
||||
echo $(JAVAC) $$list; \
|
||||
$(JAVAC) $$list; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
set +e; \
|
||||
else \
|
||||
echo "Skipping non-directory $$d..."; \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
endif
|
||||
|
||||
# Target to only regenerate makefiles
|
||||
makefiles: $(SUBMAKEFILES)
|
||||
ifdef DIRS
|
||||
|
|
@ -1220,202 +1112,6 @@ endif
|
|||
# Bunch of things that extend the 'export' rule (in order):
|
||||
###############################################################################
|
||||
|
||||
$(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE) $(JMCSRCDIR)::
|
||||
@if test ! -d $@; then \
|
||||
echo Creating $@; \
|
||||
rm -rf $@; \
|
||||
$(NSINSTALL) -D $@; \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
### JSRCS -- for compiling java files
|
||||
|
||||
ifneq ($(JSRCS),)
|
||||
ifdef JAVA_OR_NSJVM
|
||||
export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
|
||||
list=`$(PERL) $(topsrcdir)/config/outofdate.pl $(PERLARG) \
|
||||
-d $(JAVA_DESTPATH)/$(PACKAGE) $(JSRCS)`; \
|
||||
if test "$$list"x != "x"; then \
|
||||
echo $(JAVAC) $$list; \
|
||||
$(JAVAC) $$list; \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
|
||||
all:: export
|
||||
|
||||
clean clobber::
|
||||
rm -f $(DIST)/classes/$(PACKAGE)/*.class
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# JDK_GEN -- for generating "old style" native methods
|
||||
#
|
||||
# Generate JDK Headers and Stubs into the '_gen' and '_stubs' directory
|
||||
#
|
||||
ifneq ($(JDK_GEN),)
|
||||
ifdef JAVA_OR_NSJVM
|
||||
INCLUDES += -I$(JDK_GEN_DIR)
|
||||
JDK_PACKAGE_CLASSES = $(JDK_GEN)
|
||||
JDK_PATH_CLASSES = $(subst .,/,$(JDK_PACKAGE_CLASSES))
|
||||
JDK_HEADER_CLASSFILES = $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JDK_PATH_CLASSES))
|
||||
JDK_STUB_CLASSFILES = $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JDK_PATH_CLASSES))
|
||||
JDK_HEADER_CFILES = $(patsubst %,$(JDK_GEN_DIR)/%.h,$(JDK_GEN))
|
||||
JDK_STUB_CFILES = $(patsubst %,$(JDK_STUB_DIR)/%.c,$(JDK_GEN))
|
||||
|
||||
$(JDK_HEADER_CFILES): $(JDK_HEADER_CLASSFILES)
|
||||
$(JDK_STUB_CFILES): $(JDK_STUB_CLASSFILES)
|
||||
|
||||
export::
|
||||
@echo Generating/Updating JDK headers
|
||||
$(JAVAH) -d $(JDK_GEN_DIR) $(JDK_PACKAGE_CLASSES)
|
||||
@echo Generating/Updating JDK stubs
|
||||
$(JAVAH) -stubs -d $(JDK_STUB_DIR) $(JDK_PACKAGE_CLASSES)
|
||||
ifdef MOZ_GENMAC
|
||||
@if test ! -d $(DEPTH)/lib/mac/Java/; then \
|
||||
echo "!!! You need to have a ns/lib/mac/Java directory checked out."; \
|
||||
echo "!!! This allows us to automatically update generated files for the mac."; \
|
||||
echo "!!! If you see any modified files there, please check them in."; \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
@echo Generating/Updating JDK headers for the Mac
|
||||
$(JAVAH) -mac -d $(DEPTH)/lib/mac/Java/_gen $(JDK_PACKAGE_CLASSES)
|
||||
@echo Generating/Updating JDK stubs for the Mac
|
||||
$(JAVAH) -mac -stubs -d $(DEPTH)/lib/mac/Java/_stubs $(JDK_PACKAGE_CLASSES)
|
||||
endif
|
||||
endif # JAVA_OR_NSJVM
|
||||
endif
|
||||
|
||||
#
|
||||
# JRI_GEN -- for generating JRI native methods
|
||||
#
|
||||
# Generate JRI Headers and Stubs into the 'jri' directory
|
||||
#
|
||||
ifneq ($(JRI_GEN),)
|
||||
ifdef JAVA_OR_NSJVM
|
||||
INCLUDES += -I$(JRI_GEN_DIR)
|
||||
JRI_PACKAGE_CLASSES = $(JRI_GEN)
|
||||
JRI_PATH_CLASSES = $(subst .,/,$(JRI_PACKAGE_CLASSES))
|
||||
JRI_HEADER_CLASSFILES = $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JRI_PATH_CLASSES))
|
||||
JRI_STUB_CLASSFILES = $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JRI_PATH_CLASSES))
|
||||
JRI_HEADER_CFILES = $(patsubst %,$(JRI_GEN_DIR)/%.h,$(JRI_GEN))
|
||||
JRI_STUB_CFILES = $(patsubst %,$(JRI_GEN_DIR)/%.c,$(JRI_GEN))
|
||||
|
||||
$(JRI_HEADER_CFILES): $(JRI_HEADER_CLASSFILES)
|
||||
$(JRI_STUB_CFILES): $(JRI_STUB_CLASSFILES)
|
||||
|
||||
export::
|
||||
@echo Generating/Updating JRI headers
|
||||
$(JAVAH) -jri -d $(JRI_GEN_DIR) $(JRI_PACKAGE_CLASSES)
|
||||
@echo Generating/Updating JRI stubs
|
||||
$(JAVAH) -jri -stubs -d $(JRI_GEN_DIR) $(JRI_PACKAGE_CLASSES)
|
||||
ifdef MOZ_GENMAC
|
||||
@if test ! -d $(DEPTH)/lib/mac/Java/; then \
|
||||
echo "!!! You need to have a ns/lib/mac/Java directory checked out."; \
|
||||
echo "!!! This allows us to automatically update generated files for the mac."; \
|
||||
echo "!!! If you see any modified files there, please check them in."; \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
@echo Generating/Updating JRI headers for the Mac
|
||||
$(JAVAH) -jri -mac -d $(DEPTH)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES)
|
||||
@echo Generating/Updating JRI stubs for the Mac
|
||||
$(JAVAH) -jri -mac -stubs -d $(DEPTH)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES)
|
||||
endif
|
||||
endif # JAVA_OR_NSJVM
|
||||
endif
|
||||
|
||||
|
||||
|
||||
#
|
||||
# JNI_GEN -- for generating JNI native methods
|
||||
#
|
||||
# Generate JNI Headers and Stubs into the 'jni' directory
|
||||
#
|
||||
ifneq ($(JNI_GEN),)
|
||||
ifdef JAVA_OR_NSJVM
|
||||
INCLUDES += -I$(JNI_GEN_DIR)
|
||||
JNI_PACKAGE_CLASSES = $(JNI_GEN)
|
||||
JNI_PATH_CLASSES = $(subst .,/,$(JNI_PACKAGE_CLASSES))
|
||||
JNI_HEADER_CLASSFILES = $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JNI_PATH_CLASSES))
|
||||
JNI_HEADER_CFILES = $(patsubst %,$(JNI_GEN_DIR)/%.h,$(JNI_GEN))
|
||||
JNI_STUB_CFILES = $(patsubst %,$(JNI_GEN_DIR)/%.c,$(JNI_GEN))
|
||||
|
||||
$(JNI_HEADER_CFILES): $(JNI_HEADER_CLASSFILES)
|
||||
|
||||
export::
|
||||
@echo Generating/Updating JNI headers
|
||||
$(JAVAH) -jni -d $(JNI_GEN_DIR) $(JNI_PACKAGE_CLASSES)
|
||||
ifdef MOZ_GENMAC
|
||||
@if test ! -d $(DEPTH)/lib/mac/Java/; then \
|
||||
echo "!!! You need to have a ns/lib/mac/Java directory checked out."; \
|
||||
echo "!!! This allows us to automatically update generated files for the mac."; \
|
||||
echo "!!! If you see any modified files there, please check them in."; \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
@echo Generating/Updating JNI headers for the Mac
|
||||
$(JAVAH) -jni -mac -d $(DEPTH)/lib/mac/Java/_jni $(JNI_PACKAGE_CLASSES)
|
||||
endif
|
||||
endif # JAVA_OR_NSJVM
|
||||
endif # JNI_GEN
|
||||
|
||||
|
||||
|
||||
#
|
||||
# JMC_EXPORT -- for declaring which java classes are to be exported for jmc
|
||||
#
|
||||
ifneq ($(JMC_EXPORT),)
|
||||
ifdef JAVA_OR_NSJVM
|
||||
JMC_EXPORT_PATHS = $(subst .,/,$(JMC_EXPORT))
|
||||
JMC_EXPORT_FILES = $(patsubst %,$(JAVA_DESTPATH)/$(PACKAGE)/%.class,$(JMC_EXPORT_PATHS))
|
||||
|
||||
#
|
||||
# We're doing NSINSTALL -t here (copy mode) because calling INSTALL will pick up
|
||||
# your NSDISTMODE and make links relative to the current directory. This is a
|
||||
# problem because the source isn't in the current directory:
|
||||
#
|
||||
export:: $(JMC_EXPORT_FILES) $(JMCSRCDIR)
|
||||
ifndef NO_DIST_INSTALL
|
||||
$(SYSINSTALL) $(IFLAGS1) $(JMC_EXPORT_FILES) $(JMCSRCDIR)
|
||||
endif
|
||||
endif # JAVA_OR_NSJVM
|
||||
endif
|
||||
|
||||
#
|
||||
# JMC_GEN -- for generating java modules
|
||||
#
|
||||
# Provide default export & libs rules when using JMC_GEN
|
||||
#
|
||||
ifneq ($(JMC_GEN),)
|
||||
INCLUDES += -I$(JMC_GEN_DIR) -I.
|
||||
ifdef JAVA_OR_NSJVM
|
||||
JMC_HEADERS = $(patsubst %,$(JMC_GEN_DIR)/%.h,$(JMC_GEN))
|
||||
JMC_STUBS = $(patsubst %,$(JMC_GEN_DIR)/%.c,$(JMC_GEN))
|
||||
JMC_OBJS = $(patsubst %,%.$(OBJ_SUFFIX),$(JMC_GEN))
|
||||
|
||||
$(JMC_GEN_DIR)/M%.h: $(JMCSRCDIR)/%.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -interface $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
|
||||
$(JMC_GEN_DIR)/M%.c: $(JMCSRCDIR)/%.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
|
||||
M%.$(OBJ_SUFFIX): $(JMC_GEN_DIR)/M%.h $(JMC_GEN_DIR)/M%.c
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) $(JMC_GEN_DIR)/M$*.c
|
||||
else
|
||||
$(CC) -o $@ -c $(CFLAGS) $(JMC_GEN_DIR)/M$*.c
|
||||
endif
|
||||
|
||||
export:: $(JMC_HEADERS) $(JMC_STUBS)
|
||||
endif # JAVA_OR_NSJVM
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
# Copy each element of EXPORTS to $(PUBLIC)
|
||||
|
||||
|
|
@ -1702,44 +1398,6 @@ endif
|
|||
REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
|
||||
REGCHROME_INSTALL = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
|
||||
|
||||
##############################################################################
|
||||
|
||||
ifndef NO_MDUPDATE
|
||||
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
-include $(DEPENDENCIES)
|
||||
# Can't use sed because of its 4000-char line length limit, so resort to perl
|
||||
.DEFAULT:
|
||||
@$(PERL) -e ' \
|
||||
open(MD, "< $(DEPENDENCIES)"); \
|
||||
while (<MD>) { \
|
||||
if (m@ \.*/*$< @) { \
|
||||
$$found = 1; \
|
||||
last; \
|
||||
} \
|
||||
} \
|
||||
if ($$found) { \
|
||||
print "Removing stale dependency $< from $(DEPENDENCIES)\n"; \
|
||||
seek(MD, 0, 0); \
|
||||
$$tmpname = "fix.md" . $$$$; \
|
||||
open(TMD, "> " . $$tmpname); \
|
||||
while (<MD>) { \
|
||||
s@ \.*/*$< @ @; \
|
||||
if (!print TMD "$$_") { \
|
||||
unlink(($$tmpname)); \
|
||||
exit(1); \
|
||||
} \
|
||||
} \
|
||||
close(TMD); \
|
||||
if (!rename($$tmpname, "$(DEPENDENCIES)")) { \
|
||||
unlink(($$tmpname)); \
|
||||
} \
|
||||
} elsif ("$<" ne "$(DEPENDENCIES)") { \
|
||||
print "$(MAKE): *** No rule to make target $<. Stop.\n"; \
|
||||
exit(1); \
|
||||
}'
|
||||
endif
|
||||
endif
|
||||
|
||||
#############################################################################
|
||||
# Dependency system
|
||||
#############################################################################
|
||||
|
|
@ -1869,11 +1527,6 @@ endif
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .out .a .ln .o .ho .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .pp .mk .in .$(OBJ_SUFFIX) .mm .idl $(BIN_SUFFIX)
|
||||
|
||||
#
|
||||
# Don't delete these files if we get killed.
|
||||
#
|
||||
.PRECIOUS: .java $(JDK_HEADERS) $(JDK_STUBS) $(JRI_HEADERS) $(JRI_STUBS) $(JMC_HEADERS) $(JMC_STUBS)
|
||||
|
||||
#
|
||||
# Fake targets. Always run these rules, even if a file/directory with that
|
||||
# name already exists.
|
||||
|
|
@ -1901,17 +1554,6 @@ TAGS: $(SUBMAKEFILES) $(CSRCS) $(CPPSRCS) $(wildcard *.h)
|
|||
-etags $(CSRCS) $(CPPSRCS) $(wildcard *.h)
|
||||
+$(LOOP_OVER_DIRS)
|
||||
|
||||
envirocheck::
|
||||
@echo -----------------------------------
|
||||
@echo "Enviro-Check (tm)"
|
||||
@echo -----------------------------------
|
||||
@echo "MOZILLA_CLIENT = $(MOZILLA_CLIENT)"
|
||||
@echo "NO_MDUPDATE = $(NO_MDUPDATE)"
|
||||
@echo "BUILD_OPT = $(BUILD_OPT)"
|
||||
@echo "MOZ_LITE = $(MOZ_LITE)"
|
||||
@echo "MOZ_MEDIUM = $(MOZ_MEDIUM)"
|
||||
@echo -----------------------------------
|
||||
|
||||
echo-dirs:
|
||||
@echo $(DIRS)
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ ifeq ($(OS_ARCH),WINNT)
|
|||
LIBRARY_NAME = jsj$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
MAPFILE = $(LIBRARY_NAME).map
|
||||
endif
|
||||
JNI_GEN_DIR = _jni
|
||||
|
||||
REQUIRES = js \
|
||||
xpcom \
|
||||
xpconnect \
|
||||
|
|
@ -71,55 +73,26 @@ CSRCS = \
|
|||
jsj_utils.c \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
$(srcdir)/jsjava.h \
|
||||
$(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSObject.h \
|
||||
$(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSException.h \
|
||||
$(NULL)
|
||||
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef NSJVM
|
||||
DIRS = classes
|
||||
JNI_GEN = netscape.javascript.JSObject netscape.javascript.JSException
|
||||
endif
|
||||
|
||||
ifdef MOZ_OJI
|
||||
|
||||
CPPSRCS = \
|
||||
nsCLiveconnect.cpp \
|
||||
nsCLiveconnectFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS += \
|
||||
EXPORTS = \
|
||||
$(srcdir)/jsjava.h \
|
||||
$(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSObject.h \
|
||||
$(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSException.h \
|
||||
$(srcdir)/nsILiveconnect.h \
|
||||
$(srcdir)/nsISecureLiveconnect.h \
|
||||
$(srcdir)/nsISecurityContext.h \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(LIBS_DIR) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
#
|
||||
# Generate jsj_nodl.c (so that you can check it in)
|
||||
# These make rules only works on IRIX...sigh
|
||||
#
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
jsj_nodl.c: stubs.o Makefile $(DEPTH)/config/nodl.pl
|
||||
rm -f $@
|
||||
$(PERL) $(DEPTH)/config/nodl.pl "jsj_nodl_tab" \
|
||||
`nm -Bn stubs.o | egrep Java_.*_stub | awk '{print $$3;}'` > $@
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_OJI
|
||||
stubs.o: $(JNI_GEN_DIR)/netscape_javascript_JSObject.c $(JNI_GEN_DIR)/netscape_javascript_JSException.c
|
||||
else
|
||||
stubs.o:
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -26,68 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifndef MOZ_JAVA
|
||||
DIRS = stubs
|
||||
else
|
||||
DIRS = \
|
||||
md-include \
|
||||
include \
|
||||
javah \
|
||||
$(AWT11DIRS) \
|
||||
classsrc \
|
||||
$(JTOOLS) \
|
||||
md \
|
||||
runtime \
|
||||
awt \
|
||||
mmedia \
|
||||
jpegwrap \
|
||||
zipwrap \
|
||||
bn \
|
||||
jdbc \
|
||||
$(NETSCAPEDIR) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(STAND_ALONE_JAVA),1)
|
||||
NETSCAPEDIR = netscape/console
|
||||
else
|
||||
JTOOLS = jtools
|
||||
NETSCAPEDIR = netscape
|
||||
endif
|
||||
|
||||
ifeq ($(AWT_11),1)
|
||||
AWT11DIRS = classsrc11
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
OTHER_DIRS = javac javadoc doc javap
|
||||
|
||||
LOOP_OVER_OTHER_DIRS = \
|
||||
@for d in $(OTHER_DIRS); do \
|
||||
if test -d $$d; then \
|
||||
set -e; \
|
||||
echo "cd $$d; $(MAKE) $@"; \
|
||||
cd $$d; $(MAKE) $@; cd ..; \
|
||||
set +e; \
|
||||
else \
|
||||
echo "Skipping non-directory $$d..."; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
.PHONY: $(OTHER_DIRS)
|
||||
|
||||
$(OTHER_DIRS)::
|
||||
@if test -d $@; then \
|
||||
set -e; \
|
||||
echo "cd $@; $(MAKE)"; \
|
||||
cd $@; $(MAKE); \
|
||||
set +e; \
|
||||
else \
|
||||
echo "Skipping non-directory $@..."; \
|
||||
fi
|
||||
|
||||
other_dirs::
|
||||
+$(LOOP_OVER_OTHER_DIRS)
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче