From 2ff5c882a8f0eb5a2af74dc5b4b3a9ac77084bc3 Mon Sep 17 00:00:00 2001 From: "ashuk%eng.sun.com" Date: Thu, 31 May 2001 18:56:27 +0000 Subject: [PATCH] Bug=73085 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 --- mozilla/java/Makefile.win | 163 ++++---- mozilla/java/build/Makefile.in | 372 ++++++++++-------- mozilla/java/build/Makefile.win | 346 ++++++++-------- mozilla/java/build/README.BLACKCONNECT | 78 ++++ mozilla/java/build/README.BLACKWOOD | 95 +++++ mozilla/java/build/README.DOM | 153 +++++++ mozilla/java/build/README.PLUGLET | 105 +++++ mozilla/java/build/README.WEBCLIENT | 95 +++++ mozilla/java/build/install_webclient_unix.js | 14 + mozilla/java/build/install_webclient_win32.js | 14 + mozilla/java/webclient/src_moz/Makefile.in | 11 +- mozilla/java/webclient/src_moz/Makefile.win | 6 +- 12 files changed, 1022 insertions(+), 430 deletions(-) create mode 100644 mozilla/java/build/README.BLACKCONNECT create mode 100644 mozilla/java/build/README.BLACKWOOD create mode 100644 mozilla/java/build/README.DOM create mode 100644 mozilla/java/build/README.PLUGLET create mode 100644 mozilla/java/build/README.WEBCLIENT diff --git a/mozilla/java/Makefile.win b/mozilla/java/Makefile.win index 5ae1364491c..b8dbfe3fb96 100644 --- a/mozilla/java/Makefile.win +++ b/mozilla/java/Makefile.win @@ -1,81 +1,82 @@ -#!nmake -# -# 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 Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java enhancers to mozilla -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH = .. - -!ifdef BUILD_DOM_ONLY -DIRS = external \ - util \ - dom -!else -!ifdef BUILD_PLUGLETS_ONLY -DIRS = external \ - util \ - dom \ - plugins -!else -!ifdef BUILD_WEBCLIENT_ONLY -DIRS = external \ - util \ - dom \ - xpcom \ - webclient -!else -!ifdef BUILD_BLACKCONNECT_ONLY -DIRS = external \ - util \ - xpcom -!else -!ifdef BUILD_BLACKWOOD -DIRS = external \ - util \ - dom \ - xpcom \ - webclient \ - plugins -!endif -!endif -!endif -!endif -!endif - -!ifdef PACKAGE_BUILD -DIRS += build -!endif - -include <$(DEPTH)\config\rules.mak> - -edburns: - echo $(DIRS) +#!nmake +# +# 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 Sun Microsystems, +# Inc. Portions created by Sun are +# Copyright (C) 1999 Sun Microsystems, Inc. All +# Rights Reserved. +# +# Contributor(s): + +IGNORE_MANIFEST=1 +#//------------------------------------------------------------------------ +#// +#// Makefile to build the java enhancers to mozilla +#// +#//------------------------------------------------------------------------ + + +#//------------------------------------------------------------------------ +#// +#// Specify the depth of the current directory relative to the +#// root of NS +#// +#//------------------------------------------------------------------------ +DEPTH = .. + +!ifdef BUILD_DOM_ONLY +DIRS = external \ + util \ + dom +!else +!ifdef BUILD_PLUGLETS_ONLY +DIRS = external \ + util \ + dom \ + plugins +!else +!ifdef BUILD_WEBCLIENT_ONLY +DIRS = external \ + util \ + dom \ + xpcom \ + webclient \ + build +!else +!ifdef BUILD_BLACKCONNECT_ONLY +DIRS = external \ + util \ + xpcom +!else +!ifdef BUILD_BLACKWOOD +DIRS = external \ + util \ + dom \ + xpcom \ + webclient \ + plugins +!endif +!endif +!endif +!endif +!endif + +!ifdef PACKAGE_BUILD +DIRS = $(DIRS) build +!endif + +include <$(DEPTH)\config\rules.mak> + +edburns: + echo $(DIRS) diff --git a/mozilla/java/build/Makefile.in b/mozilla/java/build/Makefile.in index 7952eaf3fad..6735a74a28e 100644 --- a/mozilla/java/build/Makefile.in +++ b/mozilla/java/build/Makefile.in @@ -17,7 +17,7 @@ # # Contributor(s): -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = $(DEPTH) JAVAHOME = $(JDKHOME) @@ -28,8 +28,8 @@ PACKAGE_DIR=$(topsrcdir)/dist/javadev PACKAGE_LIB=$(PACKAGE_DIR)/lib PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example -ifneq ($(VERSION_NUMBER),) -VERSION_NUMBER=1.0 +ifeq ($(PACKAGE_VER),) +PACKAGE_VER=1.0 endif @@ -40,183 +40,204 @@ PACKAGE_OS=solaris endif buildRunems: -mkdir $(PACKAGE_DIR) -mkdir $(PACKAGE_LIB) -mkdir $(PACKAGE_EXAMPLE) ifneq ($(BUILD_DOM_ONLY),) -mkdir $(DIST)/../../java/build/org -mkdir $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/dom $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/util $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/w3c $(DIST)/../../java/build/org -cd $(DIST)/../../java/build -jar -cvfM0 JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar org -cp JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar -rm -R $(DIST)/../../java/build/org -rm -f $(DIST)/../../java/build/JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar -cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so -cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so -chmod 775 $(PACKAGE_LIB)/libjavadomjni.so -chmod 775 $(PACKAGE_LIB)/libjavadom.so -cp $(DIST)/../../java/build/install_dom_unix.js $(DIST)/install.js -cp $(DIST)/../../java/build/symlink.sh $(DIST)/symlink.sh -cp $(DIST)/../../java/build/README.DOM $(PACKAGE_DIR)/README.DOM -cd $(DIST) -zip -r JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev + 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_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org ; then mkdir $(DIST)/../java/build/org ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org/mozilla ; then mkdir $(DIST)/../java/build/org/mozilla ; else true ; fi ; + cp -R $(DIST)/classes/org/mozilla/dom $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/util $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/w3c $(DIST)/../java/build/org + cd $(DIST)/../java/build + jar -cvfM0 JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar org + cp JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar + rm -Rf $(DIST)/../java/build/org + rm -f $(DIST)/../java/build/JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).jar + cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so + cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so + chmod 775 $(PACKAGE_LIB)/libjavadomjni.so + chmod 775 $(PACKAGE_LIB)/libjavadom.so + cp $(DIST)/../java/build/install_dom_unix.js $(DIST)/install.js + cp $(DIST)/../java/build/symlink.sh $(DIST)/symlink.sh + cp $(DIST)/../java/build/README.DOM $(PACKAGE_DIR)/README.DOM + cd $(DIST) ; \ + zip -r JavaDOM_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev else ifneq ($(BUILD_PLUGLETS_ONLY),) -mkdir $(DIST)/../../java/build/org -mkdir $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/util $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/dom $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/plugins $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/w3c $(DIST)/../../java/build/org -cd $(DIST)/../../java/build -jar -cvfM0 Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar org -cp Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar -rm -R $(DIST)/../../java/build/org -rm -f $(DIST)/../../java/build/Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar -cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so -cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so -cp $(DIST)/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so -cp $(DIST)/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so -chmod 775 $(PACKAGE_LIB)/libjavadomjni.so -chmod 775 $(PACKAGE_LIB)/libjavadom.so -chmod 775 $(PACKAGE_LIB)/libplugletjni.so -chmod 775 $(PACKAGE_LIB)/libpluglet.so -cp $(DIST)/../../java/build/install_pluglet_unix.js $(DIST)/install.js -cp $(DIST)/../../java/build/symlink.sh $(DIST)/symlink.sh -cp $(DIST)/../../java/build/README.PLUGLET $(PACKAGE_DIR)/README.PLUGLET -cd $(DIST) -zip -r Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev + 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_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org ; then mkdir $(DIST)/../java/build/org ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org/mozilla ; then mkdir $(DIST)/../java/build/org/mozilla ; else true ; fi ; + cp -R $(DIST)/classes/org/mozilla/util $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/dom $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/plugins $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/w3c $(DIST)/../java/build/org + cd $(DIST)/../java/build + jar -cvfM0 Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar org + cp Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar + rm -Rf $(DIST)/../java/build/org + rm -f $(DIST)/../java/build/Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).jar + cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so + cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so + cp $(DIST)/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so + cp $(DIST)/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so + chmod 775 $(PACKAGE_LIB)/libjavadomjni.so + chmod 775 $(PACKAGE_LIB)/libjavadom.so + chmod 775 $(PACKAGE_LIB)/libplugletjni.so + chmod 775 $(PACKAGE_LIB)/libpluglet.so + cp $(DIST)/../java/build/install_pluglet_unix.js $(DIST)/install.js + cp $(DIST)/../java/build/symlink.sh $(DIST)/symlink.sh + cp $(DIST)/../java/build/README.PLUGLET $(PACKAGE_DIR)/README.PLUGLET + cd $(DIST) ; \ + zip -r Pluglet_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev else ifneq ($(BUILD_WEBCLIENT_ONLY),) -mkdir $(DIST)/../../java/build/org -mkdir $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/util $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/dom $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/webclient $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/w3c $(DIST)/../../java/build/org -cd $(DIST)/../../java/build -jar -cvfM0 Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar org -cp Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar -rm -R $(DIST)/../../java/build/org -rm -f $(DIST)/../../java/build/Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar -cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so -cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so -cp $(DIST)/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so -cp $(DIST)/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so -cp $(DIST)/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a -chmod 775 $(PACKAGE_LIB)/libjavadomjni.so -chmod 775 $(PACKAGE_LIB)/libjavadom.so -chmod 775 $(PACKAGE_LIB)/libwebclient.so -chmod 775 $(PACKAGE_LIB)/libwebclientstub.so -chmod 775 $(PACKAGE_LIB)/libwc_share.a -@echo +++ Creating Commercial Package. Use runem.bat to run the test browser. -rm -f runem_unix_commercial.bat -@echo copy ../lib/libwebclient.so ../.. >> runem_unix_commercial.bat -@echo copy ../lib/libwebclientstub.so ../.. >> runem_unix_commercial.bat -@echo copy ../lib/libjavadom.so ../../components >> runem_unix_commercial.bat -@echo copy ../lib/libjavadomjni.so ../.. >> runem_unix_commercial.bat -@echo setenv CLASSPATH ../lib/Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar>> runem_unix_commercial.bat -@echo $(PERL) ./runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_unix_commercial.bat -cp -f $runem_unix_commercial.bat $(PACKAGE_EXAMPLE)/runem.bat -cp -f $(DIST)/../../java/webclient/src_share/runem.pl $(PACKAGE_EXAMPLE)/runem.pl -chmod 775 $(PACKAGE_EXAMPLE)/runem.bat -chmod 775 $(PACKAGE_EXAMPLE)/runem.pl -cp $(DIST)/../../java/build/install_webclient_unix.js $(DIST)/install.js -cp $(DIST)/../../java/build/symlink.sh $(DIST)/symlink.sh -cp $(DIST)/../../java/build/README.WEBCLIENT $(PACKAGE_DIR)/README.WEBCLIENT -cd $(DIST) -zip -r Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev + 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_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org ; then mkdir $(DIST)/../java/build/org ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org/mozilla ; then mkdir $(DIST)/../java/build/org/mozilla ; else true ; fi ; + cp -R $(DIST)/classes/org/mozilla/util $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/dom $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/webclient $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/xpcom $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/w3c $(DIST)/../java/build/org + cd $(DIST)/../java/build + jar -cvfM0 Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar org + cp Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar + rm -Rf $(DIST)/../java/build/org + rm -f $(DIST)/../java/build/Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar + cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so + cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so + cp $(DIST)/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so + cp $(DIST)/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so + cp $(DIST)/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a + cp $(DIST)/bin/components/libbcorb.so $(PACKAGE_LIB)/libbcorb.so + cp $(DIST)/bin/components/libbcjavastubs.so $(PACKAGE_LIB)/libbcjavastubs.so + cp $(DIST)/bin/components/libjavaloader.so $(PACKAGE_LIB)/libjavaloader.so + cp $(DIST)/bin/components/libjavaSample.so $(PACKAGE_LIB)/libjavaSample.so + cp $(DIST)/bin/components/libbcxpcomstubs.so $(PACKAGE_LIB)/libbcxpcomstubs.so + cp $(DIST)/bin/regxpcom $(PACKAGE_LIB)/regxpcom + chmod 775 $(PACKAGE_LIB)/libbcorb.so + chmod 775 $(PACKAGE_LIB)/libbcjavastubs.so + chmod 775 $(PACKAGE_LIB)/libjavaloader.so + chmod 775 $(PACKAGE_LIB)/libjavaSample.so + chmod 775 $(PACKAGE_LIB)/libbcxpcomstubs.so + chmod 775 $(PACKAGE_LIB)/regxpcom + chmod 775 $(PACKAGE_LIB)/libjavadomjni.so + chmod 775 $(PACKAGE_LIB)/libjavadom.so + chmod 775 $(PACKAGE_LIB)/libwebclient.so + chmod 775 $(PACKAGE_LIB)/libwebclientstub.so + chmod 775 $(PACKAGE_LIB)/libwc_share.a + @echo +++ Creating Commercial Package. Use runem.bat to run the test browser. + rm -f runem_unix_commercial.bat + @echo copy ../lib/libwebclient.so ../.. >> runem_unix_commercial.bat + @echo copy ../lib/libwebclientstub.so ../.. >> runem_unix_commercial.bat + @echo copy ../lib/libjavadom.so ../../components >> runem_unix_commercial.bat + @echo copy ../lib/libjavadomjni.so ../.. >> runem_unix_commercial.bat + @echo setenv CLASSPATH ../lib/Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).jar>> runem_unix_commercial.bat + @echo $(PERL) ./runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_unix_commercial.bat + cp -f runem_unix_commercial.bat $(PACKAGE_EXAMPLE)/runem.bat + cp -f $(DIST)/../java/webclient/src_share/runem.pl $(PACKAGE_EXAMPLE)/runem.pl + chmod 775 $(PACKAGE_EXAMPLE)/runem.bat + chmod 775 $(PACKAGE_EXAMPLE)/runem.pl + cp $(DIST)/../java/build/install_webclient_unix.js $(DIST)/install.js + cp $(DIST)/../java/build/symlink.sh $(DIST)/symlink.sh + cp $(DIST)/../java/build/README.WEBCLIENT $(PACKAGE_DIR)/README.WEBCLIENT + cd $(DIST) ; \ + zip -r Webclient_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev else ifneq ($(BUILD_BLACKCONNECT_ONLY),) -mkdir $(DIST)/../../java/build/org -mkdir $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/util $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla/xpcom $(DIST)/../../java/build/org/mozilla -cd $(DIST)/../../java/build -jar -cvfM0 Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar org -cp Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar -rm -R $(DIST)/../../java/build/org -rm -f $(DIST)/../../java/build/Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar -cp $(DIST)/bin/components/libbcorb.so $(PACKAGE_LIB)/libbcorb.so -cp $(DIST)/bin/components/libbcjavastubs.so $(PACKAGE_LIB)/libbcjavastubs.so -cp $(DIST)/bin/components/libjavaloader.so $(PACKAGE_LIB)/libjavaloader.so -cp $(DIST)/bin/components/libjavaSample.so $(PACKAGE_LIB)/libjavaSample.so -cp $(DIST)/bin/components/libbcTest.so $(PACKAGE_LIB)/libbcTest.so -cp $(DIST)/bin/components/libbcxpcomstubs.so $(PACKAGE_LIB)/libbcxpcomstubs.so -cp $(DIST)/bin/regxpcom $(PACKAGE_LIB)/regxpcom -chmod 775 $(PACKAGE_LIB)/libbcorb.so -chmod 775 $(PACKAGE_LIB)/libbcjavastubs.so -chmod 775 $(PACKAGE_LIB)/libjavaloader.so -chmod 775 $(PACKAGE_LIB)/libjavaSample.so -chmod 775 $(PACKAGE_LIB)/libbcTest.so -chmod 775 $(PACKAGE_LIB)/libbcxpcomstubs.so -chmod 775 $(PACKAGE_LIB)/regxpcom -cp $(DIST)/../../java/build/install_blackconnect_unix.js $(DIST)/install.js -cp $(DIST)/../../java/build/symlink.sh $(DIST)/symlink.sh -cp $(DIST)/../../java/build/README.BLACKCONNECT $(PACKAGE_DIR)/README.BLACKCONNECT -cd $(DIST) -zip -r Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev + 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_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org ; then mkdir $(DIST)/../java/build/org ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org/mozilla ; then mkdir $(DIST)/../java/build/org/mozilla ; else true ; fi ; + cp -R $(DIST)/classes/org/mozilla/util $(DIST)/../java/build/org/mozilla + cp -R $(DIST)/classes/org/mozilla/xpcom $(DIST)/../java/build/org/mozilla + cd $(DIST)/../java/build + jar -cvfM0 Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar org + cp Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar + rm -Rf $(DIST)/../java/build/org + rm -f $(DIST)/../java/build/Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).jar + cp $(DIST)/bin/components/libbcorb.so $(PACKAGE_LIB)/libbcorb.so + cp $(DIST)/bin/components/libbcjavastubs.so $(PACKAGE_LIB)/libbcjavastubs.so + cp $(DIST)/bin/components/libjavaloader.so $(PACKAGE_LIB)/libjavaloader.so + cp $(DIST)/bin/components/libjavaSample.so $(PACKAGE_LIB)/libjavaSample.so + cp $(DIST)/bin/components/libbcxpcomstubs.so $(PACKAGE_LIB)/libbcxpcomstubs.so + cp $(DIST)/bin/regxpcom $(PACKAGE_LIB)/regxpcom + chmod 775 $(PACKAGE_LIB)/libbcorb.so + chmod 775 $(PACKAGE_LIB)/libbcjavastubs.so + chmod 775 $(PACKAGE_LIB)/libjavaloader.so + chmod 775 $(PACKAGE_LIB)/libjavaSample.so + chmod 775 $(PACKAGE_LIB)/libbcxpcomstubs.so + chmod 775 $(PACKAGE_LIB)/regxpcom + cp $(DIST)/../java/build/install_blackconnect_unix.js $(DIST)/install.js + cp $(DIST)/../java/build/symlink.sh $(DIST)/symlink.sh + cp $(DIST)/../java/build/README.BLACKCONNECT $(PACKAGE_DIR)/README.BLACKCONNECT + cd $(DIST) ; \ + zip -r Blackconnect_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev else ifneq ($(BUILD_BLACKWOOD),) -mkdir $(DIST)/../../java/build/org -mkdir $(DIST)/../../java/build/org/mozilla -cp -R $(DIST)/../classes/org/mozilla $(DIST)/../../java/build/org -cp -R $(DIST)/../classes/org/w3c $(DIST)/../../java/build/org -cd $(DIST)/../../java/build -jar -cvfM0 Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar org -cp Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar -rm -R $(DIST)/../../java/build/org -rm -f $(DIST)/../../java/build/Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar -cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so -cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so -cp $(DIST)/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so -cp $(DIST)/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so -cp $(DIST)/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so -cp $(DIST)/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so -cp $(DIST)/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a -cp $(DIST)/bin/components/libbcorb.so $(PACKAGE_LIB)/libbcorb.so -cp $(DIST)/bin/components/libbcjavastubs.so $(PACKAGE_LIB)/libbcjavastubs.so -cp $(DIST)/bin/components/libjavaloader.so $(PACKAGE_LIB)/libjavaloader.so -cp $(DIST)/bin/components/libjavaSample.so $(PACKAGE_LIB)/libjavaSample.so -cp $(DIST)/bin/components/libbcTest.so $(PACKAGE_LIB)/libbcTest.so -cp $(DIST)/bin/components/libbcxpcomstubs.so $(PACKAGE_LIB)/libbcxpcomstubs.so -cp $(DIST)/bin/regxpcom $(PACKAGE_LIB)/regxpcom -chmod 775 $(PACKAGE_LIB)/libjavadomjni.so -chmod 775 $(PACKAGE_LIB)/libjavadom.so -chmod 775 $(PACKAGE_LIB)/libplugletjni.so -chmod 775 $(PACKAGE_LIB)/libpluglet.so -chmod 775 $(PACKAGE_LIB)/libwebclient.so -chmod 775 $(PACKAGE_LIB)/libwebclientstub.so -chmod 775 $(PACKAGE_LIB)/libwc_share.a -chmod 775 $(PACKAGE_LIB)/libbcorb.so -chmod 775 $(PACKAGE_LIB)/libbcjavastubs.so -chmod 775 $(PACKAGE_LIB)/libjavaloader.so -chmod 775 $(PACKAGE_LIB)/libjavaSample.so -chmod 775 $(PACKAGE_LIB)/libbcTest.so -chmod 775 $(PACKAGE_LIB)/libbcxpcomstubs.so -chmod 775 $(PACKAGE_LIB)/regxpcom -@echo +++ Creating Commercial Package. Use runem.bat to run the test browser. -rm -f runem_unix_commercial.bat -@echo copy ../lib/libwebclient.so ../.. >> runem_unix_commercial.bat -@echo copy ../lib/libwebclientstub.so ../.. >> runem_unix_commercial.bat -@echo copy ../lib/libjavadom.so ../../components >> runem_unix_commercial.bat -@echo copy ../lib/libjavadomjni.so ../.. >> runem_unix_commercial.bat -@echo copy ../lib/libplugletjni.so ../.. >> runem_unix_commercial.bat -@echo copy ../lib/libpluglet.so ../../components >> runem_unix_commercial.bat -@echo setenv CLASSPATH ../lib/Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar>> runem_unix_commercial.bat -@echo $(PERL) ./runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_unix_commercial.bat -cp -f $runem_unix_commercial.bat $(PACKAGE_EXAMPLE)/runem.bat -cp -f $(DIST)/../../java/webclient/src_share/runem.pl $(PACKAGE_EXAMPLE)/runem.pl -chmod 775 $(PACKAGE_EXAMPLE)/runem.bat -chmod 775 $(PACKAGE_EXAMPLE)/runem.pl -cp $(DIST)/../../java/build/install_blackwood_unix.js $(DIST)/install.js -cp $(DIST)/../../java/build/symlink.sh $(DIST)/symlink.sh -cp $(DIST)/../../java/build/README.BLACKWOOD $(PACKAGE_DIR)/README.BLACKWOOD -cd $(DIST) -zip -r Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev + 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_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org ; then mkdir $(DIST)/../java/build/org ; else true ; fi ; + if test ! -d $(DIST)/../java/build/org/mozilla ; then mkdir $(DIST)/../java/build/org/mozilla ; else true ; fi ; + cp -R $(DIST)/classes/org/mozilla $(DIST)/../java/build/org + cp -R $(DIST)/classes/org/w3c $(DIST)/../java/build/org + cd $(DIST)/../java/build + jar -cvfM0 Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar org + cp Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar $(PACKAGE_LIB)/Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar + rm -Rf $(DIST)/../java/build/org + rm -f $(DIST)/../java/build/Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar + cp $(DIST)/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so + cp $(DIST)/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so + cp $(DIST)/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so + cp $(DIST)/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so + cp $(DIST)/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so + cp $(DIST)/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so + cp $(DIST)/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a + cp $(DIST)/bin/components/libbcorb.so $(PACKAGE_LIB)/libbcorb.so + cp $(DIST)/bin/components/libbcjavastubs.so $(PACKAGE_LIB)/libbcjavastubs.so + cp $(DIST)/bin/components/libjavaloader.so $(PACKAGE_LIB)/libjavaloader.so + cp $(DIST)/bin/components/libjavaSample.so $(PACKAGE_LIB)/libjavaSample.so + cp $(DIST)/bin/components/libbcxpcomstubs.so $(PACKAGE_LIB)/libbcxpcomstubs.so + cp $(DIST)/bin/regxpcom $(PACKAGE_LIB)/regxpcom + chmod 775 $(PACKAGE_LIB)/libjavadomjni.so + chmod 775 $(PACKAGE_LIB)/libjavadom.so + chmod 775 $(PACKAGE_LIB)/libplugletjni.so + chmod 775 $(PACKAGE_LIB)/libpluglet.so + chmod 775 $(PACKAGE_LIB)/libwebclient.so + chmod 775 $(PACKAGE_LIB)/libwebclientstub.so + chmod 775 $(PACKAGE_LIB)/libwc_share.a + chmod 775 $(PACKAGE_LIB)/libbcorb.so + chmod 775 $(PACKAGE_LIB)/libbcjavastubs.so + chmod 775 $(PACKAGE_LIB)/libjavaloader.so + chmod 775 $(PACKAGE_LIB)/libjavaSample.so + chmod 775 $(PACKAGE_LIB)/libbcxpcomstubs.so + chmod 775 $(PACKAGE_LIB)/regxpcom + @echo +++ Creating Commercial Package. Use runem.bat to run the test browser. + rm -f runem_unix_commercial.bat + @echo copy ../lib/libwebclient.so ../.. >> runem_unix_commercial.bat + @echo copy ../lib/libwebclientstub.so ../.. >> runem_unix_commercial.bat + @echo copy ../lib/libjavadom.so ../../components >> runem_unix_commercial.bat + @echo copy ../lib/libjavadomjni.so ../.. >> runem_unix_commercial.bat + @echo copy ../lib/libplugletjni.so ../.. >> runem_unix_commercial.bat + @echo copy ../lib/libpluglet.so ../../components >> runem_unix_commercial.bat + @echo setenv CLASSPATH ../lib/Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).jar>> runem_unix_commercial.bat + @echo $(PERL) ./runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_unix_commercial.bat + cp -f runem_unix_commercial.bat $(PACKAGE_EXAMPLE)/runem.bat + cp -f $(DIST)/../java/webclient/src_share/runem.pl $(PACKAGE_EXAMPLE)/runem.pl + chmod 775 $(PACKAGE_EXAMPLE)/runem.bat + chmod 775 $(PACKAGE_EXAMPLE)/runem.pl + cp $(DIST)/../java/build/install_blackwood_unix.js $(DIST)/install.js + cp $(DIST)/../java/build/symlink.sh $(DIST)/symlink.sh + cp $(DIST)/../java/build/README.BLACKWOOD $(PACKAGE_DIR)/README.BLACKWOOD + cd $(DIST) ; \ + zip -r Blackwood_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev endif #BLACKWOOD endif #BLACKCONNECT endif #WEBCLIENT @@ -229,12 +250,13 @@ install::buildRunems clobber:: -rm -f $(DIST)/*.zip -rm -f $(DIST)/*.js -rm -rf $(DIST)/javadev + rm -f $(DIST)/*.zip + rm -f $(DIST)/*.js + rm -rf $(DIST)/javadev + rm -f $(DIST)/symlink.sh clobber_all::clobber -clean::clobber \ No newline at end of file +clean::clobber diff --git a/mozilla/java/build/Makefile.win b/mozilla/java/build/Makefile.win index 4546216327e..4c4b5cc9c84 100644 --- a/mozilla/java/build/Makefile.win +++ b/mozilla/java/build/Makefile.win @@ -19,10 +19,13 @@ # # Contributor(s): -DEPTH=.. -IGNORE_MANIFEST=1 +DEPTH = ..\.. +IGNORE_MANIFEST = 1 -PACKAGE_DIR = $(DIST)\javadev +JAVAHOME = $(JDKHOME) +include <$(DEPTH)\config\rules.mak> + +PACKAGE_DIR = $(DEPTH)\dist\javadev PACKAGE_LIB = $(PACKAGE_DIR)\lib PACKAGE_EXAMPLE = $(PACKAGE_DIR)\example @@ -32,172 +35,189 @@ PACKAGE_VER = 1.0 buildRunems: --mkdir $(PACKAGE_DIR) --mkdir $(PACKAGE_LIB) --mkdir $(PACKAGE_EXAMPLE) !ifdef BUILD_DOM_ONLY --mkdir $(DIST)\..\..\java\build\org --mkdir $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\util $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\w3c $(DIST)\..\..\java\build\org -cd $(DIST)\..\..\java\build -jar -cvfM0 JavaDOM_$(PACKAGE_VER)_win32.jar org -cp JavaDOM_$(PACKAGE_VER)_win32.jar $(PACKAGE_LIB)\JavaDOM_$(PACKAGE_VER)_win32.jar -rm -R $(DIST)\..\..\java\build\org -rm -f $(DIST)\..\..\java\build\JavaDOM_$(PACKAGE_VER)_win32.jar -cp $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll -cp $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll -chmod 775 $(PACKAGE_LIB)\javadomjni.dll -chmod 775 $(PACKAGE_LIB)\javadom.dll -cp $(DIST)\..\..\java\build\install_dom_win32.js $(DIST)\install.js -cp $(DIST)\..\..\java\build\README.DOM $(PACKAGE_DIR)\README.DOM -cd $(DIST) -zip -r JavaDOM_$(PACKAGE_VER)_win32.xpi install.js javadev + -mkdir $(PACKAGE_DIR) + -mkdir $(PACKAGE_LIB) + -mkdir $(PACKAGE_EXAMPLE) + -mkdir $(DIST)\..\java\build\org + -mkdir $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org + cd $(DIST)\..\java\build + jar -cvfM0 JavaDOM_$(PACKAGE_VER)_win32.jar org + copy JavaDOM_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\JavaDOM_$(PACKAGE_VER)_win32.jar + cd ..\..\..\java\build + rmdir /S/Q $(DIST)\..\java\build\org + del /Q $(DIST)\..\java\build\JavaDOM_$(PACKAGE_VER)_win32.jar + copy $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll + copy $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll + chmod 775 $(PACKAGE_LIB)\javadomjni.dll + chmod 775 $(PACKAGE_LIB)\javadom.dll + copy install_dom_win32.js $(DIST)\..\install.js + copy README.DOM $(PACKAGE_DIR)\README.DOM + cd $(DIST)\.. + zip -r JavaDOM_$(PACKAGE_VER)_win32.xpi install.js javadev + cd ..\java\build !else !ifdef BUILD_PLUGLETS_ONLY --mkdir $(DIST)\..\..\java\build\org --mkdir $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\util $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\plugins $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\w3c $(DIST)\..\..\java\build\org -cd $(DIST)\..\..\java\build -jar -cvfM0 Pluglet_$(PACKAGE_VER)_win32.jar org -cp Pluglet_$(PACKAGE_VER)_win32.jar $(PACKAGE_LIB)\Pluglet_$(PACKAGE_VER)_win32.jar -rm -R $(DIST)\..\..\java\build\org -rm -f $(DIST)\..\..\java\build\Pluglet_$(PACKAGE_VER)_win32.jar -cp $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll -cp $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll -cp $(DIST)\bin\plugletjni.dll $(PACKAGE_LIB)\plugletjni.dll -cp $(DIST)\bin\components\pluglet.dll $(PACKAGE_LIB)\pluglet.dll -chmod 775 $(PACKAGE_LIB)\javadomjni.dll -chmod 775 $(PACKAGE_LIB)\javadom.dll -chmod 775 $(PACKAGE_LIB)\plugletjni.dll -chmod 775 $(PACKAGE_LIB)\pluglet.dll -cp $(DIST)\..\..\java\build\install_pluglet_win32.js $(DIST)\install.js -cp $(DIST)\..\..\java\build\README.PLUGLET $(PACKAGE_DIR)\README.PLUGLET -cd $(DIST) -zip -r Pluglet_$(PACKAGE_VER)_win32.xpi install.js javadev + -mkdir $(PACKAGE_DIR) + -mkdir $(PACKAGE_LIB) + -mkdir $(PACKAGE_EXAMPLE) + -mkdir $(DIST)\..\java\build\org + -mkdir $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\plugins $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org + cd $(DIST)\..\java\build + jar -cvfM0 Pluglet_$(PACKAGE_VER)_win32.jar org + copy Pluglet_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Pluglet_$(PACKAGE_VER)_win32.jar + cd ..\..\..\java\build + rmdir /S/Q $(DIST)\..\java\build\org + del /Q $(DIST)\..\java\build\Pluglet_$(PACKAGE_VER)_win32.jar + copy $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll + copy $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll + copy $(DIST)\bin\plugletjni.dll $(PACKAGE_LIB)\plugletjni.dll + copy $(DIST)\bin\components\pluglet.dll $(PACKAGE_LIB)\pluglet.dll + chmod 775 $(PACKAGE_LIB)\javadomjni.dll + chmod 775 $(PACKAGE_LIB)\javadom.dll + chmod 775 $(PACKAGE_LIB)\plugletjni.dll + chmod 775 $(PACKAGE_LIB)\pluglet.dll + copy install_pluglet_win32.js $(DIST)\..\install.js + copy README.PLUGLET $(PACKAGE_DIR)\README.PLUGLET + cd $(DIST)\.. + zip -r Pluglet_$(PACKAGE_VER)_win32.xpi install.js javadev + cd ..\java\build !else !ifdef BUILD_WEBCLIENT_ONLY --mkdir $(DIST)\..\..\java\build\org --mkdir $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\util $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\webclient $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\w3c $(DIST)\..\..\java\build\org -cd $(DIST)\..\..\java\build -jar -cvfM0 Webclient_$(PACKAGE_VER)_win32.jar org -cp Webclient_$(PACKAGE_VER)_win32.jar $(PACKAGE_LIB)\Webclient_$(PACKAGE_VER)_win32.jar -rm -R $(DIST)\..\..\java\build\org -rm -f $(DIST)\..\..\java\build\Webclient_$(PACKAGE_VER)_win32.jar -cp $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll -cp $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll -cp $(DIST)\bin\webclient.dll $(PACKAGE_LIB)\webclient.dll -cp $(DIST)\lib\wc_share.lib $(PACKAGE_LIB)\wc_share.lib -chmod 775 $(PACKAGE_LIB)\javadomjni.dll -chmod 775 $(PACKAGE_LIB)\javadom.dll -chmod 775 $(PACKAGE_LIB)\webclient.dll -chmod 775 $(PACKAGE_LIB)\wc_share.lib -@echo +++ Creating Commercial Package. Use runem.bat to run the test browser. -rm -f runem_win_commercial.bat -@echo copy ..\lib\webclient.dll ..\.. >> runem_win_commercial.bat -@echo copy ..\lib\javadom.dll ..\..\components >> runem_win_commercial.bat -@echo copy ..\lib\javadomjni.dll ..\.. >> runem_win_commercial.bat -@echo set CLASSPATH=..\lib\Webclient_$(PACKAGE_VER)_win32.jar>> runem_win_commercial.bat -@echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat -cp -f $runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat -cp -f $(DIST)\..\..\java\webclient\src_share\runem.pl $(PACKAGE_EXAMPLE)\runem.pl -chmod 775 $(PACKAGE_EXAMPLE)\runem.bat -chmod 775 $(PACKAGE_EXAMPLE)\runem.pl -cp $(DIST)\..\..\java\build\install_webclient_win32.js $(DIST)\install.js -cp $(DIST)\..\..\java\build\README.WEBCLIENT $(PACKAGE_DIR)\README.WEBCLIENT -cd $(DIST) -zip -r Webclient_$(PACKAGE_VER)_win32.xpi install.js javadev + -mkdir $(PACKAGE_DIR) + -mkdir $(PACKAGE_LIB) + -mkdir $(PACKAGE_EXAMPLE) + -mkdir $(DIST)\..\java\build\org + -mkdir $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\webclient $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org + cd $(DIST)\..\java\build + jar -cvfM0 Webclient_$(PACKAGE_VER)_win32.jar org + copy Webclient_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Webclient_$(PACKAGE_VER)_win32.jar + cd ..\..\..\java\build + rmdir /S/Q $(DIST)\..\java\build\org + del /Q $(DIST)\..\java\build\Webclient_$(PACKAGE_VER)_win32.jar + copy $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll + copy $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll + copy $(DIST)\bin\webclient.dll $(PACKAGE_LIB)\webclient.dll + copy $(DIST)\lib\wc_share.lib $(PACKAGE_LIB)\wc_share.lib + copy $(DIST)\bin\components\bcorb.dll $(PACKAGE_LIB)\bcorb.dll + copy $(DIST)\bin\components\bcjavastubs.dll $(PACKAGE_LIB)\bcjavastubs.dll + copy $(DIST)\bin\components\bcjavaloader.dll $(PACKAGE_LIB)\bcjavaloader.dll + copy $(DIST)\bin\components\bcxpcomstubs.dll $(PACKAGE_LIB)\bcxpcomstubs.dll + copy $(DIST)\bin\regxpcom.exe $(PACKAGE_LIB)\regxpcom.exe + chmod 775 $(PACKAGE_LIB)\bcorb.dll + chmod 775 $(PACKAGE_LIB)\bcjavastubs.dll + chmod 775 $(PACKAGE_LIB)\bcjavaloader.dll + chmod 775 $(PACKAGE_LIB)\bcxpcomstubs.dll + chmod 775 $(PACKAGE_LIB)\regxpcom.exe + chmod 775 $(PACKAGE_LIB)\javadomjni.dll + chmod 775 $(PACKAGE_LIB)\javadom.dll + chmod 775 $(PACKAGE_LIB)\webclient.dll + chmod 775 $(PACKAGE_LIB)\wc_share.lib + @echo +++ Creating Commercial Package. Use runem.bat to run the test browser. + del /Q runem_win_commercial.bat + @echo set CLASSPATH=..\lib\Webclient_$(PACKAGE_VER)_win32.jar > runem_win_commercial.bat + @echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat + copy runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat + copy $(DIST)\..\..\java\webclient\src_share\runem.pl $(PACKAGE_EXAMPLE)\runem.pl + chmod 775 $(PACKAGE_EXAMPLE)\runem.bat + chmod 775 $(PACKAGE_EXAMPLE)\runem.pl + copy install_webclient_win32.js $(DIST)\..\install.js + copy README.WEBCLIENT $(PACKAGE_DIR)\README.WEBCLIENT + cd $(DIST)\.. + zip -r Webclient_$(PACKAGE_VER)_win32.xpi install.js javadev + cd ..\java\build !else !ifdef BUILD_BLACKCONNECT_ONLY --mkdir $(DIST)\..\..\java\build\org --mkdir $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\util $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\..\java\build\org\mozilla -cd $(DIST)\..\..\java\build -jar -cvfM0 Blackconnect_$(PACKAGE_VER)_win32.jar org -cp Blackconnect_$(PACKAGE_VER)_win32.jar $(PACKAGE_LIB)\Blackconnect_$(PACKAGE_VER)_win32.jar -rm -R $(DIST)\..\..\java\build\org -rm -f $(DIST)\..\..\java\build\Blackconnect_$(PACKAGE_VER)_win32.jar -cp $(DIST)\bin\components\bcorb.dll $(PACKAGE_LIB)\bcorb.dll -cp $(DIST)\bin\components\bcjavastubs.dll $(PACKAGE_LIB)\bcjavastubs.dll -cp $(DIST)\bin\components\javaloader.dll $(PACKAGE_LIB)\javaloader.dll -cp $(DIST)\bin\components\javaSample.dll $(PACKAGE_LIB)\javaSample.dll -cp $(DIST)\bin\components\bcTest.dll $(PACKAGE_LIB)\bcTest.dll -cp $(DIST)\bin\components\bcxpcomstubs.dll $(PACKAGE_LIB)\bcxpcomstubs.dll -cp $(DIST)\bin\regxpcom.exe $(PACKAGE_LIB)\regxpcom.exe -chmod 775 $(PACKAGE_LIB)\bcorb.dll -chmod 775 $(PACKAGE_LIB)\bcjavastubs.dll -chmod 775 $(PACKAGE_LIB)\javaloader.dll -chmod 775 $(PACKAGE_LIB)\javaSample.dll -chmod 775 $(PACKAGE_LIB)\bcTest.dll -chmod 775 $(PACKAGE_LIB)\bcxpcomstubs.dll -chmod 775 $(PACKAGE_LIB)\regxpcom.exe -cp $(DIST)\..\..\java\build\install_blackconnect_win32.js $(DIST)\install.js -cp $(DIST)\..\..\java\build\README.BLACKCONNECT $(PACKAGE_DIR)\README.BLACKCONNECT -cd $(DIST) -zip -r Blackconnect_$(PACKAGE_VER)_win32.xpi install.js javadev + -mkdir $(PACKAGE_DIR) + -mkdir $(PACKAGE_LIB) + -mkdir $(PACKAGE_EXAMPLE) + -mkdir $(DIST)\..\java\build\org + -mkdir $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\java\build\org\mozilla + cd $(DIST)\..\java\build + jar -cvfM0 Blackconnect_$(PACKAGE_VER)_win32.jar org + copy Blackconnect_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Blackconnect_$(PACKAGE_VER)_win32.jar + cd ..\..\..\java\build + rmdir /S/Q $(DIST)\..\java\build\org + del /Q $(DIST)\..\java\build\Blackconnect_$(PACKAGE_VER)_win32.jar + copy $(DIST)\bin\components\bcorb.dll $(PACKAGE_LIB)\bcorb.dll + copy $(DIST)\bin\components\bcjavastubs.dll $(PACKAGE_LIB)\bcjavastubs.dll + copy $(DIST)\bin\components\bcjavaloader.dll $(PACKAGE_LIB)\bcjavaloader.dll + copy $(DIST)\bin\components\bcxpcomstubs.dll $(PACKAGE_LIB)\bcxpcomstubs.dll + copy $(DIST)\bin\regxpcom.exe $(PACKAGE_LIB)\regxpcom.exe + chmod 775 $(PACKAGE_LIB)\bcorb.dll + chmod 775 $(PACKAGE_LIB)\bcjavastubs.dll + chmod 775 $(PACKAGE_LIB)\bcjavaloader.dll + chmod 775 $(PACKAGE_LIB)\bcxpcomstubs.dll + chmod 775 $(PACKAGE_LIB)\regxpcom.exe + copy install_blackconnect_win32.js $(DIST)\..\install.js + copy README.BLACKCONNECT $(PACKAGE_DIR)\README.BLACKCONNECT + cd $(DIST)\.. + zip -r Blackconnect_$(PACKAGE_VER)_win32.xpi install.js javadev + cd ..\java\build !else !ifdef BUILD_BLACKWOOD --mkdir $(DIST)\..\..\java\build\org --mkdir $(DIST)\..\..\java\build\org\mozilla -cp -R $(DIST)\..\classes\org\mozilla $(DIST)\..\..\java\build\org -cp -R $(DIST)\..\classes\org\w3c $(DIST)\..\..\java\build\org -cd $(DIST)\..\..\java\build -jar -cvfM0 Blackwood_$(PACKAGE_VER)_win32.jar org -cp Blackwood_$(PACKAGE_VER)_win32.jar $(PACKAGE_LIB)\Blackwood_$(PACKAGE_VER)_win32.jar -rm -R $(DIST)\..\..\java\build\org -rm -f $(DIST)\..\..\java\build\Blackwood_$(PACKAGE_VER)_win32.jar -cp $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll -cp $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll -cp $(DIST)\bin\plugletjni.dll $(PACKAGE_LIB)\plugletjni.dll -cp $(DIST)\bin\components\pluglet.dll $(PACKAGE_LIB)\pluglet.dll -cp $(DIST)\bin\webclient.dll $(PACKAGE_LIB)\webclient.dll -cp $(DIST)\lib\wc_share.lib $(PACKAGE_LIB)\wc_share.lib -cp $(DIST)\bin\components\bcorb.dll $(PACKAGE_LIB)\bcorb.dll -cp $(DIST)\bin\components\bcjavastubs.dll $(PACKAGE_LIB)\bcjavastubs.dll -cp $(DIST)\bin\components\javaloader.dll $(PACKAGE_LIB)\javaloader.dll -cp $(DIST)\bin\components\javaSample.dll $(PACKAGE_LIB)\javaSample.dll -cp $(DIST)\bin\components\bcTest.dll $(PACKAGE_LIB)\bcTest.dll -cp $(DIST)\bin\components\bcxpcomstubs.dll $(PACKAGE_LIB)\bcxpcomstubs.dll -cp $(DIST)\bin\regxpcom.exe $(PACKAGE_LIB)\regxpcom.exe -chmod 775 $(PACKAGE_LIB)\javadomjni.dll -chmod 775 $(PACKAGE_LIB)\javadom.dll -chmod 775 $(PACKAGE_LIB)\plugletjni.dll -chmod 775 $(PACKAGE_LIB)\pluglet.dll -chmod 775 $(PACKAGE_LIB)\webclient.dll -chmod 775 $(PACKAGE_LIB)\wc_share.lib -chmod 775 $(PACKAGE_LIB)\bcorb.dll -chmod 775 $(PACKAGE_LIB)\bcjavastubs.dll -chmod 775 $(PACKAGE_LIB)\javaloader.dll -chmod 775 $(PACKAGE_LIB)\javaSample.dll -chmod 775 $(PACKAGE_LIB)\bcTest.dll -chmod 775 $(PACKAGE_LIB)\bcxpcomstubs.dll -chmod 775 $(PACKAGE_LIB)\regxpcom.exe -@echo +++ Creating Commercial Package. Use runem.bat to run the test browser. -rm -f runem_win_commercial.bat -@echo copy ..\lib\webclient.dll ..\.. >> runem_win_commercial.bat -@echo copy ..\lib\javadom.dll ..\..\components >> runem_win_commercial.bat -@echo copy ..\lib\javadomjni.dll ..\.. >> runem_win_commercial.bat -@echo copy ..\lib\plugletjni.dll ..\.. >> runem_win_commercial.bat -@echo copy ..\lib\pluglet.dll ..\..\components >> runem_win_commercial.bat -@echo set CLASSPATH=..\lib\Blackwood_$(PACKAGE_VER)_win32.jar>> runem_win_commercial.bat -@echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat -cp -f $runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat -cp -f $(DIST)\..\..\java\webclient\src_share\runem.pl $(PACKAGE_EXAMPLE)\runem.pl -chmod 775 $(PACKAGE_EXAMPLE)\runem.bat -chmod 775 $(PACKAGE_EXAMPLE)\runem.pl -cp $(DIST)\..\..\java\build\install_blackwood_win32.js $(DIST)\install.js -cp $(DIST)\..\..\java\build\README.BLACKWOOD $(PACKAGE_DIR)\README.BLACKWOOD -cd $(DIST) -zip -r Blackwood_$(PACKAGE_VER)_win32.xpi install.js javadev + -mkdir $(PACKAGE_DIR) + -mkdir $(PACKAGE_LIB) + -mkdir $(PACKAGE_EXAMPLE) + -mkdir $(DIST)\..\java\build\org + -mkdir $(DIST)\..\java\build\org\mozilla + xcopy /E $(DIST)\..\classes\org\mozilla\* $(DIST)\..\java\build\org + xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org + cd $(DIST)\..\java\build + jar -cvfM0 Blackwood_$(PACKAGE_VER)_win32.jar org + copy Blackwood_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Blackwood_$(PACKAGE_VER)_win32.jar + cd ..\..\..\java\build + rmdir /S/Q $(DIST)\..\java\build\org + del /Q $(DIST)\..\java\build\Blackwood_$(PACKAGE_VER)_win32.jar + copy $(DIST)\bin\javadomjni.dll $(PACKAGE_LIB)\javadomjni.dll + copy $(DIST)\bin\components\javadom.dll $(PACKAGE_LIB)\javadom.dll + copy $(DIST)\bin\plugletjni.dll $(PACKAGE_LIB)\plugletjni.dll + copy $(DIST)\bin\components\pluglet.dll $(PACKAGE_LIB)\pluglet.dll + copy $(DIST)\bin\webclient.dll $(PACKAGE_LIB)\webclient.dll + copy $(DIST)\lib\wc_share.lib $(PACKAGE_LIB)\wc_share.lib + copy $(DIST)\bin\components\bcorb.dll $(PACKAGE_LIB)\bcorb.dll + copy $(DIST)\bin\components\bcjavastubs.dll $(PACKAGE_LIB)\bcjavastubs.dll + copy $(DIST)\bin\components\bcjavaloader.dll $(PACKAGE_LIB)\bcjavaloader.dll + copy $(DIST)\bin\components\bcxpcomstubs.dll $(PACKAGE_LIB)\bcxpcomstubs.dll + copy $(DIST)\bin\regxpcom.exe $(PACKAGE_LIB)\regxpcom.exe + chmod 775 $(PACKAGE_LIB)\javadomjni.dll + chmod 775 $(PACKAGE_LIB)\javadom.dll + chmod 775 $(PACKAGE_LIB)\plugletjni.dll + chmod 775 $(PACKAGE_LIB)\pluglet.dll + chmod 775 $(PACKAGE_LIB)\webclient.dll + chmod 775 $(PACKAGE_LIB)\wc_share.lib + chmod 775 $(PACKAGE_LIB)\bcorb.dll + chmod 775 $(PACKAGE_LIB)\bcjavastubs.dll + chmod 775 $(PACKAGE_LIB)\bcjavaloader.dll + chmod 775 $(PACKAGE_LIB)\bcxpcomstubs.dll + chmod 775 $(PACKAGE_LIB)\regxpcom.exe + @echo +++ Creating Commercial Package. Use runem.bat to run the test browser. + del /Q runem_win_commercial.bat + @echo set CLASSPATH=..\lib\Blackwood_$(PACKAGE_VER)_win32.jar > runem_win_commercial.bat + @echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat + copy runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat + copy $(DIST)\..\..\java\webclient\src_share\runem.pl $(PACKAGE_EXAMPLE)\runem.pl + chmod 775 $(PACKAGE_EXAMPLE)\runem.bat + chmod 775 $(PACKAGE_EXAMPLE)\runem.pl + copy install_blackwood_win32.js $(DIST)\..\install.js + copy README.BLACKWOOD $(PACKAGE_DIR)\README.BLACKWOOD + cd $(DIST)\.. + zip -r Blackwood_$(PACKAGE_VER)_win32.xpi install.js javadev + cd ..\java\build !endif #BLACKWOOD !endif #BLACKCONNECT !endif #WEBCLIENT @@ -209,9 +229,9 @@ install::buildRunems clobber:: -rm -f $(DIST)\*.zip -rm -f $(DIST)\*.js -rm -rf $(DIST)\javadev + del /Q $(DIST)\..\*.xpi + rmdir /S/Q $(DIST)\..\javadev + rmdir /S/Q $(DIST)\..\java clobber_all::clobber diff --git a/mozilla/java/build/README.BLACKCONNECT b/mozilla/java/build/README.BLACKCONNECT new file mode 100644 index 00000000000..0e5608f2778 --- /dev/null +++ b/mozilla/java/build/README.BLACKCONNECT @@ -0,0 +1,78 @@ +Black Connect +================================ + +This directory contains the Black Connect + +The sources is divided into three directories + + connect + public headers. + ORB implementation. + + xpcom + XPCOM stubs and proxy implementation + + java + JAVA stubs and proxy implementation + Java component loader + +=============================================== +Solaris directions +=============================================== + +Requirements: + +* current mozilla built tree + +* JDK1.3 + +* Perl 5 must be in your path + +How To Build: + +* make sure the environment var JDKHOME is set to your jdk installation + directory, ie export JDKHOME=/usr/local/jdk1.3 + +* Add following directories to to your LD_LIBRARY_PATH: + + +$MOZILLA_FIVE_HOME:$JDKHOME/jre/lib/$HOSTTYPE/native_threads:$JDKHOME/jre/lib/$HOSTTYPE/classic: +$JDKHOME/jre/lib/$HOSTTYPE/: + +* type "gmake" + + +============================================== +Linux directions +=============================================== + +Requirements: + +* mozilla m16 build tree + +* JDK1.3 from IBM + +* Perl 5 must be in your path + +How To Build: + +* make sure the environment var JDKHOME is set to your jdk installation + directory, ie export JDKHOME=/usr/local/jdk1.3 + +* Add following directories to to your LD_LIBRARY_PATH: + +$MOZILLA_FIVE_HOME:$JDKHOME/jre/bin:$JDKHOME/jre/bin/classic: + +* remove jni* jri* from MOZILLA_FIVE_HOME/dist/include + +* type "gmake" + +============================================== +How to run test java component +=============================================== +* cd java/test +* gmake +* add $MOZILLA_FIVE_HOME/dist/classes to your CLASSPATH +Test component would be placed in dist/bin/componets and loaded on mozilla +sturtup (or you can use regxpcom for testing) + diff --git a/mozilla/java/build/README.BLACKWOOD b/mozilla/java/build/README.BLACKWOOD new file mode 100644 index 00000000000..7cf1c8b8799 --- /dev/null +++ b/mozilla/java/build/README.BLACKWOOD @@ -0,0 +1,95 @@ +Here lies the MozWebShell java wrapper to mozilla M8. + +Authors: Kirk Baker + Ian Wilkinson + +Build hacking and packaging: Ed Burns + +Unix port: Mark Lin + +======================================================================== +Win32 Build Directions: +======================================================================== +Requirements: + +* built mozilla with source code from after 10/5/99 + +* JDK1.1.7 or greater + +* built org.mozilla.util java classes (see NOTE_UTIL) + +* Perl 5 perl.exe must be in your path + +How To Build: + +* Follow the directions in ..\README + +* type "nmake /f makefile.win all" and hope for the best + +How to Run: + +* once the build has successfully completed, run this batch file: + + .\src\WIN32_D.OBJ\runem.bat + + Note that YOUR_URL is probably necessary since firewall support wasn't + working in M8. + + +Problems: + +* clobber_all doesn't remove the .class files from dist\classes. You + have to do this manually. + +* post to netscape.public.mozilla.java newsgroup + +======================================================================== +Unix Build Directions (currently only Linux, +Solaris support is coming soon): +======================================================================== +Requirements: + +* built mozilla tree for some variant of Linux + +* JDK1.2 with native threads support from http://www.blackdown.org +(JDK1.1 doesn't seem to work) + +* built org.mozilla.util java classes (see NOTE_UTIL) + +How To Build: + +* Follow the directions in ../util/README + +* set JDKHOME to where your JDK install directory resides + -> setenv JDKHOME /usr/local/jdk1.2 + +* cd to 'classes' and type "make -f makefile.unix" and hope for the best + -> cd classes; make -f Makefile.unix + +* then cd to 'src' and type "make -f makefile.unix" and hope for the best + -> cd src; make -f Makefile.unix + +How to Run: + +* once the build has successfully completed, run 'runem.unix' in your +'src' directory: + -> cd src; ./runem.unix + + Note that YOUR_URL is probably necessary since firewall support wasn't + working in M8. + +Problems? Email mark.lin@eng.sun.com or post to netscape.public.mozilla.java. + +======================================================================== +NOTE_UTIL: +======================================================================== +* this package depends on the org.mozilla.util classes, which can be + found in the mozilla tree under mozilla\java\util. They are a + separate checkout and build. Once you check out the org.mozilla.util + classes, see the README in the mozilla\java\util\README. + +General notes: + +* Please update the ChangeLog (changelo) when you make changes. + + diff --git a/mozilla/java/build/README.DOM b/mozilla/java/build/README.DOM new file mode 100644 index 00000000000..50a0614d2dd --- /dev/null +++ b/mozilla/java/build/README.DOM @@ -0,0 +1,153 @@ + +Sources +======= + +The sources are located in mozilla/java/dom. +Subdirectories + + classes + jni + src + tests + +contain Java sources, Java native methods implementation, +native c++ code and Java DOM API tests respectively. + +Note: + Sources that work with mozilla PR1 and earlier + versions should be checked out using DOM_PR1 tag. + + No tags are needed for the sources that work with + the latest mozilla tree. + +Building +======== + + Requirenments: + -------------- + Current mozilla build + JDK1.2 or JDK1.3 + Perl 5 must be in your path + JDKHOME environment variable set to your JDK dir + CLASSPATH environment cvariable set to contain + org.w3c.dom classes. The sources can be found at + http://www.w3.org/TR/2000/CR-DOM-Level-2-20000307/java-binding.html + (for mozilla PR1 and earlie versions) + http://www.w3.org/TR/2000/CR-DOM-Level-2-20000510/java-binding.html + (for the latest mozilla) + + Solaris specific + ---------------- + Add following directories to LD_LIBRARY_PATH environment variable: + $MOZILLA_FIVE_HOME + $JDKHOME/jre/lib/$HOSTTYPE/native_threads + $JDKHOME/jre/lib/$HOSTTYPE/classic + $JDKHOME/jre/lib/$HOSTTYPE/ + + goto mozilla/java/dom directory and type "gmake" + + + Windows NT specific + ------------------- + To enable OJI usage set environment variable JAVA_DOM_OJI_ENABLE=1 + Add following directories to PATH environment variable: + %MOZILLA_FIVE_HOME% + %JDKHOME%\jre\bin\classic (only in case you don't use OJI) + + goto mozilla/java/dom directory and type "nmake /f makefile.win" + + +Using the Java DOM API +====================== + +A Java component obtains a org.w3c.dom.Document by registering for +Document load notifications. The Document is passed in along with the +notifications. The preferred way for a Java component to register for +Document load notifications is to register via the DOMAccessor class. + +However, this is possible only if OJI usage is enabled. This works +on Windows NT platform. + +On Solaris currently the nsJavaDOM component instantiates its own JVM. +When an OJI-compatible JVM is available, we will move over to using it. +So, one has to apply two patches to + + mozilla/webshell/src/nsWebShell.cpp + mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java + +They can be found at mozilla/java/dom directory. +The first one inits nsJavaDOM component and adds it as a +document load observer listener. + +The second one registers a document load listener via DOMAccessor. +Note: + any class that implements the DocumentLoadListener interface may + stand for GenericDocLoadListener. + +After applying a patch to nsWebShell.cpp edit +mozilla/webshell/src/Makefile.in to add -DJAVA_DOM to the list of +defines. Then do a gmake in this directory. + +After applying a patch to DOMAccessor.java go to mozilla/java/dom/classes +and do a gmake. No changes in makefiles are needed. + +You can find examples of Java DOM API usage in + + mozilla/java/dom/classes/org/mozilla/dom/util + mozilla/java/dom/tests/src/applets + + +DOM2 events +------------ + +At the moment all DOM2 event-related interfaces are present +however they are not fully implemented yet +because Mozilla's core DOM does not support DOM2 events fully. +Consequences: + - some methods throws OperationUnsupportedException() + +The basic implementation architecture is following: + - NodeImpl is extended to support EventTarget interface + - for every addEventListener call special NativeDOMProxyListener object is + created and is registered with Mozilla's DOM + It's task is to propagate event notifications from Mozilla's DOM + to target Java EventListener + - In order to sucessfully unregister EventListeners we need to + save association between java EventListener and corresponding + NativeDOMProxyListener object. This is done by storing such + associations Vector at NodeImpl + - javaDOMEventsGlobals class is used much like javaDOMGlobals for caching + (this code may be moved to javaDOMGlobals) + +NSPR Logging +------------ + +The NSPR Log module name is javadom. For instructions on how to enable +logging, see dist/include/prlog.h + + +Debug output +------------ + +The debug build of the Java DOM API creates the JVM with the verbose +and the verboseGC options turned on, to help in debugging. It also +creates two files in the current working directory, dom-java.txt and +dom-cpp.txt, which are simple dumps of the DOM, as printed from C++ +and from Java. The two should be identical. The code to write these +files is, essentially, my regression test. Feel free to add to it. + + +Dependencies +------------ + +Currently tested on Solaris 7 only with Java 2 SDK 1.2.1. egcs-2.91.66, +Sun Workshop C++ 4.2 and 5.0 have been know to compile this code +fine. gcc-2.8.1 does *not* work. I have not used anything +Java2-specific, and it works with JDK1.1.x too (I have been using JDK +1.1.6 too). + + +References +---------- + +I highly recommend reading Sheng Liang's new JNI book. diff --git a/mozilla/java/build/README.PLUGLET b/mozilla/java/build/README.PLUGLET new file mode 100644 index 00000000000..8f747d43101 --- /dev/null +++ b/mozilla/java/build/README.PLUGLET @@ -0,0 +1,105 @@ +Java-Implemented Plug-ins. +================================ +http://www.mozilla.org/projects/blackwood/java-plugins/ +-------------------------------- +This directory contains the beginnings of the Java-Implemented plug-uns. + +The sources is divided into four directories + + classes + Java source files + src + Native code (c++/c) + jni + Implamentations of java native methods + test + Test code, including simple pluglet. + +======================================================================== +Win32 Directions: +======================================================================== +Requirements: + +* current mozilla built tree + +* JDK1.3 or JDK1.2 if you are not using OJI + +* Perl 5 perl.exe must be in your path + +How To Build: + +* make sure the environment var JDKHOME is set to your jdk installation + directory, ie SET JDKHOME=C:\jdk1.2 + +* if you do not have working OJI set OJI_DISABLE to 1 + (You can do it in your command prompt, or you can set it in + mozilla/java/plugins/src/makefile.win). + +* type "nmake /f makefile.win" + +How to Run: + +* Add following directories to to your path: + %MOZILLA_FIVE_HOME% + In case OJI_DISABLE add %JDKHOME%\jre\bin\client to your path + +* Copy class files from mozilla/dist/classes to your JRE/lib/ext directory and +add JRE/lib/ext to your classpath + +How to build and run test +* go to the test directory and type "nmake /f makefile.win" + +* Set PLUGLET environment to the directory you have test.jar + +* Run mozilla and load page test.html from test directory and if everething is ok you will see + some awt demo. + + +========================================================================= +Unix (Sparc Solaris and i386 Linux) Directions: +========================================================================= + +Requirements: + +* current mozilla built tree + +* JDK1.3 + +* Perl 5 must be in your path + +How To Build: + +* make sure the environment var JDKHOME is set to your jdk installation + directory, ie export JDKHOME=/usr/local/jdk1.3 + +* Add following directories to to your LD_LIBRARY_PATH: + +$MOZILLA_FIVE_HOME:$JDKHOME/jre/lib/$HOSTTYPE/native_threads:$JDKHOME/jre/lib/$HOSTTYPE/client: +$JDKHOME/jre/lib/$HOSTTYPE/: + +* type "gmake" + +How to Run: + +* Add $MOZILLA_FILE_HOME/../classes to your CLASSPATH + +How to build and run test + +* go to the test directory and type "gmake" + test.jar will be placed in mozilla/dist/bin/plugins directory + +* set LD_PRELOAD to libXm.so (to libawt.so on linux platform) + +* Run mozilla and load page resource:///res/javadev/pluglets/test.html and if everething is ok you will see some awt demo. + + +======================================================================== + +Problems: + +* post to netscape.public.mozilla.java newsgroup + + + + + diff --git a/mozilla/java/build/README.WEBCLIENT b/mozilla/java/build/README.WEBCLIENT new file mode 100644 index 00000000000..7cf1c8b8799 --- /dev/null +++ b/mozilla/java/build/README.WEBCLIENT @@ -0,0 +1,95 @@ +Here lies the MozWebShell java wrapper to mozilla M8. + +Authors: Kirk Baker + Ian Wilkinson + +Build hacking and packaging: Ed Burns + +Unix port: Mark Lin + +======================================================================== +Win32 Build Directions: +======================================================================== +Requirements: + +* built mozilla with source code from after 10/5/99 + +* JDK1.1.7 or greater + +* built org.mozilla.util java classes (see NOTE_UTIL) + +* Perl 5 perl.exe must be in your path + +How To Build: + +* Follow the directions in ..\README + +* type "nmake /f makefile.win all" and hope for the best + +How to Run: + +* once the build has successfully completed, run this batch file: + + .\src\WIN32_D.OBJ\runem.bat + + Note that YOUR_URL is probably necessary since firewall support wasn't + working in M8. + + +Problems: + +* clobber_all doesn't remove the .class files from dist\classes. You + have to do this manually. + +* post to netscape.public.mozilla.java newsgroup + +======================================================================== +Unix Build Directions (currently only Linux, +Solaris support is coming soon): +======================================================================== +Requirements: + +* built mozilla tree for some variant of Linux + +* JDK1.2 with native threads support from http://www.blackdown.org +(JDK1.1 doesn't seem to work) + +* built org.mozilla.util java classes (see NOTE_UTIL) + +How To Build: + +* Follow the directions in ../util/README + +* set JDKHOME to where your JDK install directory resides + -> setenv JDKHOME /usr/local/jdk1.2 + +* cd to 'classes' and type "make -f makefile.unix" and hope for the best + -> cd classes; make -f Makefile.unix + +* then cd to 'src' and type "make -f makefile.unix" and hope for the best + -> cd src; make -f Makefile.unix + +How to Run: + +* once the build has successfully completed, run 'runem.unix' in your +'src' directory: + -> cd src; ./runem.unix + + Note that YOUR_URL is probably necessary since firewall support wasn't + working in M8. + +Problems? Email mark.lin@eng.sun.com or post to netscape.public.mozilla.java. + +======================================================================== +NOTE_UTIL: +======================================================================== +* this package depends on the org.mozilla.util classes, which can be + found in the mozilla tree under mozilla\java\util. They are a + separate checkout and build. Once you check out the org.mozilla.util + classes, see the README in the mozilla\java\util\README. + +General notes: + +* Please update the ChangeLog (changelo) when you make changes. + + diff --git a/mozilla/java/build/install_webclient_unix.js b/mozilla/java/build/install_webclient_unix.js index 2212af0dafb..ed24aab4ac1 100644 --- a/mozilla/java/build/install_webclient_unix.js +++ b/mozilla/java/build/install_webclient_unix.js @@ -58,6 +58,20 @@ logComment("Starting Install Process"); var fJavadev = getFolder("Program","javadev"); symlink(fComponents + "libjavadom.so", getFolder(fJavadev, "lib/libjavadom.so")); + symlink(fComponents + "libbcorb.so", + getFolder(fJavadev, "lib/libbcorb.so")); + symlink(fComponents + "libbcjavastubs.so", + getFolder(fJavadev, "lib/libbcjavastubs.so")); + symlink(fComponents + "libjavaloader.so", + getFolder(fJavadev, "lib/libjavaloader.so")); + symlink(fComponents + "libjavaSample.so", + getFolder(fJavadev, "lib/libjavaSample.so")); + symlink(fComponents + "libbcTest.so", + getFolder(fJavadev, "lib/libbcTest.so")); + symlink(fComponents + "libbcxpcomstubs.so", + getFolder(fJavadev, "lib/libbcxpcomstubs.so")); + symlink(fProgram + "regxpcom", + getFolder(fJavadev, "lib/regxpcom")); // check return value if(err == SUCCESS) diff --git a/mozilla/java/build/install_webclient_win32.js b/mozilla/java/build/install_webclient_win32.js index 3f4d39e04b1..d11518deace 100644 --- a/mozilla/java/build/install_webclient_win32.js +++ b/mozilla/java/build/install_webclient_win32.js @@ -52,6 +52,20 @@ logComment("Starting Install Process"); var fJavadev = getFolder("Program","javadev"); src = getFolder(fJavadev, "lib/javadom.dll"); err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/bcorb.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/bcjavastubs.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/javaloader.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/javaSample.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/bcTest.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/bcxpcomstubs.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "regxpcom.exe"); + err = copy(src, fProgram); // check return value if(err == SUCCESS) diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in index baa845f5548..c5fc91ef83c 100644 --- a/mozilla/java/webclient/src_moz/Makefile.in +++ b/mozilla/java/webclient/src_moz/Makefile.in @@ -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 diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win index 557899c91bc..5a721dba09b 100644 --- a/mozilla/java/webclient/src_moz/Makefile.win +++ b/mozilla/java/webclient/src_moz/Makefile.win @@ -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