Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorcg
Tue, 21 Dec 1999 12:55:34 +0000
changeset 634 c5a9d34c6ae5
parent 633 707c66af2d96
child 635 9338001263e0
*** empty log message ***
Make.proto file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
loadAll file | annotate | diff | comparison | revisions
loadClasses file | annotate | diff | comparison | revisions
nt.mak file | annotate | diff | comparison | revisions 
--- a/Make.proto	Tue Dec 21 12:45:13 1999 +0000
+++ b/Make.proto	Tue Dec 21 12:55:34 1999 +0000
@@ -1,4 +1,4 @@
-# $Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Make.proto,v 1.5 1999/12/21 12:45:10 cg Exp $
+# $Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Make.proto,v 1.6 1999/12/21 12:54:58 cg Exp $
 #
 # -- Make.proto created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:28'                     
 #
@@ -158,7 +158,18 @@
 install::
 
 # add more install actions for aux-files (resources) here
-installAux::
+installAux::  installJava
+
+$(INSTALLLIB_DIR)/java:: $(INSTALLLIB_DIR)
+	test -d $(INSTALLLIB_DIR)/java || mkdir $(INSTALLLIB_DIR)/java
+
+installJava:: $(INSTALLLIB_DIR)/java
+	@if [ "$(VERBOSE)"x != "x" ]; then \
+	    echo "installing java..."; \
+	fi
+	-(tar cf - java | (cd $(INSTALLLIB_DIR) ; tar xf -))
+	@-( find $(INSTALLLIB_DIR)/fonts -name 'CVS' -exec rm -rf {} \;             ) 2>/dev/null
+	@-( find $(INSTALLLIB_DIR)/fonts -name 'not_delivered' -exec rm -rf {} \;   ) 2>/dev/null
 
 # add more preMake actions here
 preMake::
--- a/bc.mak	Tue Dec 21 12:45:13 1999 +0000
+++ b/bc.mak	Tue Dec 21 12:55:34 1999 +0000
@@ -1,4 +1,4 @@
-# $Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/bc.mak,v 1.3 1999/12/21 12:45:13 cg Exp $
+# $Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/bc.mak,v 1.4 1999/12/21 12:54:59 cg Exp $
 #
 # -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'                     
 #
@@ -153,16 +153,10 @@
   $(OUTDIR)SmalltalkAppletContext.$(O) \
   $(OUTDIR)SmalltalkAppletStub.$(O) \
   $(OUTDIR)JavaAppletComponentSpec.$(O) \
-  $(OUTDIR)UIGalleryJavaEntry.$(O)
+  $(OUTDIR)UIGalleryJavaEntry.$(O) \
   $(OUTDIR)JavaView.$(O) \
   $(OUTDIR)JavaEmbeddedFrameView.$(O)
 
-# add more install actions here
-install:
-
-# add more install actions for aux-files (resources) here
-installAux:
-
 # add more preMake actions here
 preMake:
 
--- a/loadAll	Tue Dec 21 12:45:13 1999 +0000
+++ b/loadAll	Tue Dec 21 12:55:34 1999 +0000
@@ -11,15 +11,24 @@
 JavaVM initializeVM.
 !
 
+|p|
+
 (Java classForName:'netscape.applet.MozillaAppletContext') isNil ifTrue:[
-    '../../../cg/java/java/ns30_unix.zip' asFilename exists ifTrue:[
-	Java addToClassPath:'../../../cg/java/java/ns30_unix.zip'.
-    ].
-    '../../cg/java/java/ns30_unix.zip' asFilename exists ifTrue:[
-	Java addToClassPath:'../../cg/java/java/ns30_unix.zip'.
-    ].
-    'C:\Programme\work\cg\java\java\ns30_unix.zip' asFilename exists ifTrue:[
-	Java addToClassPath:'C:\Programme\work\cg\java\java\ns30_unix.zip'.
+    (p := Smalltalk getResourceFileName:'java/ns30_unix.zip' forPackage:'stx:libjava') notNil
+    ifTrue:[
+	Java addToClassPath:p.
+    ] ifFalse:[
+	'../../libjava/java/java/ns30_unix.zip' asFilename exists ifTrue:[
+	    Java addToClassPath:'../../../cg/java/java/ns30_unix.zip'.
+	] ifFalse:[
+	    '../../cg/java/java/ns30_unix.zip' asFilename exists ifTrue:[
+		Java addToClassPath:'../../cg/java/java/ns30_unix.zip'.
+	    ] ifFalse:[
+		'C:\Programme\work\cg\java\java\ns30_unix.zip' asFilename exists ifTrue:[
+		    Java addToClassPath:'C:\Programme\work\cg\java\java\ns30_unix.zip'.
+		 ]
+	     ]
+	]
     ]
 ].
 !
--- a/loadClasses	Tue Dec 21 12:45:13 1999 +0000
+++ b/loadClasses	Tue Dec 21 12:55:34 1999 +0000
@@ -52,12 +52,13 @@
 	'JavaUnresolvedNameandTypeConstant'
 	'JavaUnresolvedStringConstant'
 
-"/	'JavaView'
-"/	'JavaTopView'
-"/	'JavaPopUpView'
-"/	'JavaEmbeddedFrameView'
+	'JavaView'
+	'JavaTopView'
+	'JavaPopUpView'
+	'JavaEmbeddedFrameView'
 
-	'JavaDeparser'   
+	'SmalltalkAppletContext'
+	'SmalltalkAppletStub'   
 ).
 
 (Smalltalk loadClassLibraryIfAbsent:'libjava') ifTrue:[
@@ -84,7 +85,7 @@
   ].
   ' ' printCR.
 ].
-'done.' printCR.
+'done (stx:libjava).' printCR.
 !
 
 
--- a/nt.mak	Tue Dec 21 12:45:13 1999 +0000
+++ b/nt.mak	Tue Dec 21 12:55:34 1999 +0000
@@ -1,4 +1,4 @@
-# $Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Attic/nt.mak,v 1.3 1999/12/21 12:45:13 cg Exp $
+# $Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Attic/nt.mak,v 1.4 1999/12/21 12:54:59 cg Exp $
 #
 # -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'                     
 #
@@ -153,16 +153,10 @@
   $(OUTDIR)SmalltalkAppletContext.$(O) \
   $(OUTDIR)SmalltalkAppletStub.$(O) \
   $(OUTDIR)JavaAppletComponentSpec.$(O) \
-  $(OUTDIR)UIGalleryJavaEntry.$(O)
+  $(OUTDIR)UIGalleryJavaEntry.$(O) \
   $(OUTDIR)JavaView.$(O) \
   $(OUTDIR)JavaEmbeddedFrameView.$(O)
 
-# add more install actions here
-install:
-
-# add more install actions for aux-files (resources) here
-installAux:
-
 # add more preMake actions here
 preMake:
hg/stx-libjava