diff --git a/ApplicationScripting/Source/GNUmakefile b/ApplicationScripting/Source/GNUmakefile index 2f85437..972f4b4 100644 --- a/ApplicationScripting/Source/GNUmakefile +++ b/ApplicationScripting/Source/GNUmakefile @@ -36,7 +36,9 @@ ApplicationScripting_OBJC_FILES = \ NSTextView+ScriptExecution.m \ STTranscript.m -ApplicationScripting_BUNDLE_LIBS += -lStepTalk $(GUI_LIBS) +ADDITIONAL_BUNDLE_LIBS = -lStepTalk $(GUI_LIBS) +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) ApplicationScripting_LANGUAGES = English diff --git a/ChangeLog b/ChangeLog index 927231b..8d46eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * Frameworks: new directory * Changed StepTalk from library to framework + * Modules: Removed StepTalk module as it is no more needed, because + we have framework and it can provide scripting capabilities by it self + * All GNUMakefiles modified to reflect change to Framework 2003 Aug 5 Stefan Urbanek diff --git a/Documentation/Reference/NSInvocation+additions.html b/Documentation/Reference/NSInvocation+additions.html index 7a47c99..2907fb3 100644 --- a/Documentation/Reference/NSInvocation+additions.html +++ b/Documentation/Reference/NSInvocation+additions.html @@ -9,9 +9,7 @@

NSInvocation class additions

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STBundleInfo.html b/Documentation/Reference/STBundleInfo.html index fc87d5b..3572a98 100644 --- a/Documentation/Reference/STBundleInfo.html +++ b/Documentation/Reference/STBundleInfo.html @@ -9,9 +9,7 @@

STBundleInfo class documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STEnvironment.html b/Documentation/Reference/STEnvironment.html index 034b00b..b3f494e 100644 --- a/Documentation/Reference/STEnvironment.html +++ b/Documentation/Reference/STEnvironment.html @@ -9,9 +9,7 @@

STEnvironment class reference

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STExterns.html b/Documentation/Reference/STExterns.html index cbd889e..0cd67a6 100644 --- a/Documentation/Reference/STExterns.html +++ b/Documentation/Reference/STExterns.html @@ -9,9 +9,7 @@

STExterns autogsdoc generated documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STFunctions.html b/Documentation/Reference/STFunctions.html index bcb2aca..4c0d7d7 100644 --- a/Documentation/Reference/STFunctions.html +++ b/Documentation/Reference/STFunctions.html @@ -9,9 +9,7 @@

STFunctions autogsdoc generated documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STLanguage.html b/Documentation/Reference/STLanguage.html index 3fea006..016806c 100644 --- a/Documentation/Reference/STLanguage.html +++ b/Documentation/Reference/STLanguage.html @@ -9,9 +9,7 @@

STLanguage class documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
@@ -72,7 +70,7 @@ Returns the name of default scripting language specified by the STDefaultLanguageName default. - If there is no such default in user's defaults database, + If there is no such default in user's defaults database, then Smalltalk is used.

diff --git a/Documentation/Reference/STObjectReference.html b/Documentation/Reference/STObjectReference.html index 81920b7..414c5fa 100644 --- a/Documentation/Reference/STObjectReference.html +++ b/Documentation/Reference/STObjectReference.html @@ -9,9 +9,7 @@

STObjectReference class documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STScript.html b/Documentation/Reference/STScript.html index 5a6068c..5749cee 100644 --- a/Documentation/Reference/STScript.html +++ b/Documentation/Reference/STScript.html @@ -9,9 +9,7 @@

STScript class documentation

Authors

-
Stefan Urbanek( - stefanurbanek@yahoo.fr - )
+
Stefan Urbanek (stefanurbanek@yahoo.fr)
@@ -76,8 +74,8 @@ - (id) initWithFile: (NSString*)aFile;

- Create a new script from file aFile>. - Script information will be read from 'aFile.stinfo' + Create a new script from file aFile>. + Script information will be read from 'aFile.stinfo' file containing a dictionary property list.

