From 023488409980f23935a75778eff5f10724f075e8 Mon Sep 17 00:00:00 2001
From: Riccardo Mottola <rm@gnu.org>
Date: Wed, 22 Oct 2008 19:55:32 +0000
Subject: [PATCH] fix memory related crash, enhancements for relative install
 paths

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@26954 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                                   | 11 +++++++++++
 Framework/PCProjectBuilder.m                | 11 ++++-------
 Modules/Projects/Application/PCAppProject.m | 11 +++++++++++
 Modules/Projects/Tool/PCToolProject.m       | 11 +++++++++++
 Resources/Info-gnustep.plist                |  4 ++--
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e9ab12..38cf66d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-22 Riccardo Mottola <rmottola@users.sf.net>
+
+	* English.lproj/Info.grom: correct bugtracker URL
+
+2008-10-22 Wolfgang Lux <wolfgang.lux@gmail.com>
+
+	* Framework/PCProjectBuilder.m: fix memory related crash
+	* Framework/PCProjectBuilder.m,
+	Modules/Projects/Application/PCAppProject.m,
+	Modules/Projects/Tool/PCToolProject.m: enhancements for relative install paths
+
 2008-10-18 18:18-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* ChangeLog: Moved to here top level of project.
diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m
index cfdd311..8c273cb 100644
--- a/Framework/PCProjectBuilder.m
+++ b/Framework/PCProjectBuilder.m
@@ -237,6 +237,7 @@
       return NO;
     }
 
+  [makePath retain];
   return YES;
 }
 
@@ -302,7 +303,8 @@
       ![instDir isEqualToString:@"SYSTEM"] &&
       ![instDir isEqualToString:@"USER"] &&
       ![instDir isEqualToString:@"NETWORK"] &&
-      ![instDir isEqualToString:@""])
+      ![instDir isEqualToString:@""] &&
+      ([instDir isAbsolutePath] || [instDir characterAtIndex:0] == '$'))
     {
       [args addObject:[NSString stringWithFormat:@"DESTDIR=%@", instDir]];
     }
@@ -475,13 +477,8 @@
     }
 
   // Get make tool path
-  makePath = [[NSUserDefaults standardUserDefaults] objectForKey:BuildTool];
-
-  if (!makePath || ![[NSFileManager defaultManager] fileExistsAtPath:makePath])
+  if (![self setMakePath])
     {
-      NSRunAlertPanel(@"Build terminated",
-  		      @"Build tool not found.\nFile \"%@\" doesn't exist!",
-  		      @"OK", nil, nil, makePath);
       return NO;
     }
 
diff --git a/Modules/Projects/Application/PCAppProject.m b/Modules/Projects/Application/PCAppProject.m
index 78f3865..f001f56 100644
--- a/Modules/Projects/Application/PCAppProject.m
+++ b/Modules/Projects/Application/PCAppProject.m
@@ -541,6 +541,17 @@
 	[NSString stringWithFormat:@"%@_STANDARD_INSTALL = no\n",
         projectName]];
     }
+  else if (![installDir isEqualToString:@"LOCAL"] &&
+	   ![installDir isEqualToString:@"SYSTEM"] &&
+	   ![installDir isEqualToString:@"USER"] &&
+	   ![installDir isEqualToString:@"NETWORK"] &&
+	   ![installDir isAbsolutePath] &&
+	   [installDir characterAtIndex:0] != '$')
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"%@_COPY_INTO_DIR = %@\n",
+        projectName, installDir]];
+    }
   else
     {
       /* IMPORTANT FIXME/TODO: We should be using GNUSTEP_INSTALLATION_DOMAIN,
diff --git a/Modules/Projects/Tool/PCToolProject.m b/Modules/Projects/Tool/PCToolProject.m
index 5f206a4..474e18d 100644
--- a/Modules/Projects/Tool/PCToolProject.m
+++ b/Modules/Projects/Tool/PCToolProject.m
@@ -365,6 +365,17 @@
 	[NSString stringWithFormat:@"%@_STANDARD_INSTALL = no\n",
         projectName]];
     }
+  else if (![installDir isEqualToString:@"LOCAL"] &&
+	   ![installDir isEqualToString:@"SYSTEM"] &&
+	   ![installDir isEqualToString:@"USER"] &&
+	   ![installDir isEqualToString:@"NETWORK"] &&
+	   ![installDir isAbsolutePath] &&
+	   [installDir characterAtIndex:0] != '$')
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"%@_COPY_INTO_DIR = %@\n",
+        projectName, installDir]];
+    }
   else
     {
       /* IMPORTANT FIXME/TODO: We should be using GNUSTEP_INSTALLATION_DOMAIN,
diff --git a/Resources/Info-gnustep.plist b/Resources/Info-gnustep.plist
index acf4145..705791c 100644
--- a/Resources/Info-gnustep.plist
+++ b/Resources/Info-gnustep.plist
@@ -62,6 +62,6 @@
     }
   );
   URL = "See http://www.gnustep.org/";
-  Copyright = "Copyright (C) 1999 - 2005 Free Software Foundation";
-  CopyrightDescription = "Released under the GNU General Public License 2.0";
+  Copyright = "Copyright (C) 1999 - 2008 Free Software Foundation";
+  CopyrightDescription = "Released under the GNU General Public License 3.0 or later";
 }