hg/stx-libjava: changeset 2119:40d962f5c4ff

--- a/Make.proto	Fri Aug 12 18:31:06 2005 +0200
+++ b/Make.proto	Fri Aug 12 18:40:58 2005 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.9 2005-08-12 16:31:06 cg Exp $
+# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.10 2005-08-12 16:40:46 cg Exp $
 #
 # -- Make.proto created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:28'
 #
@@ -7,23 +7,6 @@
 # once you modify this file, do not rerun
 # stmkmp or recreate the Make.proto again - otherwise, your changes are lost.
 
-# module and directory-in-module;
-# these should correspond to the directory hierarchy
-# location (otherwise, ST/X will have a hard time to
-# find out the packages location from its packageID)
-MODULE=stx
-MODULE_DIR=libjava
-
-# default installation directory:
-# (overwrite with 'make INSTALLTOP_DIR=... install')
-# the INSTALLBASE is imported from configurations... and usually
-# defaults to something like /opt/smalltalk.
-# (overwrite with 'make INSTALLBASE=... install')
-INSTALLTOP_DIR=$(INSTALLBASE)/packages/$(MODULE)/$(MODULE_DIR)
-INSTALLLIB_DIR=$(INSTALLTOP_DIR)
-INSTALLBIN_DIR=$(INSTALLTOP_DIR)
-INSTALLED_LOAD_SCRIPTS=loadAll loadClasses
-
 #
 # position (of this package) in directory hierarchy:
 # (must point to ST/X top directory, for tools and includes)
@@ -37,22 +20,10 @@
 ALLSUBDIRS=examples
 
 
-# the name of your classLibrary:
-# ********** REQUIRED: CHECK the next line ***
-LIBNAME=libjava
-
-
 # the next define suppresses installation of
 # the classes as autoloaded (i.e. not added to abbrev.stc).
 SUPPRESS_LOCAL_ABBREVS=1
 
-# the package is stored as an ID in classes and methods
-# to identify code belonging to this project.
-# It also specifies the position in the source repository
-# and directory tree, when packages are loaded by packageID.
-# ********** REQUIRED: CHECK the next line ***
-PACKAGE=$(MODULE):$(MODULE_DIR)
-
 # Argument(s) to the stc compiler.
 #  -H.         : create header files locally
 #                (if removed, they will be created as common
@@ -108,54 +79,6 @@
 
 all:: preMake classLibRule postMake
 
-
-OBJS= \
-  JavaBehavior.$(O) \
-  JavaClass.$(O) \
-  Java.$(O) \
-  JavaRef.$(O) \
-  JavaClassRef.$(O) \
-  JavaClassReader.$(O) \
-  JavaClassPointerRef.$(O) \
-  JavaConstantPool.$(O) \
-  JavaContext.$(O) \
-  JavaExceptionTableEntry.$(O) \
-  JavaField.$(O) \
-  JavaFieldref.$(O) \
-  JavaMethodref.$(O) \
-  JavaLocalVariableTable.$(O) \
-  JavaLocalVariableTableEntry.$(O) \
-  JavaMethod.$(O) \
-  JavaMethodWithBreakpoint.$(O) \
-  JavaMethodWithException.$(O) \
-  JavaMethodWithHandler.$(O) \
-  JavaInterfaceMethodref.$(O) \
-  JavaNameandType.$(O) \
-  JavaNativeMethod.$(O) \
-  JavaObject.$(O) \
-  JavaProcess.$(O) \
-  JavaBuiltInClassPointerRef.$(O) \
-  JavaSlotIndexCache.$(O) \
-  JavaUnresolvedConstant.$(O) \
-  JavaUnresolvedClassConstant.$(O) \
-  JavaUnresolvedRefConstant.$(O) \
-  JavaUnresolvedMethodrefConstant.$(O) \
-  JavaUnresolvedInterfaceMethodrefConstant.$(O) \
-  JavaUnresolvedFieldrefConstant.$(O) \
-  JavaUnresolvedNameandTypeConstant.$(O) \
-  JavaUnresolvedSTArrayConstant.$(O) \
-  JavaUnresolvedStringConstant.$(O) \
-  JavaVM.$(O) \
-  JavaDecompiler.$(O) \
-  JavaByteCodeEnumerator.$(O) \
-  JavaView.$(O) \
-  JavaEmbeddedFrameView.$(O) \
-  JavaPopUpView.$(O) \
-  JavaTopView.$(O) \
-  UIGalleryJavaEntry.$(O) \
-  SmalltalkAppletContext.$(O) \
-  SmalltalkAppletStub.$(O)
-
 # add more install actions here
 install::