diff --git a/Documentation/Reference/STScripting.html b/Documentation/Reference/STScripting.html index 89428d3..b898198 100644 --- a/Documentation/Reference/STScripting.html +++ b/Documentation/Reference/STScripting.html @@ -9,9 +9,7 @@

STScripting protocol documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STScriptsManager.html b/Documentation/Reference/STScriptsManager.html index 02b697b..bd1dadb 100644 --- a/Documentation/Reference/STScriptsManager.html +++ b/Documentation/Reference/STScriptsManager.html @@ -9,9 +9,7 @@

STScriptsManager class documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/STUndefinedObject.html b/Documentation/Reference/STUndefinedObject.html index d8b485a..42634f9 100644 --- a/Documentation/Reference/STUndefinedObject.html +++ b/Documentation/Reference/STUndefinedObject.html @@ -9,9 +9,7 @@

STUndefinedObject class documentation

Authors

-
Stefan Urbanek( - urbanek@host.sk - )
+
Stefan Urbanek (urbanek@host.sk)
diff --git a/Documentation/Reference/StepTalk.html b/Documentation/Reference/StepTalk.html index d8c1f36..548e481 100644 --- a/Documentation/Reference/StepTalk.html +++ b/Documentation/Reference/StepTalk.html @@ -9,7 +9,7 @@

StepTalk Documentation

Authors

