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

The following files are in this checkin.

Browse Source 
ar=edburns
author=edburns, ashuk


M Makefile.in
M Makefile.win
M webclient/classes_spec/Makefile.in
M webclient/classes_spec/Makefile.win
M webclient/src_moz/Makefile.win
A build/Makefile.in
A build/Makefile.win
A build/install_blackconnect_unix.js
A build/install_blackconnect_win32.js
A build/install_blackwood_unix.js
A build/install_blackwood_win32.js
A build/install_dom_unix.js
A build/install_dom_win32.js
A build/install_pluglets_unix.js
A build/install_pluglets_win32.js
A build/install_webclient_unix.js
A build/install_webclient_win32.js
A build/symlink.sh


git-svn-id: svn://10.0.0.236/trunk@93491 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2001-04-30 23:50:52 +00:00
parent 99820358ca
commit d5530a372a
18 changed files with 1320 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mozilla/java/webclient/classes_spec/Makefile.in
View File

@@ -55,66 +55,15 @@ JAVA_OR_NSJVM = 1
include $(topsrcdir)/config/rules.mk
ifneq ($(PACKAGE_BUILD),)
ifneq ($(VERSION_NUMBER),)
VERSION_NUMBER=0.9
endif # VERSION_NUMBER
BLACKWOOD_JAR_NAME=blackwood$(VERSION_NUMBER).jar
PACKAGE_DIR=$(topsrcdir)/dist/javadev
PACKAGE_LIB=$(PACKAGE_DIR)/lib
endif # PACKAGE_BUILD
ifneq ($(WEBCLIENT_PACKAGE_BUILD),)
PACKAGE_VER = 1_0
PACKAGE_DIR = $(DIST)/javadev
PACKAGE_LIB = $(PACKAGE_DIR)/lib
PACKAGE_EXAMPLE = $(PACKAGE_DIR)/example
endif # WEBCLIENT_PACKAGE_BUILD
JAVA_SOURCEPATH=$(topsrcdir)/java/webclient/classes_spec
JAVAC_FLAGS=-classpath $(CLASSPATH):$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
rm_java:
ifeq ($(PACKAGE_BUILD),)
rm -Rf $(topsrcdir)/dist/classes/org/mozilla/webclient
else
rm -Rf $(topsrcdir)/dist/javadev
endif # PACKAGE_BUILD
ifneq ($(WEBCLIENT_PACKAGE_BUILD),)
rm -Rf $(topsrcdir)/dist/javadev
endif
clobber_all::rm_java
install:: jarEmUp
jarEmUp:
ifneq ($(WEBCLIENT_PACKAGE_BUILD),)
if test ! -d $(PACKAGE_DIR) ; then mkdir $(PACKAGE_DIR) ; else true ; fi ;
if test ! -d $(PACKAGE_LIB) ; then mkdir $(PACKAGE_LIB) ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/webclient_$(PACKAGE_VER).jar ; then rm -f $(PACKAGE_LIB)/webclient_$(PACKAGE_VER).jar ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/webclient.jar ; then rm -f $(PACKAGE_LIB)/webclient.jar ; else true ; fi ;
cd $(topsrcdir)/dist/classes ; \
jar -cvfM0 webclient_$(PACKAGE_VER).jar org ; \
mv webclient_$(PACKAGE_VER).jar ../javadev/lib ;
cd $(topsrcdir)/dist/javadev/lib ; \
ln -s webclient_$(PACKAGE_VER).jar $(PACKAGE_LIB)/webclient.jar ;
endif
ifneq ($(PACKAGE_BUILD),)
if test ! -d $(PACKAGE_DIR) ; then mkdir $(PACKAGE_DIR) ; else true ; fi ;
if test ! -d $(PACKAGE_LIB) ; then mkdir $(PACKAGE_LIB) ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar ; then rm -f $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/blackwood.jar ; then rm -f $(PACKAGE_LIB)/blackwood.jar ; else true ; fi ;
cd $(topsrcdir)/dist/classes ; \
jar -xvf ../../java/external/dom2.jar ; \
jar -cvfM0 blackwood.$(VERSION_NUMBER).jar org ; \
cp blackwood.$(VERSION_NUMBER).jar ../javadev/lib/blackwood.$(VERSION_NUMBER).jar ;
cd $(topsrcdir)/dist/javadev/lib ; \
ln -s blackwood.$(VERSION_NUMBER).jar $(PACKAGE_LIB)/blackwood.jar ;
endif
doc::
$(JAVADOC) -d $(DIST)/doc org.mozilla.util