--- a/Make.spec	Fri Aug 12 18:31:06 2005 +0200
+++ b/Make.spec	Fri Aug 12 18:40:58 2005 +0200
@@ -1,259 +1,57 @@
-# $Header: /cvs/stx/stx/libjava/Make.spec,v 1.6 2011/08/18 18:42:48 vrany Exp $
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava.
+# $Header: /cvs/stx/stx/libjava/Make.spec,v 1.1 2005-08-12 16:40:58 cg Exp $
 #
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# This file contains specifications which are common to all platforms.
+# -- Make.proto created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:28'
 #
-
-# Do NOT CHANGE THESE DEFINITIONS
-# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
-#  to find the source code of a class and to find the library for a package)
 MODULE=stx
 MODULE_DIR=libjava
+LIBNAME=libjava
 PACKAGE=$(MODULE):$(MODULE_DIR)
 
 
-# Argument(s) to the stc compiler (stc --usage).
-#  -H.         : create header files locally
-#                (if removed, they will be created as common
-#  -Pxxx       : defines the package
-#  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
-#  -Ixxx       : include path passed to CC for inline C-code
-#  +optspace   : optimized for space
-#  +optspace2  : optimized more for space
-#  +optspace3  : optimized even more for space
-#  +optinline  : generate inline code for some ST constructs
-#  +inlineNew  : additionally inline new
-#  +inlineMath : additionally inline some floatPnt math stuff
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
-# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -warn            : no warnings
-#  -warnNonStandard : no warnings about ST/X extensions
-#  -warnEOLComments : no warnings about EOL comment extension
-#  -warnPrivacy     : no warnings about privateClass extension
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCWARNINGS=-warn
-# STCWARNINGS=-warnNonStandard
-# STCWARNINGS=-warnEOLComments
-STCWARNINGS=-warnNonStandard
-
-COMMON_CLASSES= \
-	Byte \
-	Java \
-	JavaAnnotation \
-	JavaAnnotationContainer \
-	JavaAnnotationDefault \
-	JavaAnnotationDictionary \
-	JavaAnnotationValue \
-	JavaArray \
-	JavaBehavior \
-	JavaByteCodeProcessor \
-	JavaClassReader \
-	JavaConstantPool \
-	JavaContext \
-	JavaDecompiler \
-	JavaDescriptor \
-	JavaError \
-	JavaEvaluator \
-	JavaExceptionTableEntry \
-	JavaField \
-	JavaInflater \
-	JavaJavadocNode \
-	JavaLanguage \
-	JavaLibraries \
-	JavaLocalVariableTable \
-	JavaLocalVariableTableEntry \
-	JavaLookup \
-	JavaMethod \
-	JavaNameAndType2 \
-	JavaNativeMemory \
-	JavaNode \
-	JavaObject \
-	JavaObjectDictionary \
-	JavaPackage \
-	JavaParseResult \
-	JavaPopUpView \
-	JavaProcess \
-	JavaRef2 \
-	JavaRelease \
-	JavaResolver \
-	JavaSlotIndexCache \
-	JavaSourceCodeCache \
-	JavaSourceFileWriter \
-	JavaStartup \
-	JavaTestsLoader \
-	JavaTopView \
-	JavaUnresolvedConstant \
-	JavaVM \
-	JavaView \
-	PPJavaNode \
-	Short \
-	SmalltalkAppletContext \
-	SmalltalkAppletStub \
-	stx_libjava \
-	JavaAnnotationArrayValue \
-	JavaAnnotationClassValue \
-	JavaAnnotationEnumValue \
-	JavaAnnotationNestedAnnotationValue \
-	JavaAnnotationPrimitiveValue \
-	JavaByteCodeDisassembler \
-	JavaByteCodeEnumerator \
-	JavaByteCodeInterpreter \
-	JavaClass \
-	JavaClassAnnotationContainer \
-	JavaClassContentRef2 \
-	JavaClassRef2 \
-	JavaEmbeddedFrameView \
-	JavaFieldAnnotationContainer \
-	JavaFieldDescriptor \
-	JavaFormalParameterNode \
-	JavaInvalidRefError \
-	JavaMethodAnnotationContainer \
-	JavaMethodDeclarationNode \
-	JavaMethodDeclaratorNode \
-	JavaMethodDescriptor \
-	JavaMethodNode \
-	JavaMethodWithException \
-	JavaParser \
-	JavaStringRef2 \
-	JavaTypeNode \
-	JavaUnhandledExceptionError \
-	JavaUnresolvedClassConstant \
-	JavaUnresolvedStringConstant \
-	JavadocDeclarationNode \
-	JavaArrayTypeNode \
-	JavaBooleanTypeNode \
-	JavaBothOldAndNewClassRef \
-	JavaByteCodeSteppableInterpreter \
-	JavaCharTypeNode \
-	JavaClassOrInterfaceTypeNode \
-	JavaDoubleTypeNode \
-	JavaFieldRef2 \
-	JavaFloatTypeNode \
-	JavaIntTypeNode \
-	JavaLongTypeNode \
-	JavaMethodRef2 \
-	JavaMethodWithHandler \
-	JavaVoidTypeNode \
-	JavaInterfaceMethodRef2 \
-	JavaNativeMethod \
-
-
-
-
-COMMON_OBJS= \
-    $(OUTDIR)Byte.$(O) \
-    $(OUTDIR)Java.$(O) \
-    $(OUTDIR)JavaAnnotation.$(O) \
-    $(OUTDIR)JavaAnnotationContainer.$(O) \
-    $(OUTDIR)JavaAnnotationDefault.$(O) \
-    $(OUTDIR)JavaAnnotationDictionary.$(O) \
-    $(OUTDIR)JavaAnnotationValue.$(O) \
-    $(OUTDIR)JavaArray.$(O) \
-    $(OUTDIR)JavaBehavior.$(O) \
-    $(OUTDIR)JavaByteCodeProcessor.$(O) \
-    $(OUTDIR)JavaClassReader.$(O) \
-    $(OUTDIR)JavaConstantPool.$(O) \
-    $(OUTDIR)JavaContext.$(O) \
-    $(OUTDIR)JavaDecompiler.$(O) \
-    $(OUTDIR)JavaDescriptor.$(O) \
-    $(OUTDIR)JavaError.$(O) \
-    $(OUTDIR)JavaEvaluator.$(O) \
-    $(OUTDIR)JavaExceptionTableEntry.$(O) \
-    $(OUTDIR)JavaField.$(O) \
-    $(OUTDIR)JavaInflater.$(O) \
-    $(OUTDIR)JavaJavadocNode.$(O) \
-    $(OUTDIR)JavaLanguage.$(O) \
-    $(OUTDIR)JavaLibraries.$(O) \
-    $(OUTDIR)JavaLocalVariableTable.$(O) \
-    $(OUTDIR)JavaLocalVariableTableEntry.$(O) \
-    $(OUTDIR)JavaLookup.$(O) \
-    $(OUTDIR)JavaMethod.$(O) \
-    $(OUTDIR)JavaNameAndType2.$(O) \
-    $(OUTDIR)JavaNativeMemory.$(O) \
-    $(OUTDIR)JavaNode.$(O) \
-    $(OUTDIR)JavaObject.$(O) \
-    $(OUTDIR)JavaObjectDictionary.$(O) \
-    $(OUTDIR)JavaPackage.$(O) \
-    $(OUTDIR)JavaParseResult.$(O) \
-    $(OUTDIR)JavaPopUpView.$(O) \
-    $(OUTDIR)JavaProcess.$(O) \
-    $(OUTDIR)JavaRef2.$(O) \
-    $(OUTDIR)JavaRelease.$(O) \
-    $(OUTDIR)JavaResolver.$(O) \
-    $(OUTDIR)JavaSlotIndexCache.$(O) \
-    $(OUTDIR)JavaSourceCodeCache.$(O) \
-    $(OUTDIR)JavaSourceFileWriter.$(O) \
-    $(OUTDIR)JavaStartup.$(O) \
-    $(OUTDIR)JavaTestsLoader.$(O) \
-    $(OUTDIR)JavaTopView.$(O) \
-    $(OUTDIR)JavaUnresolvedConstant.$(O) \
-    $(OUTDIR)JavaVM.$(O) \
-    $(OUTDIR)JavaView.$(O) \
-    $(OUTDIR)PPJavaNode.$(O) \
-    $(OUTDIR)Short.$(O) \
-    $(OUTDIR)SmalltalkAppletContext.$(O) \
-    $(OUTDIR)SmalltalkAppletStub.$(O) \
-    $(OUTDIR)stx_libjava.$(O) \
-    $(OUTDIR)JavaAnnotationArrayValue.$(O) \
-    $(OUTDIR)JavaAnnotationClassValue.$(O) \
-    $(OUTDIR)JavaAnnotationEnumValue.$(O) \
-    $(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) \
-    $(OUTDIR)JavaAnnotationPrimitiveValue.$(O) \
-    $(OUTDIR)JavaByteCodeDisassembler.$(O) \
-    $(OUTDIR)JavaByteCodeEnumerator.$(O) \
-    $(OUTDIR)JavaByteCodeInterpreter.$(O) \
-    $(OUTDIR)JavaClass.$(O) \
-    $(OUTDIR)JavaClassAnnotationContainer.$(O) \
-    $(OUTDIR)JavaClassContentRef2.$(O) \
-    $(OUTDIR)JavaClassRef2.$(O) \
-    $(OUTDIR)JavaEmbeddedFrameView.$(O) \
-    $(OUTDIR)JavaFieldAnnotationContainer.$(O) \
-    $(OUTDIR)JavaFieldDescriptor.$(O) \
-    $(OUTDIR)JavaFormalParameterNode.$(O) \
-    $(OUTDIR)JavaInvalidRefError.$(O) \
-    $(OUTDIR)JavaMethodAnnotationContainer.$(O) \
-    $(OUTDIR)JavaMethodDeclarationNode.$(O) \
-    $(OUTDIR)JavaMethodDeclaratorNode.$(O) \
-    $(OUTDIR)JavaMethodDescriptor.$(O) \
-    $(OUTDIR)JavaMethodNode.$(O) \
-    $(OUTDIR)JavaMethodWithException.$(O) \
-    $(OUTDIR)JavaParser.$(O) \
-    $(OUTDIR)JavaStringRef2.$(O) \
-    $(OUTDIR)JavaTypeNode.$(O) \
-    $(OUTDIR)JavaUnhandledExceptionError.$(O) \
-    $(OUTDIR)JavaUnresolvedClassConstant.$(O) \
-    $(OUTDIR)JavaUnresolvedStringConstant.$(O) \
-    $(OUTDIR)JavadocDeclarationNode.$(O) \
-    $(OUTDIR)JavaArrayTypeNode.$(O) \
-    $(OUTDIR)JavaBooleanTypeNode.$(O) \
-    $(OUTDIR)JavaBothOldAndNewClassRef.$(O) \
-    $(OUTDIR)JavaByteCodeSteppableInterpreter.$(O) \
-    $(OUTDIR)JavaCharTypeNode.$(O) \
-    $(OUTDIR)JavaClassOrInterfaceTypeNode.$(O) \
-    $(OUTDIR)JavaDoubleTypeNode.$(O) \
-    $(OUTDIR)JavaFieldRef2.$(O) \
-    $(OUTDIR)JavaFloatTypeNode.$(O) \
-    $(OUTDIR)JavaIntTypeNode.$(O) \
-    $(OUTDIR)JavaLongTypeNode.$(O) \
-    $(OUTDIR)JavaMethodRef2.$(O) \
-    $(OUTDIR)JavaMethodWithHandler.$(O) \
-    $(OUTDIR)JavaVoidTypeNode.$(O) \
-    $(OUTDIR)JavaInterfaceMethodRef2.$(O) \
-    $(OUTDIR)JavaNativeMethod.$(O) \
-    $(OUTDIR)extensions.$(O) \
-
-
-
+OBJS= \
+  $(OUTDIR)JavaBehavior.$(O) \
+  $(OUTDIR)JavaClass.$(O) \
+  $(OUTDIR)Java.$(O) \
+  $(OUTDIR)JavaRef.$(O) \
+  $(OUTDIR)JavaClassRef.$(O) \
+  $(OUTDIR)JavaClassReader.$(O) \
+  $(OUTDIR)JavaClassPointerRef.$(O) \
+  $(OUTDIR)JavaConstantPool.$(O) \
+  $(OUTDIR)JavaContext.$(O) \
+  $(OUTDIR)JavaExceptionTableEntry.$(O) \
+  $(OUTDIR)JavaField.$(O) \
+  $(OUTDIR)JavaFieldref.$(O) \
+  $(OUTDIR)JavaMethodref.$(O) \
+  $(OUTDIR)JavaLocalVariableTable.$(O) \
+  $(OUTDIR)JavaLocalVariableTableEntry.$(O) \
+  $(OUTDIR)JavaMethod.$(O) \
+  $(OUTDIR)JavaMethodWithBreakpoint.$(O) \
+  $(OUTDIR)JavaMethodWithException.$(O) \
+  $(OUTDIR)JavaMethodWithHandler.$(O) \
+  $(OUTDIR)JavaInterfaceMethodref.$(O) \
+  $(OUTDIR)JavaNameandType.$(O) \
+  $(OUTDIR)JavaNativeMethod.$(O) \
+  $(OUTDIR)JavaObject.$(O) \
+  $(OUTDIR)JavaProcess.$(O) \
+  $(OUTDIR)JavaBuiltInClassPointerRef.$(O) \
+  $(OUTDIR)JavaSlotIndexCache.$(O) \
+  $(OUTDIR)JavaUnresolvedConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedClassConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedRefConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedMethodrefConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedInterfaceMethodrefConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedFieldrefConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedNameandTypeConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedSTArrayConstant.$(O) \
+  $(OUTDIR)JavaUnresolvedStringConstant.$(O) \
+  $(OUTDIR)JavaVM.$(O) \
+  $(OUTDIR)JavaTopView.$(O) \
+  $(OUTDIR)JavaPopUpView.$(O) \
+  $(OUTDIR)SmalltalkAppletContext.$(O) \
+  $(OUTDIR)SmalltalkAppletStub.$(O) \
+  $(OUTDIR)JavaAppletComponentSpec.$(O) \
+  $(OUTDIR)UIGalleryJavaEntry.$(O) \
+  $(OUTDIR)JavaView.$(O) \
+  $(OUTDIR)JavaDecompiler.$(O) \
+  $(OUTDIR)JavaByteCodeEnumerator.$(O) \
+  $(OUTDIR)JavaEmbeddedFrameView.$(O)

