Cleanup after change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@17439 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Stefan Urbanek 2003-08-06 18:02:52 +00:00
parent 032b4926cc
commit bbc3eac654
48 changed files with 234 additions and 305 deletions

View file

@ -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

View file

@ -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 <urbanek@host.sk>

View file

@ -9,9 +9,7 @@
<h1><a name="title$NSInvocation+additions">NSInvocation class additions</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STBundleInfo">STBundleInfo class documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STEnvironment">STEnvironment class reference</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STExterns">STExterns autogsdoc generated documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STFunctions">STFunctions autogsdoc generated documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STLanguage">STLanguage class documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>
@ -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&apos;s defaults database,
then Smalltalk is used.
</p>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STObjectReference">STObjectReference class documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STScript">STScript class documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:stefanurbanek@yahoo.fr"><code>
stefanurbanek@yahoo.fr
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:stefanurbanek@yahoo.fr"><code>stefanurbanek@yahoo.fr</code></a>)</dt>
<dd>
</dd>
</dl>
@ -76,8 +74,8 @@
- (id) <b>initWithFile:</b> (NSString*)aFile;<br />
<p>
Create a new script from file <var>aFile></var>.
Script information will be read from 'aFile.stinfo'
Create a new script from file <var>aFile&gt;</var>.
Script information will be read from &apos;aFile.stinfo&apos;
file containing a dictionary property list.
</p>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STScripting">STScripting protocol documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STScriptsManager">STScriptsManager class documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,9 +9,7 @@
<h1><a name="title$STUndefinedObject">STUndefinedObject class documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt>Stefan Urbanek(<a href="mailto:urbanek@host.sk"><code>
urbanek@host.sk
</code></a>)</dt>
<dt>Stefan Urbanek (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>

View file

@ -9,7 +9,7 @@
<h1><a name="title$StepTalk">StepTalk Documentation</a></h1>
<h3>Authors</h3>
<dl>
<dt><a href="http://urbanek.host.sk">Stefan Urbanek</a>(<a href="mailto:urbanek@host.sk"><code></code></a>)</dt>
<dt><a href="http://urbanek.host.sk">Stefan Urbanek</a> (<a href="mailto:urbanek@host.sk"><code>urbanek@host.sk</code></a>)</dt>
<dd>
</dd>
</dl>
@ -35,15 +35,18 @@
<li><a rel="gsdoc" href="STEngine.html#class$STEngine">STEngine</a></li>
<li><a rel="gsdoc" href="STEnvironment.html#class$STEnvironment">STEnvironment</a></li>
<li><a rel="gsdoc" href="STLanguage.html#class$STLanguage">STLanguage</a></li>
<li><a rel="gsdoc" href="STMethod.html#class$STMethod">STMethod</a></li>
<li><a rel="gsdoc" href="STObjectReference.html#class$STObjectReference">STObjectReference</a></li>
<li><a rel="gsdoc" href="STScript.html#class$STScript">STScript</a></li>
<li><a rel="gsdoc" href="STScriptObject.html#class$STScriptObject">STScriptObject</a></li>
<li><a rel="gsdoc" href="STScriptsManager.html#class$STScriptsManager">STScriptsManager</a></li>
<li><a rel="gsdoc" href="STSelector.html#class$STSelector">STSelector</a></li>
<li><a rel="gsdoc" href="STUndefinedObject.html#class$STUndefinedObject">STUndefinedObject</a></li>
</ul>
<b>Protocol</b>
<ul>
<li><a rel="gsdoc" href="STScripting.html#protocol$(STScripting)">(STScripting)</a></li>
<li><a rel="gsdoc" href="STMethod.html#protocol$(STMethod)"></a></li>
<li><a rel="gsdoc" href="STScripting.html#protocol$(STScripting)"></a></li>
</ul>
</div>
<br />

View file

@ -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;

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -27,17 +27,17 @@
*/
#import <StepTalk/NSInvocation+additions.h>
#import "NSInvocation+additions.h"
#import <Foundation/NSDebug.h>
#import <Foundation/NSException.h>
#import <Foundation/NSValue.h>
#import <StepTalk/STExterns.h>
#import <StepTalk/STObjCRuntime.h>
#import <StepTalk/STScripting.h>
#import <StepTalk/STSelector.h>
#import <StepTalk/STStructure.h>
#import "STExterns.h"
#import "STObjCRuntime.h"
#import "STScripting.h"
#import "STSelector.h"
#import "STStructure.h"
#if 0
static Class NSNumber_class = nil;

View file

@ -25,10 +25,10 @@
*/
#import <StepTalk/NSNumber+additions.h>
#import "NSNumber+additions.h"
#import <StepTalk/STExterns.h>
#import <StepTalk/STStructure.h>
#import "STExterns.h"
#import "STStructure.h"
#import <Foundation/NSException.h>

View file

@ -8,7 +8,7 @@
*/
#import <StepTalk/NSObject+additions.h>
#import "NSObject+additions.h"
@implementation NSObject (STAdditions)
- (BOOL)isSame:(id)anObject

View file

@ -24,7 +24,7 @@
*/
#import <StepTalk/STBehaviourInfo.h>
#import "STBehaviourInfo.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSDebug.h>

View file

@ -25,10 +25,10 @@
*/
#import <StepTalk/STBundleInfo.h>
#import "STBundleInfo.h"
#import <StepTalk/STFunctions.h>
#import <StepTalk/STExterns.h>
#import "STFunctions.h"
#import "STExterns.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSBundle.h>

View file

@ -25,7 +25,7 @@
*/
#import <StepTalk/STBehaviourInfo.h>
#import "STBehaviourInfo.h"
@class NSString;
@class NSMutableDictionary;

View file

@ -25,9 +25,9 @@
*/
#import <StepTalk/STClassInfo.h>
#import "STClassInfo.h"
#import <StepTalk/STFunctions.h>
#import "STFunctions.h"
#import <Foundation/NSDictionary.h>
#import <Foundation/NSDebug.h>

View file

@ -25,13 +25,13 @@
*/
#import <StepTalk/STEngine.h>
#import "STEngine.h"
#import <StepTalk/STEnvironment.h>
#import <StepTalk/STExterns.h>
#import <StepTalk/STFunctions.h>
#import <StepTalk/STLanguage.h>
#import <StepTalk/STUndefinedObject.h>
#import "STEnvironment.h"
#import "STExterns.h"
#import "STFunctions.h"
#import "STLanguage.h"
#import "STUndefinedObject.h"
#import <Foundation/NSDictionary.h>
#import <Foundation/NSException.h>

View file

@ -27,17 +27,17 @@
*/
#import <StepTalk/STEnvironment.h>
#import "STEnvironment.h"
#import <StepTalk/STClassInfo.h>
#import <StepTalk/STEnvironmentDescription.h>
#import <StepTalk/STExterns.h>
#import <StepTalk/STFunctions.h>
#import <StepTalk/STBundleInfo.h>
#import <StepTalk/STObjCRuntime.h>
#import <StepTalk/STObjectReference.h>
#import <StepTalk/STUndefinedObject.h>
#import <StepTalk/STScripting.h>
#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 <Foundation/NSArray.h>
#import <Foundation/NSBundle.h>

View file

@ -25,12 +25,12 @@
*/
#import <StepTalk/STEnvironmentDescription.h>
#import "STEnvironmentDescription.h"
#import <StepTalk/STClassInfo.h>
#import <StepTalk/STExterns.h>
#import <StepTalk/STFunctions.h>
#import <StepTalk/STBehaviourInfo.h>
#import "STClassInfo.h"
#import "STExterns.h"
#import "STFunctions.h"
#import "STBehaviourInfo.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSDebug.h>

View file

@ -25,9 +25,9 @@
*/
#import <StepTalk/STFunctions.h>
#import "STFunctions.h"
#import <StepTalk/STExterns.h>
#import "STExterns.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSEnumerator.h>

View file

@ -25,11 +25,11 @@
*/
#import <StepTalk/STLanguage.h>
#import "STLanguage.h"
#import <StepTalk/STEngine.h>
#import <StepTalk/STExterns.h>
#import <StepTalk/STFunctions.h>
#import "STEngine.h"
#import "STExterns.h"
#import "STFunctions.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSDebug.h>

View file

@ -24,6 +24,6 @@
*/
#import <StepTalk/STMethod.h>
#import "STMethod.h"
/* Nothig here */

View file

@ -25,8 +25,8 @@
*/
#import <StepTalk/STObjCRuntime.h>
#import <StepTalk/STExterns.h>
#import "STObjCRuntime.h"
#import "STExterns.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSDebug.h>

View file

@ -24,9 +24,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#import <StepTalk/STObjectReference.h>
#import "STObjectReference.h"
#import <StepTalk/STExterns.h>
#import "STExterns.h"
#import <Foundation/NSDebug.h>
#import <Foundation/NSDictionary.h>

View file

@ -24,9 +24,9 @@
*/
#import <StepTalk/STScript.h>
#import "STScript.h"
#import <StepTalk/STLanguage.h>
#import "STLanguage.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>

View file

@ -1,6 +1,6 @@
/* 2003 Aug 5 */
#import "StepTalk/STScriptObject.h"
#import "STScriptObject.h"
@implementation STScriptObject
- initWithInstanceVariableNames:(NSString *)names

View file

@ -27,7 +27,7 @@
*/
#import <StepTalk/STScripting.h>
#import "STScripting.h"
@implementation NSObject (STScripting)
/*

View file

@ -24,11 +24,11 @@
*/
#import <StepTalk/STScriptsManager.h>
#import "STScriptsManager.h"
#import <StepTalk/STExterns.h>
#import <StepTalk/STLanguage.h>
#import <StepTalk/STScript.h>
#import "STExterns.h"
#import "STLanguage.h"
#import "STScript.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSBundle.h>

View file

@ -24,7 +24,7 @@
*/
#import <StepTalk/STSelector.h>
#import "STSelector.h"
@implementation STSelector
- initWithSelector:(SEL)aSel

View file

@ -24,15 +24,15 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#import <StepTalk/STStructure.h>
#import "STStructure.h"
#import <StepTalk/STExterns.h>
#import "STExterns.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSException.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSDebug.h>
#import <StepTalk/NSInvocation+additions.h>
#import "NSInvocation+additions.h"
@implementation STStructure
+ structureWithValue:(void *)value type:(const char*)type

View file

@ -24,10 +24,10 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02111, USA.
*/
#import <StepTalk/STUndefinedObject.h>
#import "STUndefinedObject.h"
#import <StepTalk/STExterns.h>
#import <StepTalk/STObjCRuntime.h>
#import "STExterns.h"
#import "STObjCRuntime.h"
#import <Foundation/NSString.h>

View file

@ -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

View file

@ -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 <Foundation/NSArray.h>
#import <Foundation/NSDebug.h>
#import <Foundation/NSMethodSignature.h>
#import <Foundation/NSString.h>
#import <StepTalk/NSInvocation+additions.h>
#import <StepTalk/STEnvironment.h>
#import <StepTalk/STObjCRuntime.h>
#import <StepTalk/STExterns.h>
@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<count;i++)
{
[variables addObject:STNil];
}
return self;
}
- (void)dealloc
{
RELEASE(interpreter);
RELEASE(script);
RELEASE(variables);
RELEASE(environment);
[super dealloc];
}
- (STCompiledScript *)script
{
return script;
}
- (void)setInstanceVariable:(id)anObject atIndex:(int)anIndex;
{
if(anObject == nil)
{
anObject = STNil;
}
[variables replaceObjectAtIndex:anIndex withObject:anObject];
}
- (id)instanceVariableAtIndex:(int)anIndex;
{
return [[variables objectAtIndex:anIndex] self];
}
- (BOOL)respondsToSelector:(SEL)aSelector
{
if( [super respondsToSelector:(SEL)aSelector] )
{
return YES;
}
return ([script methodWithName:NSStringFromSelector(aSelector)] != nil);
}
- (NSMethodSignature *)methodSignatureForSelector:(SEL)sel
{
NSMethodSignature *signature = nil;
signature = [super methodSignatureForSelector:sel];
if(!signature)
{
signature = STMethodSignatureForSelector(sel);
}
return signature;
}
- (void) forwardInvocation:(NSInvocation *)invocation
{
STCompiledMethod *method;
NSString *methodName = NSStringFromSelector([invocation selector]);
NSMutableArray *args;
id arg;
int index;
int count;
id retval = nil;
if(!interpreter)
{
NSDebugLLog(@"STEngine",
@"creating new interpreter for script '%@'",
name);
interpreter = [[STBytecodeInterpreter alloc] init];
[interpreter setEnvironment:environment];
}
if([methodName isEqualToString:@"exit"])
{
[interpreter halt];
return;
}
method = [script methodWithName:methodName];
count = [[invocation methodSignature] numberOfArguments];
NSDebugLLog(@"STSending",
@"script object perform: %@ with %i args",
methodName,count-2);
args = [NSMutableArray array];
for(index = 2; index < count; index++)
{
arg = [invocation getArgumentAsObjectAtIndex:index];
[args addObject:arg];
}
NSDebugLLog(@"STSending",
@">> forwarding to self ...");
retval = [interpreter interpretMethod:method
forReceiver:self
arguments:args];
NSDebugLLog(@"STSending",
@"<< returned from forwarding");
[invocation setReturnValue:&retval];
}
@end

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,7 +0,0 @@
*.app
*.debug
*.profile
shared_*obj
*.bundle
*.stmodule
*.stlanguage