Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug=73085

Browse Source 
author=ashuk
r=edburns

Files modified
mozilla/java/build/install_webclient_unix.js
mozilla/java/build/install_webclient_win32.js
mozilla/java/build/Makefile.in
mozilla/java/build/Makefile.win
mozilla/java/Makefile.win
mozilla/java/webclient/src_moz/Makefile.in
mozilla/java/webclient/src_moz/Makefile.win

Files added
mozilla/java/build/README.BLACKCONNECT
mozilla/java/build/README.BLACKWOOD
mozilla/java/build/README.DOM
mozilla/java/build/README.PLUGLET
mozilla/java/build/README.WEBCLIENT

this fix allows XPIs to be generated for all the Blackwood
components individually or together on Win32, Solaris and
linux.


git-svn-id: svn://10.0.0.236/trunk@96125 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ashuk%eng.sun.com
2001-05-31 18:56:27 +00:00
parent 010607cb22
commit 2ff5c882a8
12 changed files with 1022 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/java/webclient/src_moz/Makefile.in
View File

@@ -99,14 +99,11 @@ ifdef MOZ_ENABLE_GTK
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
# Adding $(JDKHOME)/jre/lib/sparc because we need to link against
# the libjawt.so shared library for the JAWT Native Interface
# functionality to work correctly.
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(JDKHOME)/jre/lib/sparc -L$(JDKHOME)/jre/lib/i386 -ljawt -L/usr/X11R6/lib -lXt
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(JDKHOME)/jre/lib/sparc -L$(JDKHOME)/jre/lib/i386 -ljawt -L/usr/X11R6/lib -lXt
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt
endif
endif
@@ -125,10 +122,10 @@ endif
ifeq ($(OS_ARCH),Linux)
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share -I../src_moz
-I$(DEPTH)/widget/src/gtk -I../src_share
else
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share -I../src_moz
-I$(DEPTH)/widget/src/gtk -I../src_share
endif

6
mozilla/java/webclient/src_moz/Makefile.win
View File

@@ -26,7 +26,6 @@ MAKE_OBJ_TYPE = DLL
MODULE=webclient
DIRS = win32
OBJS = \
.\$(OBJDIR)\ns_util.obj \
@@ -56,7 +55,6 @@ OBJS = \
.\$(OBJDIR)\PreferencesImpl.obj \
.\$(OBJDIR)\PreferencesActionEvents.obj \
.\$(OBJDIR)\ISupportsPeer.obj \
.\win32\$(OBJDIR)\Win32BrowserControlCanvas.obj \
$(NULL)
@@ -87,7 +85,6 @@ LLIBS = \
$(DIST)\lib\nspr4.lib \
$(DIST)\lib\plc4.lib \
$(DIST)\lib\plds4.lib \
$(JDKHOME)\jre\lib\jawt.lib \
$(NULL)
WIN_LIBS= \
@@ -114,7 +111,6 @@ include <$(DEPTH)\config\rules.mak>
INCS = \
-I..\bal\ \
-I..\bal\win32 \
-Iwin32 \
$(INCS) \
$(NULL)
!else
@@ -140,10 +136,12 @@ buildRunems:
copy $(DIST)\bin\windbgdlg.exe $(JDKHOME)\bin
!ifdef BAL_INTERFACE
!else
!ifndef PACKAGE_BUILD
@echo +++ Creating runem.bat. Use this to run the test browser.
rm -f runem.bat
@echo $(PERL) ..\src_share\runem.pl org.mozilla.webclient.test.EmbeddedMozillaImpl $(DEPTH) %1% >> runem.bat
!endif
!endif
install:: $(DLL) buildRunems