--- a/bc.mak	Fri Aug 12 18:31:06 2005 +0200
+++ b/bc.mak	Fri Aug 12 18:40:58 2005 +0200
@@ -1,19 +1,12 @@
-# $Header: /cvs/stx/stx/libjava/bc.mak,v 1.6 2003-11-21 15:04:41 cg Exp $
+# $Header: /cvs/stx/stx/libjava/bc.mak,v 1.7 2005-08-12 16:40:46 cg Exp $
 #
-# -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'                     
+# -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'
 #
 # Warning: YOU SHOULD NOT MODIFY THIS FILE - MODIFY THE .prj FILE INSTEAD
 # and let the ProjectBrowser recreate this file.
-# once you modify this file, do not recreate nt.mak again 
+# once you modify this file, do not recreate nt.mak again
 # - otherwise, your changes are lost.
 
-# module and directory-in-module;
-# these should correspond to the directory hierarchy
-# location (otherwise, ST/X will have a hard time to
-# find out the packages location from its packageID)
-MODULE=stx
-MODULE_DIR=libjava
-
 # default installation directory:
 # (overwrite with 'make INSTALLTOP_DIR=... install')
 # the INSTALLBASE is imported from configurations... and usually
@@ -28,6 +21,8 @@
 # (must point to ST/X top directory, for tools and includes)
 TOP=..
 