-
Stefan Urbanek()
+
Stefan Urbanek (urbanek@host.sk)
@@ -35,15 +35,18 @@
  • STEngine
  • STEnvironment
  • STLanguage
    • +
  • STMethod
  • STObjectReference
  • STScript
    • +
  • STScriptObject
  • STScriptsManager
  • STSelector
  • STUndefinedObject
    • Protocol
    diff --git a/Documentation/Reference/StepTalk.igsdoc b/Documentation/Reference/StepTalk.igsdoc index e5ebc11..b9ea9ae 100644 --- a/Documentation/Reference/StepTalk.igsdoc +++ b/Documentation/Reference/StepTalk.igsdoc @@ -431,6 +431,57 @@ Headers/StepTalk/STUndefinedObject.h = ( ../Documentation/Reference/STUndefinedObject.gsdoc ); + "NSInvocation+additions.h" = ( + "../../Documentation/Reference/NSInvocation+additions.gsdoc" + ); + "NSObject+additions.h" = ( + "../../Documentation/Reference/NSObject+additions.gsdoc" + ); + STBundleInfo.h = ( + ../../Documentation/Reference/STBundleInfo.gsdoc + ); + STEngine.h = ( + ../../Documentation/Reference/STEngine.gsdoc + ); + STEnvironment.h = ( + ../../Documentation/Reference/STEnvironment.gsdoc + ); + STExterns.h = ( + ../../Documentation/Reference/STExterns.gsdoc + ); + STFunctions.h = ( + ../../Documentation/Reference/STFunctions.gsdoc + ); + STLanguage.h = ( + ../../Documentation/Reference/STLanguage.gsdoc + ); + STMethod.h = ( + ../../Documentation/Reference/STMethod.gsdoc + ); + STObjCRuntime.h = ( + ../../Documentation/Reference/STObjCRuntime.gsdoc + ); + STObjectReference.h = ( + ../../Documentation/Reference/STObjectReference.gsdoc + ); + STScript.h = ( + ../../Documentation/Reference/STScript.gsdoc + ); + STScriptObject.h = ( + ../../Documentation/Reference/STScriptObject.gsdoc + ); + STScripting.h = ( + ../../Documentation/Reference/STScripting.gsdoc + ); + STScriptsManager.h = ( + ../../Documentation/Reference/STScriptsManager.gsdoc + ); + STSelector.h = ( + ../../Documentation/Reference/STSelector.gsdoc + ); + STUndefinedObject.h = ( + ../../Documentation/Reference/STUndefinedObject.gsdoc + ); }; protocol = { "(STMethod)" = STMethod; @@ -488,6 +539,57 @@ Headers/StepTalk/STUndefinedObject.h = ( STUndefinedObject.m ); + "NSInvocation+additions.h" = ( + "NSInvocation+additions.m" + ); + "NSObject+additions.h" = ( + "NSObject+additions.m" + ); + STBundleInfo.h = ( + STBundleInfo.m + ); + STEngine.h = ( + STEngine.m + ); + STEnvironment.h = ( + STEnvironment.m + ); + STExterns.h = ( + STExterns.m + ); + STFunctions.h = ( + STFunctions.m + ); + STLanguage.h = ( + STLanguage.m + ); + STMethod.h = ( + STMethod.m + ); + STObjCRuntime.h = ( + STObjCRuntime.m + ); + STObjectReference.h = ( + STObjectReference.m + ); + STScript.h = ( + STScript.m + ); + STScriptObject.h = ( + STScriptObject.m + ); + STScripting.h = ( + STScripting.m + ); + STScriptsManager.h = ( + STScriptsManager.m + ); + STSelector.h = ( + STSelector.m + ); + STUndefinedObject.h = ( + STUndefinedObject.m + ); }; super = { STBundleInfo = NSObject; diff --git a/Finders/ApplicationFinder/GNUmakefile b/Finders/ApplicationFinder/GNUmakefile index 4c6288d..a6c382c 100644 --- a/Finders/ApplicationFinder/GNUmakefile +++ b/Finders/ApplicationFinder/GNUmakefile @@ -33,8 +33,9 @@ ApplicationFinder_PRINCIPAL_CLASS = STApplicationFinder ApplicationFinder_BUNDLE_LIBS += -lStepTalk -ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers -ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Finders diff --git a/Finders/DistributedFinder/GNUmakefile b/Finders/DistributedFinder/GNUmakefile index 826e05a..4be7997 100644 --- a/Finders/DistributedFinder/GNUmakefile +++ b/Finders/DistributedFinder/GNUmakefile @@ -31,9 +31,9 @@ DistributedFinder_PRINCIPAL_CLASS = STDistributedFinder DistributedFinder_BUNDLE_LIBS += -lStepTalk -ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers -ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) -ADDITIONAL_TOOL_LIBS += -lStepTalk +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Finders diff --git a/Frameworks/StepTalk/GNUmakefile b/Frameworks/StepTalk/GNUmakefile index f78f3d5..eac54ea 100644 --- a/Frameworks/StepTalk/GNUmakefile +++ b/Frameworks/StepTalk/GNUmakefile @@ -21,11 +21,11 @@ include $(GNUSTEP_MAKEFILES)/common.make -include ../Version +include ../../Version -LIBRARY_NAME = libStepTalk +FRAMEWORK_NAME = StepTalk -libStepTalk_OBJC_FILES = \ +StepTalk_OBJC_FILES = \ NSInvocation+additions.m \ STBehaviourInfo.m \ STBundleInfo.m \ @@ -47,7 +47,8 @@ libStepTalk_OBJC_FILES = \ STStructure.m \ STUndefinedObject.m \ NSNumber+additions.m \ - NSObject+additions.m + NSObject+additions.m \ + SteptalkScriptingInfo.m STEPTALK_HEADER_FILES = \ STBundleInfo.h \ @@ -66,19 +67,17 @@ STEPTALK_HEADER_FILES = \ STSelector.h \ STUndefinedObject.h \ NSInvocation+additions.h \ - NSObject+additions.h + NSObject+additions.h -libStepTalk_HEADER_FILES = $(STEPTALK_HEADER_FILES) \ +StepTalk_HEADER_FILES = $(STEPTALK_HEADER_FILES) \ StepTalk.h -libStepTalk_HEADER_FILES_DIR = Headers/StepTalk -libStepTalk_HEADER_FILES_INSTALL_DIR = StepTalk + +StepTalk_RESOURCE_FILES = ScriptingInfo.plist STEPTALK_LIBRARY_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk STEPTALK_ENVDEFS_DIR = $(STEPTALK_LIBRARY_DIR)/Environments -ADDITIONAL_INCLUDE_DIRS += -I./Headers - ADDITIONAL_CPPFLAGS += -pipe ADDITIONAL_OBJCFLAGS = -Wno-import -DSTEPTALK_VERSION=$(STEPTALK_VERSION) @@ -89,18 +88,20 @@ StepTalk_DOC_INSTALL_DIR = Developer StepTalk_HEADER_FILES_DIR = $(HEADER_DIR) StepTalk_AGSDOC_FILES = StepTalk.gsdoc $(STEPTALK_HEADER_FILES) StepTalk_AGSDOC_FLAGS = \ - -HeaderDirectory Headers/StepTalk \ -Up StepTalk \ -Declared StepTalk \ - -DocumentationDirectory ../Documentation/Reference + -DocumentationDirectory ../../Documentation/Reference ifeq ($(GNUSTEP_TARGET_OS),mingw32) - libStepTalk_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc + StepTalk_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc endif -include GNUmakefile.preamble -include $(GNUSTEP_MAKEFILES)/library.make -include $(GNUSTEP_MAKEFILES)/documentation.make +include $(GNUSTEP_MAKEFILES)/framework.make + +ifeq ($(doc), yes) + include $(GNUSTEP_MAKEFILES)/documentation.make +endif -include GNUmakefile.postamble diff --git a/Frameworks/StepTalk/NSInvocation+additions.m b/Frameworks/StepTalk/NSInvocation+additions.m index d53ab9c..84a1fa2 100644 --- a/Frameworks/StepTalk/NSInvocation+additions.m +++ b/Frameworks/StepTalk/NSInvocation+additions.m @@ -27,17 +27,17 @@ */ -#import +#import "NSInvocation+additions.h" #import #import #import -#import -#import -#import -#import -#import +#import "STExterns.h" +#import "STObjCRuntime.h" +#import "STScripting.h" +#import "STSelector.h" +#import "STStructure.h" #if 0 static Class NSNumber_class = nil; diff --git a/Frameworks/StepTalk/NSNumber+additions.m b/Frameworks/StepTalk/NSNumber+additions.m index 0aab532..3f3b94b 100644 --- a/Frameworks/StepTalk/NSNumber+additions.m +++ b/Frameworks/StepTalk/NSNumber+additions.m @@ -25,10 +25,10 @@ */ -#import +#import "NSNumber+additions.h" -#import -#import +#import "STExterns.h" +#import "STStructure.h" #import diff --git a/Frameworks/StepTalk/NSObject+additions.m b/Frameworks/StepTalk/NSObject+additions.m index 6ed6e01..6a3f8b6 100644 --- a/Frameworks/StepTalk/NSObject+additions.m +++ b/Frameworks/StepTalk/NSObject+additions.m @@ -8,7 +8,7 @@ */ -#import +#import "NSObject+additions.h" @implementation NSObject (STAdditions) - (BOOL)isSame:(id)anObject diff --git a/Frameworks/StepTalk/STBehaviourInfo.m b/Frameworks/StepTalk/STBehaviourInfo.m index 6d5233f..13b37da 100644 --- a/Frameworks/StepTalk/STBehaviourInfo.m +++ b/Frameworks/StepTalk/STBehaviourInfo.m @@ -24,7 +24,7 @@ */ -#import +#import "STBehaviourInfo.h" #import #import diff --git a/Frameworks/StepTalk/STBundleInfo.m b/Frameworks/StepTalk/STBundleInfo.m index ccaa439..0f0d336 100644 --- a/Frameworks/StepTalk/STBundleInfo.m +++ b/Frameworks/StepTalk/STBundleInfo.m @@ -25,10 +25,10 @@ */ -#import +#import "STBundleInfo.h" -#import -#import +#import "STFunctions.h" +#import "STExterns.h" #import #import diff --git a/Frameworks/StepTalk/STClassInfo.h b/Frameworks/StepTalk/STClassInfo.h index 9500294..1d1c44e 100644 --- a/Frameworks/StepTalk/STClassInfo.h +++ b/Frameworks/StepTalk/STClassInfo.h @@ -25,7 +25,7 @@ */ -#import +#import "STBehaviourInfo.h" @class NSString; @class NSMutableDictionary; diff --git a/Frameworks/StepTalk/STClassInfo.m b/Frameworks/StepTalk/STClassInfo.m index 00ba1f2..c22915c 100644 --- a/Frameworks/StepTalk/STClassInfo.m +++ b/Frameworks/StepTalk/STClassInfo.m @@ -25,9 +25,9 @@ */ -#import +#import "STClassInfo.h" -#import +#import "STFunctions.h" #import #import diff --git a/Frameworks/StepTalk/STEngine.m b/Frameworks/StepTalk/STEngine.m index 5375421..e5f7bba 100644 --- a/Frameworks/StepTalk/STEngine.m +++ b/Frameworks/StepTalk/STEngine.m @@ -25,13 +25,13 @@ */ -#import +#import "STEngine.h" -#import -#import -#import -#import -#import +#import "STEnvironment.h" +#import "STExterns.h" +#import "STFunctions.h" +#import "STLanguage.h" +#import "STUndefinedObject.h" #import #import diff --git a/Frameworks/StepTalk/STEnvironment.m b/Frameworks/StepTalk/STEnvironment.m index ed69b89..ddc29e8 100644 --- a/Frameworks/StepTalk/STEnvironment.m +++ b/Frameworks/StepTalk/STEnvironment.m @@ -27,17 +27,17 @@ */ -#import +#import "STEnvironment.h" -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import "STClassInfo.h" +#import "STEnvironmentDescription.h" +#import "STExterns.h" +#import "STFunctions.h" +#import "STBundleInfo.h" +#import "STObjCRuntime.h" +#import "STObjectReference.h" +#import "STUndefinedObject.h" +#import "STScripting.h" #import #import diff --git a/Frameworks/StepTalk/STEnvironmentDescription.m b/Frameworks/StepTalk/STEnvironmentDescription.m index 885b3c0..8ddfac2 100644 --- a/Frameworks/StepTalk/STEnvironmentDescription.m +++ b/Frameworks/StepTalk/STEnvironmentDescription.m @@ -25,12 +25,12 @@ */ -#import +#import "STEnvironmentDescription.h" -#import -#import -#import -#import +#import "STClassInfo.h" +#import "STExterns.h" +#import "STFunctions.h" +#import "STBehaviourInfo.h" #import #import diff --git a/Frameworks/StepTalk/STFunctions.m b/Frameworks/StepTalk/STFunctions.m index b7c46b4..e5d0bb2 100644 --- a/Frameworks/StepTalk/STFunctions.m +++ b/Frameworks/StepTalk/STFunctions.m @@ -25,9 +25,9 @@ */ -#import +#import "STFunctions.h" -#import +#import "STExterns.h" #import #import diff --git a/Frameworks/StepTalk/STLanguage.m b/Frameworks/StepTalk/STLanguage.m index 8deff38..70b6ceb 100644 --- a/Frameworks/StepTalk/STLanguage.m +++ b/Frameworks/StepTalk/STLanguage.m @@ -25,11 +25,11 @@ */ -#import +#import "STLanguage.h" -#import -#import -#import +#import "STEngine.h" +#import "STExterns.h" +#import "STFunctions.h" #import #import diff --git a/Frameworks/StepTalk/STMethod.m b/Frameworks/StepTalk/STMethod.m index d281c65..2016b60 100644 --- a/Frameworks/StepTalk/STMethod.m +++ b/Frameworks/StepTalk/STMethod.m @@ -24,6 +24,6 @@ */ -#import +#import "STMethod.h" /* Nothig here */ diff --git a/Frameworks/StepTalk/STObjCRuntime.m b/Frameworks/StepTalk/STObjCRuntime.m index 43412f1..b9f83c1 100644 --- a/Frameworks/StepTalk/STObjCRuntime.m +++ b/Frameworks/StepTalk/STObjCRuntime.m @@ -25,8 +25,8 @@ */ -#import -#import +#import "STObjCRuntime.h" +#import "STExterns.h" #import #import diff --git a/Frameworks/StepTalk/STObjectReference.m b/Frameworks/StepTalk/STObjectReference.m index 00ee39b..6e96739 100644 --- a/Frameworks/StepTalk/STObjectReference.m +++ b/Frameworks/StepTalk/STObjectReference.m @@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import +#import "STObjectReference.h" -#import +#import "STExterns.h" #import #import diff --git a/Frameworks/StepTalk/STScript.m b/Frameworks/StepTalk/STScript.m index 5d55ee9..7b35da6 100644 --- a/Frameworks/StepTalk/STScript.m +++ b/Frameworks/StepTalk/STScript.m @@ -24,9 +24,9 @@ */ -#import +#import "STScript.h" -#import +#import "STLanguage.h" #import #import diff --git a/Frameworks/StepTalk/STScriptObject.m b/Frameworks/StepTalk/STScriptObject.m index dfddbe2..5c58b8f 100644 --- a/Frameworks/StepTalk/STScriptObject.m +++ b/Frameworks/StepTalk/STScriptObject.m @@ -1,6 +1,6 @@ /* 2003 Aug 5 */ -#import "StepTalk/STScriptObject.h" +#import "STScriptObject.h" @implementation STScriptObject - initWithInstanceVariableNames:(NSString *)names diff --git a/Frameworks/StepTalk/STScripting.m b/Frameworks/StepTalk/STScripting.m index abaf52f..57fe2ab 100644 --- a/Frameworks/StepTalk/STScripting.m +++ b/Frameworks/StepTalk/STScripting.m @@ -27,7 +27,7 @@ */ -#import +#import "STScripting.h" @implementation NSObject (STScripting) /* diff --git a/Frameworks/StepTalk/STScriptsManager.m b/Frameworks/StepTalk/STScriptsManager.m index 00818e1..85845f6 100644 --- a/Frameworks/StepTalk/STScriptsManager.m +++ b/Frameworks/StepTalk/STScriptsManager.m @@ -24,11 +24,11 @@ */ -#import +#import "STScriptsManager.h" -#import -#import -#import +#import "STExterns.h" +#import "STLanguage.h" +#import "STScript.h" #import #import diff --git a/Frameworks/StepTalk/STSelector.m b/Frameworks/StepTalk/STSelector.m index 9c3e697..f5e9cf4 100644 --- a/Frameworks/StepTalk/STSelector.m +++ b/Frameworks/StepTalk/STSelector.m @@ -24,7 +24,7 @@ */ -#import +#import "STSelector.h" @implementation STSelector - initWithSelector:(SEL)aSel diff --git a/Frameworks/StepTalk/STStructure.m b/Frameworks/StepTalk/STStructure.m index 65f45d1..ab02dd1 100644 --- a/Frameworks/StepTalk/STStructure.m +++ b/Frameworks/StepTalk/STStructure.m @@ -24,15 +24,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import +#import "STStructure.h" -#import +#import "STExterns.h" #import #import #import #import #import -#import +#import "NSInvocation+additions.h" @implementation STStructure + structureWithValue:(void *)value type:(const char*)type diff --git a/Frameworks/StepTalk/STUndefinedObject.m b/Frameworks/StepTalk/STUndefinedObject.m index 5793e03..7a1e391 100644 --- a/Frameworks/StepTalk/STUndefinedObject.m +++ b/Frameworks/StepTalk/STUndefinedObject.m @@ -24,10 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02111, USA. */ -#import +#import "STUndefinedObject.h" -#import -#import +#import "STExterns.h" +#import "STObjCRuntime.h" #import diff --git a/Languages/Smalltalk/GNUmakefile b/Languages/Smalltalk/GNUmakefile index 522fed7..9e45e7e 100644 --- a/Languages/Smalltalk/GNUmakefile +++ b/Languages/Smalltalk/GNUmakefile @@ -58,8 +58,9 @@ ADDITIONAL_OBJCFLAGS = -Wall -Wno-import ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers -ADDITIONAL_TOOL_LIBS += -lStepTalk -ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/Languages/Smalltalk/STScriptObject.m b/Languages/Smalltalk/STScriptObject.m deleted file mode 100644 index f0ba002..0000000 --- a/Languages/Smalltalk/STScriptObject.m +++ /dev/null @@ -1,170 +0,0 @@ -/** - STScriptObject.m - Object that represents script - - Copyright (c) 2002 Free Software Foundation - - This file is part of the StepTalk project. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02111, USA. - - */ - -#import "STScriptObject.h" - -#import "STBytecodeInterpreter.h" -#import "STCompiledScript.h" - -#import -#import -#import -#import - -#import -#import -#import -#import - -@implementation STScriptObject -- initWithEnvironment:(STEnvironment *)env - compiledScript:(STCompiledScript *)compiledScript -{ - int count = [compiledScript variableCount]; - int i; - - [super init]; - - NSDebugLLog(@"STEngine", - @"creating script object %p with %i ivars",compiledScript, - count); - - environment = RETAIN(env); - script = RETAIN(compiledScript); - variables = [[NSMutableArray alloc] initWithCapacity:count]; - - for(i=0;i> forwarding to self ..."); - - retval = [interpreter interpretMethod:method - forReceiver:self - arguments:args]; - - NSDebugLLog(@"STSending", - @"<< returned from forwarding"); - - [invocation setReturnValue:&retval]; -} -@end diff --git a/Modules/AppKit/GNUmakefile b/Modules/AppKit/GNUmakefile index a94b41e..ee1882f 100644 --- a/Modules/AppKit/GNUmakefile +++ b/Modules/AppKit/GNUmakefile @@ -43,6 +43,10 @@ BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules ADDITIONAL_OBJCFLAGS = -Wall -Wno-import +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUMakefile.postamble diff --git a/Modules/Foundation/GNUmakefile b/Modules/Foundation/GNUmakefile index 2da6cdd..dc5338e 100644 --- a/Modules/Foundation/GNUmakefile +++ b/Modules/Foundation/GNUmakefile @@ -34,6 +34,9 @@ Foundation_PRINCIPAL_CLASS = STFoundationModule Foundation_RESOURCE_FILES = ScriptingInfo.plist BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) ADDITIONAL_OBJCFLAGS = -Wall -Wno-import diff --git a/Modules/GDL2/GNUmakefile b/Modules/GDL2/GNUmakefile index 56bfe41..e1c7732 100644 --- a/Modules/GDL2/GNUmakefile +++ b/Modules/GDL2/GNUmakefile @@ -37,6 +37,10 @@ GDL2_RESOURCE_FILES = ScriptingInfo.plist GDL2_BUNDLE_LIBS += -lgnustep-db2 -lgnustep-db2control -lgnustep-db2modeler +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) + BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules ADDITIONAL_OBJCFLAGS = -Wall -Wno-import diff --git a/Modules/ObjectiveC/GNUmakefile b/Modules/ObjectiveC/GNUmakefile index a823b26..439651c 100644 --- a/Modules/ObjectiveC/GNUmakefile +++ b/Modules/ObjectiveC/GNUmakefile @@ -36,9 +36,9 @@ ObjectiveC_PRINCIPAL_CLASS = ObjectiveCModule ObjectiveC_RESOURCE_FILES = ScriptingInfo.plist -ObjectiveC_BUNDLE_LIBS += -lStepTalk -ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers -ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules diff --git a/Modules/SimpleTranscript/GNUmakefile b/Modules/SimpleTranscript/GNUmakefile index 20b9543..eae4d45 100644 --- a/Modules/SimpleTranscript/GNUmakefile +++ b/Modules/SimpleTranscript/GNUmakefile @@ -34,6 +34,10 @@ SimpleTranscript_RESOURCE_FILES = ScriptingInfo.plist BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules +ADDITIONAL_BUNDLE_LIBS = -lStepTalk +ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/ +ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) + ADDITIONAL_OBJCFLAGS = -Wall -Wno-import -include GNUmakefile.preamble diff --git a/Modules/StepTalk/.cvsignore b/Modules/StepTalk/.cvsignore deleted file mode 100644 index 862e5dc..0000000 --- a/Modules/StepTalk/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -*.app -*.debug -*.profile -shared_*obj -*.bundle -*.stmodule -*.stlanguage