29
mozilla/java/webclient/classes_spec/Makefile.win
View File

@@ -23,8 +23,6 @@ IGNORE_MANIFEST=1
#//------------------------------------------------------------------------
#//
#// Makefile to build the java portion of the java wrapper to mozilla
#// Assumes that all necesssary classes for webclient have already been
#// compiled into $(DIST)\classes
#//
#//------------------------------------------------------------------------
@@ -59,13 +57,7 @@ JAR_WEBCLIENT_CLASSES = \
JDIRS = $(JAR_WEBCLIENT_CLASSES)
!endif
!ifdef PACKAGE_BUILD
PACKAGE_VER = 1_0
#PENDING(edburns): jar name should be defined elewhere!
WEBCLIENT_JAR_NAME=webclient_$(PACKAGE_VER).jar
PACKAGE_DIR = $(DIST)\javadev
PACKAGE_LIB = $(PACKAGE_DIR)\lib
!endif
WEBCLIENT_JAR_NAME=webclient(VERSION_NUMBER).jar
JAVAC_PROG=$(JDKHOME)\bin\javac
@@ -87,21 +79,4 @@ JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH)
!endif
include <$(DEPTH)\config\javarules.mak>
include <$(DEPTH)\config\rules.mak>
install:: jarEmUp
jarEmup:
!ifdef PACKAGE_BUILD
-mkdir $(DIST)\javadev
chmod 775 $(DIST)\javadev
-mkdir $(DIST)\javadev\lib
chmod 775 $(DIST)\javadev\lib
rm -f $(PACKAGE_LIB)\$(WEBCLIENT_JAR_NAME)
jar -cvfM0 $(PACKAGE_LIB)\$(WEBCLIENT_JAR_NAME) -C $(DIST)\..\classes org
!endif
clobber_all::
!ifdef PACKAGE_BUILD
rm -f $(PACKAGE_LIB)\$(WEBCLIENT_JAR_NAME)
!endif
include <$(DEPTH)\config\rules.mak>

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

@@ -130,52 +130,15 @@ INCS = \
# generate the jni header
!ifdef PACKAGE_BUILD
PERCENT=%
PACKAGE_VER = 1_0
#PENDING(edburns): jar name should be defined elewhere!
WEBCLIENT_JAR_NAME=webclient_$(PACKAGE_VER).jar
PACKAGE_DIR = $(DIST)\javadev
PACKAGE_LIB = $(PACKAGE_DIR)\lib
PACKAGE_EXAMPLE = $(PACKAGE_DIR)\example
!endif
PATH_SAVE=$(PATH)
buildRunems:
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
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.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
!else
@echo +++ Creating Commercial Package. Use runem.bat to run the test browser.
@rm -f runem_win_commercial.bat
@set MOZILLA_FIVE_HOME=
@set PATH=
@set JDKHOME=
@echo copy %MOZILLA_FIVE_HOME%\javadev\lib\javadom.dll %MOZILLA_FIVE_HOME%\components>> runem_win_commercial.bat
@echo set PATH=%MOZILLA_FIVE_HOME%\javadev\lib;%MOZILLA_FIVE_HOME%;%MOZILLA_FIVE_HOME%\components;%PATH%>> runem_win_commercial.bat
@echo set CLASSPATH=%MOZILLA_FIVE_HOME%\javadev\lib\$(WEBCLIENT_JAR_NAME)>> runem_win_commercial.bat
@echo %JDKHOME%\bin\java org.mozilla.webclient.test.EmbeddedMozilla %MOZILLA_FIVE_HOME% %1% >> runem_win_commercial.bat
@set PATH=$(PATH_SAVE)
-mkdir $(PACKAGE_EXAMPLE)
chmod 775 $(PACKAGE_EXAMPLE)
cp $(DIST)\bin\webclient.dll $(PACKAGE_LIB)\webclient.dll
cp $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll
cp $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll
chmod 775 $(PACKAGE_LIB)\webclient.dll
chmod 775 $(PACKAGE_LIB)\javadomjni.dll
chmod 775 $(PACKAGE_LIB)\javadom.dll
cp -f $(DEPTH)\java\webclient\src_moz\runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat
chmod 775 $(PACKAGE_EXAMPLE)\runem.bat
cp -f $(DEPTH)\java\webclient\src_moz\install_win32.js $(DIST)\install.js
cd $(DIST)
zip -r $(DLLNAME)_$(PACKAGE_VER)_win32.xpi install.js javadev
!endif
!endif
install:: $(DLL) buildRunems