All bundles and libProjectCenter are now installed under GNUSTEP_SYSTEM_ROOT.

Also the PC.proj templates have now a correct install path default value.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@11943 72102866-910b-0410-8b05-ffd578937521

INSTALL

@@ -33,7 +33,11 @@ In order to do this successfully you must first install PCLib and the bundles an
 Important!
 ==========
 
-When ProjectCenter fails to launch due to a missing bundle path, you can set it
-using GNUstep's defaults tool:
+o ProjectCenter now installs into GNUSTEP_SYSTEM_ROOT. Be sure to have the 
+  correct privileges when installing it!
+
+o When ProjectCenter fails to launch due to a missing bundle path, you can set 
+  it using GNUstep's defaults tool:
+
+  defaults write ProjectCenter BundlePaths /usr/GNUstep/System/Library/ProjectCenter
 
-opentool defaults write ProjectCenter BundlePaths /usr/GNUstep/Local/Library/ProjectCenter

PCAppProj/AppController.h

@@ -1,7 +1,7 @@
 /* 
  * AppController.h created by phr on 2000-08-27 11:38:59 +0000
  *
- * Project TestApp
+ * GNUstep Application Controller
  *
  * Created with ProjectCenter - http://www.gnustep.org
  *

PCAppProj/AppController.m

@@ -1,7 +1,7 @@
 /* 
  * AppController.m created by phr on 2000-08-27 11:38:58 +0000
  *
- * Project TestApp
+ * GNUstep Application Controller
  *
  * Created with ProjectCenter - http://www.gnustep.org
  *

PCAppProj/GNUmakefile

@@ -21,6 +21,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME 		= PCAppProj

PCAppProj/PC.proj

@@ -17,7 +17,7 @@
     LIBRARIES = ("gnustep-base","gnustep-gui"); 
     MAININTERFACE = ""; 
     MAKEFILEDIR = "/usr/GNUstep/Makefiles"; 
-    INSTALLDIR = "$(HOME)/Apps";
+    INSTALLDIR = "$(GNUSTEP_LOCAL_ROOT)/Apps";
     OTHER_FILES = (); 
     OTHER_RESOURCES = (); 
     OTHER_SOURCES = (); 

PCBaseFileTypes/GNUmakefile

@@ -20,6 +20,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME 			= PCBaseFileTypes

PCBundleProj/GNUmakefile

@@ -20,6 +20,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME 		= PCBundleProj

PCBundleProj/PC.proj

@@ -17,7 +17,7 @@
     LIBRARIES = ("gnustep-base"); 
     MAININTERFACE = ""; 
     MAKEFILEDIR = "/usr/GNUstep/System/Makefiles"; 
-    INSTALLDIR = "$(HOME)/Apps";
+    INSTALLDIR = "$(GNUSTEP_LOCAL_ROOT)/Library/Bundles";
     OTHER_FILES = (); 
     OTHER_RESOURCES = (); 
     OTHER_SOURCES = (); 

PCGormProj/GNUmakefile

@@ -23,11 +23,13 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME 		= PCGormProj
 BUNDLE_EXTENSION	=.bundle
-BUNDLE_INSTALL_DIR	=$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/
+BUNDLE_INSTALL_DIR	=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/
 
 PCGormProj_OBJC_FILES = 		\
 	PCGormProj.m 		\

PCGormProj/PC.proj

@@ -17,7 +17,7 @@
     LIBRARIES = ("gnustep-base","gnustep-gui"); 
     MAININTERFACE = ""; 
     MAKEFILEDIR = "/usr/GNUstep/Makefiles"; 
-    INSTALLDIR = "$(HOME)/Apps";
+    INSTALLDIR = "$(GNUSTEP_LOCAL_ROOT)/Apps";
     OTHER_FILES = (); 
     OTHER_RESOURCES = (); 
     OTHER_SOURCES = (); 

PCLib/PCBundleLoader.m

@@ -43,14 +43,14 @@
 
 #ifdef DEBUG
     NSLog([NSString stringWithFormat:@"Loading bundle %@...",path]);
-#endif DEBUG
+#endif// DEBUG
 
     if ((bundle = [NSBundle bundleWithPath:path])) {
         [loadedBundles addObject:bundle];
 
 #ifdef DEBUG
         NSLog([NSString stringWithFormat:@"Bundle %@ successfully loaded!",path]);
-#endif DEBUG
+#endif// DEBUG
 
         if (delegate && [delegate respondsToSelector:@selector(bundleLoader: didLoadBundle:)]) {
             [delegate bundleLoader:self didLoadBundle:bundle];
@@ -103,13 +103,13 @@
 
     if (!path || [path isEqualToString:@""]) {
       NSDictionary *env = [[NSProcessInfo processInfo] environment];
-      NSString *prefix = [env objectForKey:@"GNUSTEP_LOCAL_ROOT"];
+      NSString *prefix = [env objectForKey:@"GNUSTEP_SYSTEM_ROOT"];
       
       if (prefix && ![prefix isEqualToString:@""]) {
 	path =[prefix stringByAppendingPathComponent:@"Library/ProjectCenter"];
       }
       else {
-	path = [NSString stringWithString:@"/usr/GNUstep/Local/Library/ProjectCenter"];
+	path = [NSString stringWithString:@"/usr/GNUstep/System/Library/ProjectCenter"];
       }
       
       [[NSUserDefaults standardUserDefaults] setObject:path forKey:BundlePaths];
@@ -117,14 +117,14 @@
     }
 
     if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
-      [NSException raise:@"PCBundleLoaderPathException" format:@"No valid bundle path specified!"];
+      [NSException raise:@"PCBundleLoaderPathException" format:@"No valid bundle path specified:\n%@",path];
       return;
     }
 #ifdef DEBUG
     else {
       NSLog([NSString stringWithFormat:@"Loading bundles at %@",path]);
     }
-#endif DEBUG
+#endif// DEBUG
 
     dir = [[NSFileManager defaultManager] directoryContentsAtPath:path];
     enumerator = [dir objectEnumerator];

PCLibProj/GNUmakefile

@@ -21,6 +21,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME = PCLibProj

PCLibProj/PC.proj

@@ -12,7 +12,7 @@
     LAST_EDITING = ""; 
     LIBRARIES = ("gnustep-base"); 
     MAKEFILEDIR = "/usr/GNUstep/Makefiles"; 
-    INSTALLDIR = "$(HOME)/Apps";
+    INSTALLDIR = "$(GNUSTEP_LOCAL_ROOT)";
     OTHER_FILES = (); 
     OTHER_RESOURCES = ("Version"); 
     OTHER_SOURCES = (); 

PCToolProj/GNUmakefile

@@ -20,6 +20,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME 		= PCToolProj

PCToolProj/PC.proj

@@ -13,7 +13,7 @@
     LAST_EDITING = ""; 
     LIBRARIES = ("gnustep-base"); 
     MAKEFILEDIR = "/usr/GNUstep/Makefiles"; 
-    INSTALLDIR = "$(HOME)/Tools";
+    INSTALLDIR = "$(GNUSTEP_LOCAL_ROOT)/Tools";
     OTHER_FILES = (); 
     OTHER_RESOURCES = (); 
     OTHER_SOURCES = (); 

ProjectCenter/PCAppController.m

@@ -42,7 +42,7 @@
 {
     NSMutableDictionary	*defaults = [NSMutableDictionary dictionary];
     NSDictionary *env = [[NSProcessInfo processInfo] environment];
-    NSString *prefix = [env objectForKey:@"GNUSTEP_LOCAL_ROOT"];
+    NSString *prefix = [env objectForKey:@"GNUSTEP_SYSTEM_ROOT"];
     NSString *_bundlePath;
 
     if (prefix && ![prefix isEqualToString:@""]) {