From 9bfcd9ce42c1fedc63f495b48e82eeb715e47685 Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 8 May 2003 17:29:52 +0000
Subject: [PATCH] Bundle fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16678 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         |  2 ++
 Source/NSBundle.m | 85 ++++++++++++++++++++++++++++-------------------
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9fe4b6fc..10693f109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Tools/xmlparse.m: new utility to parse/validate xml, for testing
 	gsdoc and new style property lists etc.
+	* Source/NSBundle.m: ([+allBundles]) Make sure the main bundle is
+	present.  Add some documentation.
 
 2003-05-07  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 24de67b29..0fdb927d8 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -679,11 +679,19 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
     }
 }
 
+/**
+ * Returns an array of all the bundles which do not belong to frameworks.<br />
+ * This always contains the main bundle.
+ */
 + (NSArray *) allBundles
 {
   NSMutableArray	*array = [NSMutableArray arrayWithCapacity: 2];
 
   [load_lock lock];
+  if (!_mainBundle) 
+    {
+      [self mainBundle];
+    }
   if (_bundles != 0)
     {
       NSMapEnumerator	enumerate;
@@ -708,6 +716,9 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
   return array;
 }
 
+/**
+ * Returns an array containing all the known bundles representing frameworks.
+ */
 + (NSArray *) allFrameworks
 {
   NSMapEnumerator  enumerate;
@@ -730,26 +741,29 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
   return array;
 }
 
-/* For an application, returns the main bundle of the application.
-   For a tool, returns the main bundle associated with the tool.
-   
-   For an application, the structure is as follows - 
-   
-   The executable is Gomoku.app/ix86/linux-gnu/gnu-gnu-gnu/Gomoku
-   and the main bundle directory is Gomoku.app/.
-   
-   For a tool, the structure is as follows - 
-   
-   The executable is xxx/Tools/ix86/linux-gnu/gnu-gnu-gnu/Control
-   and the main bundle directory is xxx/Tools/Resources/Control.
-   
-   (when the tool has not yet been installed, it's similar - 
-   xxx/shared_obj/ix86/linux-gnu/gnu-gnu-gnu/Control
-   and the main bundle directory is xxx/Resources/Control).
-   
-   (For a flattened structure, the structure is the same without the
-   ix86/linux-gnu/gnu-gnu-gnu directories).  */
-+ (NSBundle *)mainBundle
+/**
+ * For an application, returns the main bundle of the application.<br />
+ * For a tool, returns the main bundle associated with the tool.<br />
+ * <br />
+ * For an application, the structure is as follows - 
+ * <p> 
+ * The executable is Gomoku.app/ix86/linux-gnu/gnu-gnu-gnu/Gomoku
+ * and the main bundle directory is Gomoku.app/.
+ * </p> 
+ * For a tool, the structure is as follows - 
+ * <p>
+ * The executable is xxx/Tools/ix86/linux-gnu/gnu-gnu-gnu/Control
+ * and the main bundle directory is xxx/Tools/Resources/Control.
+ * </p> 
+ * <p>(when the tool has not yet been installed, it's similar - 
+ * xxx/shared_obj/ix86/linux-gnu/gnu-gnu-gnu/Control
+ * and the main bundle directory is xxx/Resources/Control).
+ * </p> 
+ * <p>(For a flattened structure, the structure is the same without the
+ * ix86/linux-gnu/gnu-gnu-gnu directories).
+ * </p>
+ */
++ (NSBundle *) mainBundle
 {
   [load_lock lock];
   if (!_mainBundle) 
@@ -803,19 +817,19 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
 	}
 
       if (isApplication == YES)
-    {
-      s = [path lastPathComponent];
-          
-      if ((([s hasSuffix: @".app"]  == NO)
-          && ([s hasSuffix: @".debug"] == NO)
-          && ([s hasSuffix: @".profile"] == NO))
-          // GNUstep Web
-          && (([s hasSuffix: @".gswa"] == NO)
-	      && ([s hasSuffix: @".woa"] == NO)))
-        {
-          isApplication = NO;
-        }
-    }
+	{
+	  s = [path lastPathComponent];
+	      
+	  if ((([s hasSuffix: @".app"]  == NO)
+	    && ([s hasSuffix: @".debug"] == NO)
+	    && ([s hasSuffix: @".profile"] == NO))
+	    // GNUstep Web
+	    && (([s hasSuffix: @".gswa"] == NO)
+		&& ([s hasSuffix: @".woa"] == NO)))
+	    {
+	      isApplication = NO;
+	    }
+	}
       
       if (isApplication == NO)
 	{
@@ -836,7 +850,10 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
   return _mainBundle;
 }
 
-/* NB: We will not find a class if the bundle has not been loaded yet!  */
+/**
+ * Returns the bundle whose code contains the specified class.<br />
+ * NB: We will not find a class if the bundle has not been loaded yet!
+ */
 + (NSBundle *) bundleForClass: (Class)aClass
 {
   void*     key;