From ebde96a47c6513520f112c862f611753b69cde6c Mon Sep 17 00:00:00 2001 From: "ashuk%eng.sun.com" Date: Tue, 10 Oct 2000 18:51:16 +0000 Subject: [PATCH] author=ashuk Bug=54129 git-svn-id: svn://10.0.0.236/branches/JAVADEV_PR3_20001002@80839 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/Makefile.in | 14 ++++++++++++++ mozilla/java/webclient/classes_spec/Makefile.in | 1 - mozilla/java/webclient/src_moz/Makefile.in | 8 -------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/mozilla/java/Makefile.in b/mozilla/java/Makefile.in index 4d9e622c537..af95b4168c1 100644 --- a/mozilla/java/Makefile.in +++ b/mozilla/java/Makefile.in @@ -34,4 +34,18 @@ DIRS= util \ webclient \ $(NULL) +export:: unjar_dom + include $(topsrcdir)/config/rules.mk + +unjar_dom: + if test ! -d $(DEPTH)/dist/classes; \ + then mkdir $(DEPTH)/dist/classes; \ + fi; + cd $(DEPTH)/dist/classes; \ + $(JDKHOME)/bin/jar -xf ../../java/external/dom2.jar; \ + cd ../../java + +clobber_all:: + $(RM) -rf $(DEPTH)/dist/classes/org/w3c + diff --git a/mozilla/java/webclient/classes_spec/Makefile.in b/mozilla/java/webclient/classes_spec/Makefile.in index fb1cb62f9ad..f42f603359d 100644 --- a/mozilla/java/webclient/classes_spec/Makefile.in +++ b/mozilla/java/webclient/classes_spec/Makefile.in @@ -77,7 +77,6 @@ ifneq ($(PACKAGE_BUILD),) 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 -cvf blackwood.$(VERSION_NUMBER).jar org ; \ cp blackwood.$(VERSION_NUMBER).jar ../javadev/lib/blackwood.$(VERSION_NUMBER).jar ; cd $(topsrcdir)/dist/javadev/lib ; \ diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in index dc7a2fa8a18..249097f2c1b 100644 --- a/mozilla/java/webclient/src_moz/Makefile.in +++ b/mozilla/java/webclient/src_moz/Makefile.in @@ -135,10 +135,6 @@ else cp $(topsrcdir)/dist/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER) cp $(topsrcdir)/dist/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER) cp $(topsrcdir)/dist/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER) - cp $(topsrcdir)/dist/bin/components/libpluglet.so $(topsrcdir)/dist/bin/components/libpluglet.so.$(VERSION_NUMBER) - cp $(topsrcdir)/dist/bin/components/libjavadom.so $(topsrcdir)/dist/bin/components/libjavadom.so.$(VERSION_NUMBER) - rm -r $(topsrcdir)/dist/bin/components/libpluglet.so - rm -r $(topsrcdir)/dist/bin/components/libjavadom.so chmod 555 $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER) chmod 555 $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER) chmod 555 $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER) @@ -146,8 +142,6 @@ else chmod 555 $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER) chmod 555 $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER) chmod 555 $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER) - chmod 555 $(topsrcdir)/dist/bin/components/libpluglet.so.$(VERSION_NUMBER) - chmod 555 $(topsrcdir)/dist/bin/components/libjavadom.so.$(VERSION_NUMBER) if test ! -d $(PACKAGE_LIB)/libwc_share.a ; then ln -s libwc_share.a.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwc_share.a ; else true ; fi ; if test ! -d $(PACKAGE_LIB)/libwebclientstub.so ; then ln -s libwebclientstub.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclientstub.so ; else true ; fi ; if test ! -d $(PACKAGE_LIB)/libwebclient.so ; then ln -s libwebclient.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclient.so ; else true ; fi ; @@ -155,8 +149,6 @@ else if test ! -d $(PACKAGE_LIB)/libplugletjni.so ; then ln -s libplugletjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libplugletjni.so ; else true ; fi ; if test ! -d $(PACKAGE_LIB)/libpluglet.so ; then ln -s libpluglet.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libpluglet.so ; else true ; fi ; if test ! -d $(PACKAGE_LIB)/libjavadom.so ; then ln -s libjavadom.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadom.so ; else true ; fi ; - if test ! -d $(topsrcdir)/dist/bin/components/libpluglet.so ; then ln -s libpluglet.so.$(VERSION_NUMBER) $(topsrcdir)/dist/bin/components/libpluglet.so ; else true ; fi ; - if test ! -d $(topsrcdir)/dist/bin/components/libjavadom.so ; then ln -s libjavadom.so.$(VERSION_NUMBER) $(topsrcdir)/dist/bin/components/libjavadom.so ; else true ; fi ; if test ! -d $(PACKAGE_EXAMPLE)/runem ; then cp $(topsrcdir)/java/webclient/src_moz/runem $(PACKAGE_EXAMPLE)/runem ; else true ; fi ; if test ! -d $(PACKAGE_EXAMPLE)/runem.pl ; then cp $(topsrcdir)/java/webclient/src_share/runem_commercial.pl $(PACKAGE_EXAMPLE)/runem.pl ; else true ; fi ; chmod 755 $(PACKAGE_EXAMPLE)/runem.pl