From c27438e6c59f12440760d09e23cd39d6c393122b Mon Sep 17 00:00:00 2001 From: "Philippe C.D. Robert" Date: Wed, 2 Jan 2002 12:13:06 +0000 Subject: [PATCH] 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 | 10 +++++++--- PCAppProj/AppController.h | 2 +- PCAppProj/AppController.m | 2 +- PCAppProj/GNUmakefile | 2 ++ PCAppProj/PC.proj | 2 +- PCBaseFileTypes/GNUmakefile | 2 ++ PCBundleProj/GNUmakefile | 2 ++ PCBundleProj/PC.proj | 2 +- PCGormProj/GNUmakefile | 4 +++- PCGormProj/PC.proj | 2 +- PCLib/PCBundleLoader.m | 12 ++++++------ PCLibProj/GNUmakefile | 2 ++ PCLibProj/PC.proj | 2 +- PCToolProj/GNUmakefile | 2 ++ PCToolProj/PC.proj | 2 +- ProjectCenter/PCAppController.m | 2 +- 16 files changed, 34 insertions(+), 18 deletions(-) diff --git a/INSTALL b/INSTALL index c070b44..0b14489 100644 --- a/INSTALL +++ b/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 diff --git a/PCAppProj/AppController.h b/PCAppProj/AppController.h index b9a0f16..0a772f9 100644 --- a/PCAppProj/AppController.h +++ b/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 * diff --git a/PCAppProj/AppController.m b/PCAppProj/AppController.m index 68ac888..1a10c45 100644 --- a/PCAppProj/AppController.m +++ b/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 * diff --git a/PCAppProj/GNUmakefile b/PCAppProj/GNUmakefile index 50258f1..a023adb 100644 --- a/PCAppProj/GNUmakefile +++ b/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 diff --git a/PCAppProj/PC.proj b/PCAppProj/PC.proj index 22cc4f4..249f893 100644 --- a/PCAppProj/PC.proj +++ b/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 = (); diff --git a/PCBaseFileTypes/GNUmakefile b/PCBaseFileTypes/GNUmakefile index 53fcbfd..b8d6f6f 100644 --- a/PCBaseFileTypes/GNUmakefile +++ b/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 diff --git a/PCBundleProj/GNUmakefile b/PCBundleProj/GNUmakefile index 876831d..af80547 100644 --- a/PCBundleProj/GNUmakefile +++ b/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 diff --git a/PCBundleProj/PC.proj b/PCBundleProj/PC.proj index 43251fb..03f38dc 100644 --- a/PCBundleProj/PC.proj +++ b/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 = (); diff --git a/PCGormProj/GNUmakefile b/PCGormProj/GNUmakefile index 0f4f8b2..64e86be 100644 --- a/PCGormProj/GNUmakefile +++ b/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 \ diff --git a/PCGormProj/PC.proj b/PCGormProj/PC.proj index 36b6d53..1fb800b 100644 --- a/PCGormProj/PC.proj +++ b/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 = (); diff --git a/PCLib/PCBundleLoader.m b/PCLib/PCBundleLoader.m index 6985a59..6580cd6 100644 --- a/PCLib/PCBundleLoader.m +++ b/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]; diff --git a/PCLibProj/GNUmakefile b/PCLibProj/GNUmakefile index d6df090..f613dcd 100644 --- a/PCLibProj/GNUmakefile +++ b/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 diff --git a/PCLibProj/PC.proj b/PCLibProj/PC.proj index 1dc70d1..79a38e9 100644 --- a/PCLibProj/PC.proj +++ b/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 = (); diff --git a/PCToolProj/GNUmakefile b/PCToolProj/GNUmakefile index bb9c8bd..b4746d2 100644 --- a/PCToolProj/GNUmakefile +++ b/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 diff --git a/PCToolProj/PC.proj b/PCToolProj/PC.proj index 3671b2f..6f9db03 100644 --- a/PCToolProj/PC.proj +++ b/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 = (); diff --git a/ProjectCenter/PCAppController.m b/ProjectCenter/PCAppController.m index ca4c1fa..00b8675 100644 --- a/ProjectCenter/PCAppController.m +++ b/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:@""]) {