From d5530a372a1f5d885e76e57715c2a70ab8dcb362 Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Mon, 30 Apr 2001 23:50:52 +0000 Subject: [PATCH] The following files are in this checkin. 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 --- mozilla/java/Makefile.in | 46 +++- mozilla/java/Makefile.win | 39 ++- mozilla/java/build/Makefile.in | 240 ++++++++++++++++++ mozilla/java/build/Makefile.win | 220 ++++++++++++++++ .../java/build/install_blackconnect_unix.js | 86 +++++++ .../java/build/install_blackconnect_win32.js | 80 ++++++ mozilla/java/build/install_blackwood_unix.js | 90 +++++++ mozilla/java/build/install_blackwood_win32.js | 84 ++++++ mozilla/java/build/install_dom_unix.js | 74 ++++++ mozilla/java/build/install_dom_win32.js | 68 +++++ mozilla/java/build/install_pluglets_unix.js | 76 ++++++ mozilla/java/build/install_pluglets_win32.js | 70 +++++ mozilla/java/build/install_webclient_unix.js | 74 ++++++ mozilla/java/build/install_webclient_win32.js | 68 +++++ mozilla/java/build/symlink.sh | 11 + .../java/webclient/classes_spec/Makefile.in | 51 ---- .../java/webclient/classes_spec/Makefile.win | 29 +-- mozilla/java/webclient/src_moz/Makefile.win | 39 +-- 18 files changed, 1320 insertions(+), 125 deletions(-) create mode 100644 mozilla/java/build/Makefile.in create mode 100644 mozilla/java/build/Makefile.win create mode 100644 mozilla/java/build/install_blackconnect_unix.js create mode 100644 mozilla/java/build/install_blackconnect_win32.js create mode 100644 mozilla/java/build/install_blackwood_unix.js create mode 100644 mozilla/java/build/install_blackwood_win32.js create mode 100644 mozilla/java/build/install_dom_unix.js create mode 100644 mozilla/java/build/install_dom_win32.js create mode 100644 mozilla/java/build/install_pluglets_unix.js create mode 100644 mozilla/java/build/install_pluglets_win32.js create mode 100644 mozilla/java/build/install_webclient_unix.js create mode 100644 mozilla/java/build/install_webclient_win32.js create mode 100644 mozilla/java/build/symlink.sh diff --git a/mozilla/java/Makefile.in b/mozilla/java/Makefile.in index 57eb5dbdf2e..f3aba6ac18b 100644 --- a/mozilla/java/Makefile.in +++ b/mozilla/java/Makefile.in @@ -25,16 +25,46 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS= util \ - external \ - dom - -ifeq ($(BUILD_WEBCLIENT_ONLY),) -DIRS += xpcom \ - plugins +ifneq ($(BUILD_DOM_ONLY),) +DIRS = external \ + util \ + dom +else +ifneq ($(BUILD_PLUGLETS_ONLY),) +DIRS = external \ + util \ + dom \ + plugins +else +ifneq ($(BUILD_WEBCLIENT_ONLY),) +DIRS = external \ + util \ + dom \ + webclient +else +ifneq ($(BUILD_BLACKCONNECT_ONLY),) +DIRS = external \ + util \ + xpcom +else +ifneq ($(BUILD_BLACKWOOD),) +DIRS = external \ + util \ + dom \ + webclient \ + plugins \ + xpcom +endif +endif +endif +endif +endif + + +ifneq ($(PACKAGE_BUILD),) +DIRS += build endif -DIRS += webclient include $(topsrcdir)/config/rules.mk diff --git a/mozilla/java/Makefile.win b/mozilla/java/Makefile.win index d1a691d738c..57b7690e2ff 100644 --- a/mozilla/java/Makefile.win +++ b/mozilla/java/Makefile.win @@ -35,9 +35,46 @@ IGNORE_MANIFEST=1 #//------------------------------------------------------------------------ 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 \ + webclient +!else +!ifdef BUILD_BLACKCONNECT_ONLY +DIRS = external \ + util \ + xpcom +!else +!ifdef BUILD_BLACKWOOD DIRS = external \ util \ dom \ - webclient + webclient \ + plugins \ + xpcom +!endif +!endif +!endif +!endif +!endif + +!ifdef PACKAGE_BUILD +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 new file mode 100644 index 00000000000..7952eaf3fad --- /dev/null +++ b/mozilla/java/build/Makefile.in @@ -0,0 +1,240 @@ +# 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): + +DEPTH = ../../.. +topsrcdir = $(DEPTH) + +JAVAHOME = $(JDKHOME) +include $(DEPTH)/config/autoconf.mk +include $(topsrcdir)/config/rules.mk + +PACKAGE_DIR=$(topsrcdir)/dist/javadev +PACKAGE_LIB=$(PACKAGE_DIR)/lib +PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example + +ifneq ($(VERSION_NUMBER),) +VERSION_NUMBER=1.0 +endif + + +ifeq ($(OS_ARCH),Linux) +PACKAGE_OS=linux +else +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 +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 +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 +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 +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 +endif #BLACKWOOD +endif #BLACKCONNECT +endif #WEBCLIENT +endif #PLUGLETS +endif #DOM + + + +install::buildRunems + + +clobber:: +rm -f $(DIST)/*.zip +rm -f $(DIST)/*.js +rm -rf $(DIST)/javadev + + +clobber_all::clobber + + +clean::clobber \ No newline at end of file diff --git a/mozilla/java/build/Makefile.win b/mozilla/java/build/Makefile.win new file mode 100644 index 00000000000..4546216327e --- /dev/null +++ b/mozilla/java/build/Makefile.win @@ -0,0 +1,220 @@ +#!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): + +DEPTH=.. +IGNORE_MANIFEST=1 + +PACKAGE_DIR = $(DIST)\javadev +PACKAGE_LIB = $(PACKAGE_DIR)\lib +PACKAGE_EXAMPLE = $(PACKAGE_DIR)\example + +!ifndef PACKAGE_VER +PACKAGE_VER = 1.0 +!endif + + +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 +!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 +!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 +!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 +!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 +!endif #BLACKWOOD +!endif #BLACKCONNECT +!endif #WEBCLIENT +!endif #PLUGLETS +!endif #DOM + + +install::buildRunems + + +clobber:: +rm -f $(DIST)\*.zip +rm -f $(DIST)\*.js +rm -rf $(DIST)\javadev + + +clobber_all::clobber + + +clean::clobber \ No newline at end of file diff --git a/mozilla/java/build/install_blackconnect_unix.js b/mozilla/java/build/install_blackconnect_unix.js new file mode 100644 index 00000000000..45385a1c261 --- /dev/null +++ b/mozilla/java/build/install_blackconnect_unix.js @@ -0,0 +1,86 @@ +// Installation guide for BlackConnect.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + +// this function creates a symlink +function symlink(lnk, tgt) +{ + var err = execute("symlink.sh", tgt + " " + lnk); + logComment("execute symlink.sh "+tgt+" "+lnk+" returned: "+err); +} + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("BlackConnect", "BlackConnect", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + 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) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_blackconnect_win32.js b/mozilla/java/build/install_blackconnect_win32.js new file mode 100644 index 00000000000..bd90cacc215 --- /dev/null +++ b/mozilla/java/build/install_blackconnect_win32.js @@ -0,0 +1,80 @@ +// Installation guide for BlackConnect.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("BlackConnect", "BlackConnect", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + 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) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_blackwood_unix.js b/mozilla/java/build/install_blackwood_unix.js new file mode 100644 index 00000000000..3888730482f --- /dev/null +++ b/mozilla/java/build/install_blackwood_unix.js @@ -0,0 +1,90 @@ +// Installation guide for Blackwood.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + +// this function creates a symlink +function symlink(lnk, tgt) +{ + var err = execute("symlink.sh", tgt + " " + lnk); + logComment("execute symlink.sh "+tgt+" "+lnk+" returned: "+err); +} + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("Blackwood", "Blackwood", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + symlink(fComponents + "libjavadom.so", + getFolder(fJavadev, "lib/libjavadom.so")); + symlink(fComponents + "libpluglet.so", + getFolder(fJavadev, "lib/libpluglet.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) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_blackwood_win32.js b/mozilla/java/build/install_blackwood_win32.js new file mode 100644 index 00000000000..c738eecc5f2 --- /dev/null +++ b/mozilla/java/build/install_blackwood_win32.js @@ -0,0 +1,84 @@ +// Installation guide for Blackwood.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; + logComment("Starting Install Process"); + err = initInstall("Blackwood", "Blackwood", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + src = getFolder(fJavadev, "lib/javadom.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/pluglet.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) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_dom_unix.js b/mozilla/java/build/install_dom_unix.js new file mode 100644 index 00000000000..04d95830a92 --- /dev/null +++ b/mozilla/java/build/install_dom_unix.js @@ -0,0 +1,74 @@ +// Installation guide for JavaDOM.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + +// this function creates a symlink +function symlink(lnk, tgt) +{ + var err = execute("symlink.sh", tgt + " " + lnk); + logComment("execute symlink.sh "+tgt+" "+lnk+" returned: "+err); +} + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("JavaDOM", "JavaDOM", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + symlink(fComponents + "libjavadom.so", + getFolder(fJavadev, "lib/libjavadom.so")); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_dom_win32.js b/mozilla/java/build/install_dom_win32.js new file mode 100644 index 00000000000..0b094930681 --- /dev/null +++ b/mozilla/java/build/install_dom_win32.js @@ -0,0 +1,68 @@ +// Installation guide for JavaDOM.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("JavaDOM", "JavaDOM", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + src = getFolder(fJavadev, "lib/javadom.dll"); + err = copy(src, fComponents); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_pluglets_unix.js b/mozilla/java/build/install_pluglets_unix.js new file mode 100644 index 00000000000..f8a419361f8 --- /dev/null +++ b/mozilla/java/build/install_pluglets_unix.js @@ -0,0 +1,76 @@ +// Installation guide for Pluglets.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + +// this function creates a symlink +function symlink(lnk, tgt) +{ + var err = execute("symlink.sh", tgt + " " + lnk); + logComment("execute symlink.sh "+tgt+" "+lnk+" returned: "+err); +} + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("Pluglets", "Pluglets", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + symlink(fComponents + "libjavadom.so", + getFolder(fJavadev, "lib/libjavadom.so")); + symlink(fComponents + "libpluglet.so", + getFolder(fJavadev, "lib/libpluglet.so")); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_pluglets_win32.js b/mozilla/java/build/install_pluglets_win32.js new file mode 100644 index 00000000000..ed11e758607 --- /dev/null +++ b/mozilla/java/build/install_pluglets_win32.js @@ -0,0 +1,70 @@ +// Installation guide for Pluglets.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("Pluglets", "Pluglets", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + src = getFolder(fJavadev, "lib/javadom.dll"); + err = copy(src, fComponents); + src = getFolder(fJavadev, "lib/pluglet.dll"); + err = copy(src, fComponents); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_webclient_unix.js b/mozilla/java/build/install_webclient_unix.js new file mode 100644 index 00000000000..2212af0dafb --- /dev/null +++ b/mozilla/java/build/install_webclient_unix.js @@ -0,0 +1,74 @@ +// Installation guide for Webclient.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + +// this function creates a symlink +function symlink(lnk, tgt) +{ + var err = execute("symlink.sh", tgt + " " + lnk); + logComment("execute symlink.sh "+tgt+" "+lnk+" returned: "+err); +} + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("Webclient", "Webclient", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + symlink(fComponents + "libjavadom.so", + getFolder(fJavadev, "lib/libjavadom.so")); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/install_webclient_win32.js b/mozilla/java/build/install_webclient_win32.js new file mode 100644 index 00000000000..3f4d39e04b1 --- /dev/null +++ b/mozilla/java/build/install_webclient_win32.js @@ -0,0 +1,68 @@ +// Installation guide for Webclient.xpi + // this function verifies disk space in kilobytes + function verifyDiskSpace(dirPath, spaceRequired) + { + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); + } + + + // main + var srDest; + var err; + var fProgram; + + srDest = 1000; +logComment("Starting Install Process"); + err = initInstall("Webclient", "Webclient", "1.0"); + logComment("initInstall: " + err); + + fProgram = getFolder("Program"); + logComment("fProgram: " + fProgram); + + if(verifyDiskSpace(fProgram, srDest)) + { + setPackageFolder(fProgram); + err = addDirectory("", + "1.0", + "javadev", // dir name in jar to extract + fProgram, // Where to put this file + // (Returned from GetFolder) + "javadev", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + var fComponents = getFolder("Components"); + var fJavadev = getFolder("Program","javadev"); + src = getFolder(fJavadev, "lib/javadom.dll"); + err = copy(src, fComponents); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); + } + else + cancelInstall(INSUFFICIENT_DISK_SPACE); + + // end main diff --git a/mozilla/java/build/symlink.sh b/mozilla/java/build/symlink.sh new file mode 100644 index 00000000000..3024c8acf0c --- /dev/null +++ b/mozilla/java/build/symlink.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +#------------------------------------------------------- +# Hack to allow symlinking (required for Sun's JRE) in +# a zippy. +# +# usage: symlink.sh +# +#------------------------------------------------------- + +ln -s $1 $2 diff --git a/mozilla/java/webclient/classes_spec/Makefile.in b/mozilla/java/webclient/classes_spec/Makefile.in index 38b64f62f58..8a4e50d67c1 100644 --- a/mozilla/java/webclient/classes_spec/Makefile.in +++ b/mozilla/java/webclient/classes_spec/Makefile.in @@ -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 diff --git a/mozilla/java/webclient/classes_spec/Makefile.win b/mozilla/java/webclient/classes_spec/Makefile.win index f1b7a6c470e..92b650ccc57 100644 --- a/mozilla/java/webclient/classes_spec/Makefile.win +++ b/mozilla/java/webclient/classes_spec/Makefile.win @@ -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> \ No newline at end of file diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win index 65266f45502..72759fdc3ed 100644 --- a/mozilla/java/webclient/src_moz/Makefile.win +++ b/mozilla/java/webclient/src_moz/Makefile.win @@ -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