+#
+!INCLUDE Make.spec
 !INCLUDE "$(TOP)\rules\stdHeader_nt"
 
 # subdirectories where targets are to be made:
@@ -37,24 +32,12 @@
 # (only define if different from SUBDIRS)
 # ALLSUBDIRS=
 
-
-# the name of your classLibrary:
-# ********** REQUIRED: CHECK the next line ***
-LIBNAME=libjava
-
 LIB_BASE_LD_ARG=$(LIBJAVA_BASE_LD_ARG)
 
-# the next define suppresses installation of 
-# the classes as autoloaded (i.e. not added to abbrev.stc). 
+# the next define suppresses installation of
+# the classes as autoloaded (i.e. not added to abbrev.stc).
 SUPPRESS_LOCAL_ABBREVS=1
 
-# the package is stored as an ID in classes and methods
-# to identify code belonging to this project.
-# It also specifies the position in the source repository
-# and directory tree, when packages are loaded by packageID.
-# ********** REQUIRED: CHECK the next line ***
-PACKAGE=$(MODULE):$(MODULE_DIR)
-
 # Argument(s) to the stc compiler.
 #  -H.         : create header files locally
 #                (if removed, they will be created as common
@@ -84,16 +67,16 @@
 # STCWARNINGS=-warn
 # STCWARNINGS=-warnNonStandard
 # STCWARNINGS=-warnEOLComments
