I just want to merge this Melodie change to ensure it loads the
Smalltalk scripts in the correct order.
-Eric

On Mon, Mar 16, 2009 at 12:55 PM, David Chisnall <thera...@sucs.org> wrote:
> Hi Everyone,
>
> I will be releasing 0.4.1 tomorrow unless I hear any compelling
> arguments to delay.  If you have any outstanding changes that need
> syncing, now is your last chance (the review system isn't sending
> emails at the moment, so make sure you send an email to etoile-dev if
> you need something reviewed).
>
> David
>
> _______________________________________________
> Etoile-discuss mailing list
> etoile-disc...@gna.org
> https://mail.gna.org/listinfo/etoile-discuss
>
Index: main.m
===================================================================
--- main.m	(revision 4517)
+++ main.m	(working copy)
@@ -6,7 +6,7 @@
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-	[LKCompiler loadAllScriptsForApplication];
+	[LKCompiler loadLanguageKitBundle: [NSBundle mainBundle]];
 
 	int ret = NSApplicationMain(argc, (const char **) argv);
 	[pool release];
Index: GNUmakefile
===================================================================
--- GNUmakefile	(revision 4517)
+++ GNUmakefile	(working copy)
@@ -19,7 +19,7 @@
 $(APP_NAME)_OBJC_FILES = $(wildcard *.m)
 $(APP_NAME)_PRINCIPAL_CLASS = ETApplication
 $(APP_NAME)_MAIN_MODEL_FILE = $(APP_NAME).gorm
-$(APP_NAME)_RESOURCE_FILES = $(APP_NAME).gorm $(APP_NAME).tiff $(wildcard *.st)
+$(APP_NAME)_RESOURCE_FILES = $(APP_NAME).gorm $(APP_NAME).tiff $(wildcard *.st) LKInfo.plist
 $(APP_NAME)_GUI_LIBS = -lEtoileFoundation -lCoreObject -lIconKit -lMediaKit -lEtoileUI
 $(APP_NAME)_GUI_LIBS += -lLanguageKit -lSmalltalkSupport -lScriptKit
 
Index: LKInfo.plist
===================================================================
--- LKInfo.plist	(revision 0)
+++ LKInfo.plist	(revision 4517)
@@ -0,0 +1,3 @@
+{
+	Sources = ("ETPlaylist.st", "MusicPlayerController.st", "MelodieController.st");
+}
_______________________________________________
Etoile-dev mailing list
Etoile-dev@gna.org
https://mail.gna.org/listinfo/etoile-dev

Reply via email to