Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make it so the jni headers are built in src_share.

Browse Source
This commit is contained in:
edburns%acm.org 2000-08-10 01:02:57 +00:00
parent 9132d3b807
commit 1fd2c69e7f
5 changed files with 106 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
java/webclient/src_moz/Makefile.in
View File

@ -71,49 +71,13 @@ EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/bin/components -lwidget_gtk -lwc_share
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
JAVAH_CLS= \
"-o BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl" \
"-o CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl" \
"-o HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl" \
"-o WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl" \
"-o NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl" \
"-o RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration" \
"-o RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode" \
"-o ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer" \
"-o WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl" \
"-o NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread" \
$(NULL)
JAVAH_FILES=\
BookmarksImpl.h \
CurrentPageImpl.h \
HistoryImpl.h \
WrapperFactoryImpl.h \
NavigationImpl.h \
RDFEnumeration.h \
RDFTreeNode.h \
ISupportsPeer.h \
WindowControlImpl.h \
NativeEventThread.h \
$(NULL)
JAVAH_PROG=$(JDKHOME)/bin/javah
JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
export:: $(JAVAH_FILES) linkSetupRegistry
export:: linkSetupRegistry
linkSetupRegistry:
rm -f nsSetupRegistry.cpp
ln -s $(DEPTH)/xpfe/bootstrap/nsSetupRegistry.cpp .
$(JAVAH_FILES):
@for c in $(JAVAH_CLS); do \
echo $(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
$(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
done
clobber_all::
rm -f $(JAVAH_FILES)
rm -f nsSetupRegistry.cpp
buildRunems:
@ -121,7 +85,7 @@ ifeq ($(BAL_INTERFACE),)
@echo +++ Creating runem. Use this to run the test browser.
rm -f runem
@echo #!/bin/sh > runem
@echo $(PERL) runem.pl $(DIST)/bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
@echo $(PERL) ../src_share/runem.pl $(DIST)/bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
chmod 755 runem
endif

60
java/webclient/src_moz/Makefile.win
View File

@ -84,12 +84,6 @@ WIN_LIBS = \
include <$(DEPTH)\config\rules.mak>
include <$(DEPTH)\java\config\localdefs.mak>
!ifdef CLASSPATH
JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH)
!endif
!ifdef BAL_INTERFACE
INCS = \
-I..\bal\ \
@ -112,47 +106,7 @@ INCS = \
!CMDSWITCHES -S
# generate the jni header
export:: BookmarksImpl.h CurrentPageImpl.h HistoryImpl.h WrapperFactoryImpl.h WindowControlImpl.h NavigationImpl.h NativeEventThread.h RDFEnumeration.h RDFTreeNode.h ISupportsPeer.h nsSetupRegistry.cpp
BookmarksImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.BookmarksImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.BookmarksImpl
CurrentPageImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.CurrentPageImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.CurrentPageImpl
HistoryImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.HistoryImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.HistoryImpl
WrapperFactoryImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.WrapperFactoryImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.WrapperFactoryImpl
NavigationImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.NavigationImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.NavigationImpl
RDFEnumeration.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.RDFEnumeration is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.RDFEnumeration
RDFTreeNode.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.RDFTreeNode is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.RDFTreeNode
ISupportsPeer.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.ISupportsPeer is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.ISupportsPeer
WindowControlImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.WindowControlImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.WindowControlImpl
NativeEventThread.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.NativeEventThread is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.NativeEventThread
export:: nsSetupRegistry.cpp
nsSetupRegistry.cpp:
copy $(MOZ_SRC)\mozilla\xpfe\bootstrap\nsSetupRegistry.cpp
@ -162,7 +116,7 @@ buildRunems:
!else
@echo +++ Creating runem.bat. Use this to run the test browser.
rm -f runem.bat
@echo $(PERL) runem.pl $(DIST)\bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
@echo $(PERL) ..\src_share\runem.pl $(DIST)\bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
!endif
install:: $(DLL) buildRunems
@ -173,16 +127,6 @@ clobber_all:: clobber
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
rm -f BookmarksImpl.h
rm -f CurrentPageImpl.h
rm -f HistoryImpl.h
rm -f WrapperFactoryImpl.h
rm -f NavigationImpl.h
rm -f WindowControlImpl.h
rm -f NativeEventThread.h
rm -f RDFEnumeration.h
rm -f RDFTreeNode.h
rm -f ISupportsPeer.h
rm -f nsSetupRegistry.cpp
rm -f runem.bat

40
java/webclient/src_share/Makefile.in
View File

@ -44,3 +44,43 @@ override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES)
JAVAH_CLS= \
"-o BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl" \
"-o CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl" \
"-o HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl" \
"-o WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl" \
"-o NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl" \
"-o RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration" \
"-o RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode" \
"-o ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer" \
"-o WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl" \
"-o NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread" \
$(NULL)
JAVAH_FILES=\
BookmarksImpl.h \
CurrentPageImpl.h \
HistoryImpl.h \
WrapperFactoryImpl.h \
NavigationImpl.h \
RDFEnumeration.h \
RDFTreeNode.h \
ISupportsPeer.h \
WindowControlImpl.h \
NativeEventThread.h \
$(NULL)
JAVAH_PROG=$(JDKHOME)/bin/javah
JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
export:: $(JAVAH_FILES)
$(JAVAH_FILES):
@for c in $(JAVAH_CLS); do \
echo $(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
$(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
done
clobber_all::
rm -f $(JAVAH_FILES)

62
java/webclient/src_share/Makefile.win
View File

@ -73,12 +73,74 @@ INCS = \
$(NULL)
!endif
include <$(DEPTH)\java\config\localdefs.mak>
!ifdef CLASSPATH
JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH)
!endif
!CMDSWITCHES -S
# generate the jni header
export:: BookmarksImpl.h CurrentPageImpl.h HistoryImpl.h WrapperFactoryImpl.h WindowControlImpl.h NavigationImpl.h NativeEventThread.h RDFEnumeration.h RDFTreeNode.h ISupportsPeer.h
BookmarksImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.BookmarksImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.BookmarksImpl
CurrentPageImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.CurrentPageImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.CurrentPageImpl
HistoryImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.HistoryImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.HistoryImpl
WrapperFactoryImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.WrapperFactoryImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.WrapperFactoryImpl
NavigationImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.NavigationImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.NavigationImpl
RDFEnumeration.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.RDFEnumeration is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.RDFEnumeration
RDFTreeNode.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.RDFTreeNode is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.RDFTreeNode
ISupportsPeer.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.ISupportsPeer is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.ISupportsPeer
WindowControlImpl.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.WindowControlImpl is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.WindowControlImpl
NativeEventThread.h:
@echo Assuming class org.mozilla.webclient.wrapper_native.NativeEventThread is in $(JAVAH_FLAGS)
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.NativeEventThread
install:: $(LIBRARY)
$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
clobber_all:: clobber
rm -f BookmarksImpl.h
rm -f CurrentPageImpl.h
rm -f HistoryImpl.h
rm -f WrapperFactoryImpl.h
rm -f NavigationImpl.h
rm -f WindowControlImpl.h
rm -f NativeEventThread.h
rm -f RDFEnumeration.h
rm -f RDFTreeNode.h
rm -f ISupportsPeer.h
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

0
java/webclient/src_moz/runem.pl → java/webclient/src_share/runem.pl
View File