-STCWARNINGS=-warnEOLComments 
+STCWARNINGS=-warnEOLComments
 
-# if your embedded C code requires any system includes, 
-# add the path(es) here:, 
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
 LOCALINCLUDES=
 
-# if you need any additional defines for embedded C code, 
-# add them here:, 
+# if you need any additional defines for embedded C code,
+# add them here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
@@ -111,54 +94,6 @@
 #ALL:: preMake $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll postMake
 ALL:: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
 
-
-OBJS= \
-  $(OUTDIR)JavaClass.$(O) \
-  $(OUTDIR)Java.$(O) \
-  $(OUTDIR)JavaRef.$(O) \
-  $(OUTDIR)JavaClassRef.$(O) \
-  $(OUTDIR)JavaClassReader.$(O) \
-  $(OUTDIR)JavaClassPointerRef.$(O) \
-  $(OUTDIR)JavaConstantPool.$(O) \
-  $(OUTDIR)JavaContext.$(O) \
-  $(OUTDIR)JavaExceptionTableEntry.$(O) \
-  $(OUTDIR)JavaField.$(O) \
-  $(OUTDIR)JavaFieldref.$(O) \
-  $(OUTDIR)JavaMethodref.$(O) \
-  $(OUTDIR)JavaLocalVariableTable.$(O) \
-  $(OUTDIR)JavaLocalVariableTableEntry.$(O) \
-  $(OUTDIR)JavaMethod.$(O) \
-  $(OUTDIR)JavaMethodWithBreakpoint.$(O) \
-  $(OUTDIR)JavaMethodWithException.$(O) \
-  $(OUTDIR)JavaMethodWithHandler.$(O) \
-  $(OUTDIR)JavaInterfaceMethodref.$(O) \
-  $(OUTDIR)JavaNameandType.$(O) \
-  $(OUTDIR)JavaNativeMethod.$(O) \
-  $(OUTDIR)JavaObject.$(O) \
-  $(OUTDIR)JavaProcess.$(O) \
-  $(OUTDIR)JavaBuiltInClassPointerRef.$(O) \
-  $(OUTDIR)JavaSlotIndexCache.$(O) \
-  $(OUTDIR)JavaUnresolvedConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedClassConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedRefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedMethodrefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedInterfaceMethodrefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedFieldrefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedNameandTypeConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedSTArrayConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedStringConstant.$(O) \
-  $(OUTDIR)JavaVM.$(O) \
-  $(OUTDIR)JavaTopView.$(O) \
-  $(OUTDIR)JavaPopUpView.$(O) \
-  $(OUTDIR)SmalltalkAppletContext.$(O) \
-  $(OUTDIR)SmalltalkAppletStub.$(O) \
-  $(OUTDIR)JavaAppletComponentSpec.$(O) \
-  $(OUTDIR)UIGalleryJavaEntry.$(O) \
-  $(OUTDIR)JavaView.$(O) \
-  $(OUTDIR)JavaDecompiler.$(O) \
-  $(OUTDIR)JavaByteCodeEnumerator.$(O) \
-  $(OUTDIR)JavaEmbeddedFrameView.$(O)
-
 # add more preMake actions here
 preMake:

--- a/nt.mak	Fri Aug 12 18:31:06 2005 +0200
+++ b/nt.mak	Fri Aug 12 18:40:58 2005 +0200
@@ -1,19 +1,12 @@
-# $Header: /cvs/stx/stx/libjava/Attic/nt.mak,v 1.6 2003-11-21 15:04:41 cg Exp $
+# $Header: /cvs/stx/stx/libjava/Attic/nt.mak,v 1.7 2005-08-12 16:40:46 cg Exp $
 #
-# -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'                     
+# -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'
 #
 # Warning: YOU SHOULD NOT MODIFY THIS FILE - MODIFY THE .prj FILE INSTEAD
 # and let the ProjectBrowser recreate this file.
-# once you modify this file, do not recreate nt.mak again 
+# once you modify this file, do not recreate nt.mak again
 # - otherwise, your changes are lost.
 
-# module and directory-in-module;
-# these should correspond to the directory hierarchy
-# location (otherwise, ST/X will have a hard time to
-# find out the packages location from its packageID)
-MODULE=stx
-MODULE_DIR=libjava
-
 # default installation directory:
 # (overwrite with 'make INSTALLTOP_DIR=... install')
 # the INSTALLBASE is imported from configurations... and usually
@@ -28,6 +21,8 @@
 # (must point to ST/X top directory, for tools and includes)
 TOP=..
 
+#
+!INCLUDE Make.spec
 !INCLUDE "$(TOP)\rules\stdHeader_nt"
 
 # subdirectories where targets are to be made:
@@ -37,24 +32,12 @@
 # (only define if different from SUBDIRS)
 # ALLSUBDIRS=
 
-
-# the name of your classLibrary:
-# ********** REQUIRED: CHECK the next line ***
-LIBNAME=libjava
-
 LIB_BASE_LD_ARG=$(LIBJAVA_BASE_LD_ARG)
 
-# the next define suppresses installation of 
-# the classes as autoloaded (i.e. not added to abbrev.stc). 
+# the next define suppresses installation of
+# the classes as autoloaded (i.e. not added to abbrev.stc).
 SUPPRESS_LOCAL_ABBREVS=1
 
-# the package is stored as an ID in classes and methods
-# to identify code belonging to this project.
-# It also specifies the position in the source repository
-# and directory tree, when packages are loaded by packageID.
-# ********** REQUIRED: CHECK the next line ***
-PACKAGE=$(MODULE):$(MODULE_DIR)
-
 # Argument(s) to the stc compiler.
 #  -H.         : create header files locally
 #                (if removed, they will be created as common
@@ -84,16 +67,16 @@
 # STCWARNINGS=-warn
 # STCWARNINGS=-warnNonStandard
 # STCWARNINGS=-warnEOLComments
-STCWARNINGS=-warnEOLComments 
+STCWARNINGS=-warnEOLComments
 
-# if your embedded C code requires any system includes, 
-# add the path(es) here:, 
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
 LOCALINCLUDES=
 
-# if you need any additional defines for embedded C code, 
-# add them here:, 
+# if you need any additional defines for embedded C code,
+# add them here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
@@ -111,54 +94,6 @@
 #ALL:: preMake $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll postMake
 ALL:: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
 
-
-OBJS= \
-  $(OUTDIR)JavaClass.$(O) \
-  $(OUTDIR)Java.$(O) \
-  $(OUTDIR)JavaRef.$(O) \
-  $(OUTDIR)JavaClassRef.$(O) \
-  $(OUTDIR)JavaClassReader.$(O) \
-  $(OUTDIR)JavaClassPointerRef.$(O) \
-  $(OUTDIR)JavaConstantPool.$(O) \
-  $(OUTDIR)JavaContext.$(O) \
-  $(OUTDIR)JavaExceptionTableEntry.$(O) \
-  $(OUTDIR)JavaField.$(O) \
-  $(OUTDIR)JavaFieldref.$(O) \
-  $(OUTDIR)JavaMethodref.$(O) \
-  $(OUTDIR)JavaLocalVariableTable.$(O) \
-  $(OUTDIR)JavaLocalVariableTableEntry.$(O) \
-  $(OUTDIR)JavaMethod.$(O) \
-  $(OUTDIR)JavaMethodWithBreakpoint.$(O) \
-  $(OUTDIR)JavaMethodWithException.$(O) \
-  $(OUTDIR)JavaMethodWithHandler.$(O) \
-  $(OUTDIR)JavaInterfaceMethodref.$(O) \
-  $(OUTDIR)JavaNameandType.$(O) \
-  $(OUTDIR)JavaNativeMethod.$(O) \
-  $(OUTDIR)JavaObject.$(O) \
-  $(OUTDIR)JavaProcess.$(O) \
-  $(OUTDIR)JavaBuiltInClassPointerRef.$(O) \
-  $(OUTDIR)JavaSlotIndexCache.$(O) \
-  $(OUTDIR)JavaUnresolvedConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedClassConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedRefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedMethodrefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedInterfaceMethodrefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedFieldrefConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedNameandTypeConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedSTArrayConstant.$(O) \
-  $(OUTDIR)JavaUnresolvedStringConstant.$(O) \
-  $(OUTDIR)JavaVM.$(O) \
-  $(OUTDIR)JavaTopView.$(O) \
-  $(OUTDIR)JavaPopUpView.$(O) \
-  $(OUTDIR)SmalltalkAppletContext.$(O) \
-  $(OUTDIR)SmalltalkAppletStub.$(O) \
-  $(OUTDIR)JavaAppletComponentSpec.$(O) \
-  $(OUTDIR)UIGalleryJavaEntry.$(O) \
-  $(OUTDIR)JavaView.$(O) \
-  $(OUTDIR)JavaDecompiler.$(O) \
-  $(OUTDIR)JavaByteCodeEnumerator.$(O) \
-  $(OUTDIR)JavaEmbeddedFrameView.$(O)
-
 # add more preMake actions here
 preMake:

author	Claus Gittinger <cg@exept.de>
	Fri, 12 Aug 2005 18:40:58 +0200
changeset 2119	40d962f5c4ff
parent 2118	b73d5b8e93c0
child 2120	f9753234787f

Make.proto		file \| annotate \| diff \| comparison \| revisions
Make.spec		file \| annotate \| diff \| comparison \| revisions
bc.mak		file \| annotate \| diff \| comparison \| revisions
nt.mak		file \| annotate \| diff \| comparison \| revisions