From d6a49c572a12f2d2514f9f622502326ae5ac0290 Mon Sep 17 00:00:00 2001
From: Sergii Stoian <stoyan255@gmail.com>
Date: Fri, 20 Mar 2009 00:53:39 +0000
Subject: [PATCH] * Framework/PCProject.m: (buildTargets): Return default build
 targets only if project file doesn't contains list them. *
 Framework/PCProjectBuilder.m: (prebuildCheck): Create build directory only if
 preference was set. (build:): Set initial "=== started ===" string. *
 Framework/PCProjectInspector.m: (createBuildAttributes): Set target and
 action for table view. (searchOrderPopupDidChange:): Add support for "Build
 Targets". (setSearchOrderButtonsState): Enable "Remove" button only if item
 in list was selected. (syncSearchOrder): Add support for "Build Targets". *
 Documentation/TODO: Add some tasks and update status of others. *
 Headers/ProjectCenter/PCDefines.h: Add key for build targets support.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@28099 72102866-910b-0410-8b05-ffd578937521
---
 Documentation/TODO                            |  13 +++++---
 .../BuildAttributes.gorm/objects.gorm         | Bin 13396 -> 13309 bytes
 Framework/PCProject.m                         |  13 +++++++-
 Framework/PCProjectBuilder.m                  |  31 +++++++++++-------
 Framework/PCProjectInspector.m                |  26 +++++++++------
 Headers/ProjectCenter/PCDefines.h             |   2 +-
 6 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/Documentation/TODO b/Documentation/TODO
index 0f7c317..dbe2c2f 100644
--- a/Documentation/TODO
+++ b/Documentation/TODO
@@ -52,7 +52,10 @@ ProjectCenter 0.6
 - Check all textfields if 'scrollable' attribute set            [done!] 
 - Rewrite Preferences (3rd party sections etc.)                 [done!]
 --- Project Builder --------------------------------------------
-  - Finish parsing gcc output (make errors, etc.)               stoyan
+  - Review build, compiler, linker options setting 
+    (Build Options, Inspector)                                  stoyan
+  - Finish parsing build output (compiler errors/warnings, 
+    make errors, gnustep-make verbose mode)                     stoyan
   - Implement interaction with Editor (errors, warnings)        stoyan
 --- Project Editor ---------------------------------------------
   - review situations when editor is opened                     stoyan
@@ -60,13 +63,15 @@ ProjectCenter 0.6
   - Implement interaction with Builder (errors, warnings)       stoyan
   - Implement indentation                                       stoyan
   - implement undo inside editor                                stoyan
-  - Add and use basic editor preferences (fonts, colors, sizes) [25% done]
-- Think about imlementing pending adding/removal of files       ???
+  - Add and use basic editor preferences (fonts, colors, sizes) [50% done]
 - Split "Application" to "Application GORM" and 
-  "Application Renaissance" project types                       ???
+  "Application Renaissance" project types                       stoyan
+- Review all sections of Project Inspector for correct 
+  behaviour                                                     stoyan
 - Add "Palette" project type                                    ???
 - Add "Component" project type                                  ???
 - Process reported bugs                                         ???
+- Think about imlementing pending adding/removal of files       ???
 - New icons. Need volonteers!!!                                 ???
 
 ProjectCenter 0.7
diff --git a/Framework/English.lproj/BuildAttributes.gorm/objects.gorm b/Framework/English.lproj/BuildAttributes.gorm/objects.gorm
index 6506941396dabd820300619cebb7f4a50e3b7aee..7e5afc88d28ce0d06370db14fd396503d8530b60 100644
GIT binary patch
delta 969
zcmX}qO;1xn6b9fPlzQn6EQEq>QYf^gv~X!}izr$Z0Z~w3_!1OR3%!<V1=QlsVEhH>
zN&F42%)Mdh!j)Ung^7t9W1=fWzQm?c6VDlxP4m2+GjG$Gc|Z3jz0w4_6$*mV{q?C$
z?P>2^orK4BS9!o@vz0pOqr9YRDU(fk$C3}zM()w-?;~Fv0IQ#ms%|ubPJ4&BDxeBq
zhutr<QgC9w=7DNl3wsX5%@H)TKFn+N;Kt|vN_?YL;I<Z8HVZ2PJXXluS|QXDHW+n;
zZw#*$%7cql&pOI#V3o3btSXkDHhg3R2)`JOgiS_}u+C`WX{Y?f5VOWCEYsIvTHogN
zX2K4mh44epX{0@=R?<(Y2&pI)<(9*ebaHv9l#DTtNyeFO$u>P~s~Q{~%*+fe<+4Vu
zdtrXwn8idyQOp7j2{?`e5x?4Qg*jIWIDt<hwfafUW>G+gr8LqdlpS10S;_3sVy-u1
zWK#l8$+0~Fr*SRfbtGim5pV{JkvjG4erb(>bLfvYsGa-SDd0SQh<k7$syMpjmURK$
z_>4w+_D5U-E}$9pJ9_2vhJcIsiQ*+0w*>TIg&u@{Y}dVZmst>S8K?DD#}%vDT<17|
zFLj?fXf?~D7chkH^hQ;1rt=ptj0N527?E|G0!A?qt9Oji?j2qo$KjZkxJr?3ArIpM
zCdhR9(v#dmhc3f44s_NsT&F%+FokbpvBV9EvS3QUG+7pqZ(8Ah1r%;^kOdTO%K|#j
zB<k_Hi5Xc?%tKPZEEmu=8B(%=_Q_<>)A-IW=ni3*k+$ds*jaO|YF35{3g)hWyZ9>Z
zQ}1!4B>`Ewj6n20<z4>s^HvMrxN>mgN=eGd8tG)t5U}unY7tx8YLy38kY{aw0hfYy
A%m4rY

delta 1054
zcmZXTOHWf#5XbK{0)^XX1X{46fGwr8rL?yd-zWt{Q7K13tcnkyl~-x8DYBD<Pk@=N
z-@$vs(ztYET-3zG#1Ov#@({#?7!zmiX}WRK{(k4o{7-u3^zY1<+4T;H8h#&G`;v;H
z4h$$8NqAXlcY75@sj$<B+cKD+TuiUz@(Z|D)w^-r`o0E~jZd|z(^*}vs<sTLv&%z;
z^kP&G2&l);ovmQUNXXsfFs$vAQ&q05vh*z%3c0MN_n-(3;Y!F+sp%gCI1xiW+zk0w
z1-Sn2N{o)IWYhU|0nLVA-&-eWA=qYUCHTQ`+VB^_$>e6LW%4jpFtst&F?p%s8$&z6
z9|j-6E<=a0>esiJ{9NuRf{Qr7+#oqfr9Zi#lVG1AMDR;)b`c&*3={sA7$H28sBzLU
z$#nNcsFxgLZe%_o;0((txzUX~U9M_kS`ly->%wi_=Zt{4P%q%TysDb=1=m<Isgb3^
z;9NSB5^%w+)Q<#Q#QCsGy(Ilmz-4?LZdH4v?+dts@4_v%tEJ=y0lgTHxK74XloBtk
zIt27#ZN#hg%eE~6161X<T`Lth1q@;~(xzUQ1=|8{;2ZKG>3afh;>U=u<CYdw?1|CD
z+*E%qTgc}!^p#Cd7jk)eEs8=@q#r2YHa2Qq>aY>iw@go<&^)#gBPb^$K;SE_-FAl;
zcsv5`;#<w5j>_Y91&raQc3Qnh3H#>$I95eN@%!XFrXq|BNRse$OnJajJQLF%vhg5H
zdt?MkDHFI9jrKk!mnjnho{-2ClBayWOd)&5CR4~JIYp-lOyT!vOLCe+xN}NCN@h?a
zNxGCljbzUazrMqdZHC~0Vb-8WQpq&OWM`V^9+!R~U;)Qs9$UtA+7z&eYca2yr4tUQ
ZL_iLWSd+R`_80gy)@;oiKK{Qd{{RB<Tgd<b

diff --git a/Framework/PCProject.m b/Framework/PCProject.m
index b4f376f..2f8a023 100644
--- a/Framework/PCProject.m
+++ b/Framework/PCProject.m
@@ -701,7 +701,18 @@ NSString
 
 - (NSArray *)buildTargets
 {
-  return [[self projectBundleInfoTable] objectForKey:@"BuildTargets"];
+  NSArray *buildTargets = [projectDict objectForKey:PCBuilderTargets];
+
+  if (!buildTargets)
+    {
+      buildTargets = 
+	[[self projectBundleInfoTable] objectForKey:@"BuildTargets"];
+      [self setProjectDictObject:buildTargets
+			  forKey:PCBuilderTargets
+			  notify:NO];
+    }
+
+  return buildTargets;
 }
 
 - (NSArray *)sourceFileKeys
diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m
index fd67534..cd10943 100644
--- a/Framework/PCProjectBuilder.m
+++ b/Framework/PCProjectBuilder.m
@@ -187,9 +187,9 @@
   [errorOutput addTableColumn:errorColumn];
   [errorOutput setDataSource:self];
   [errorOutput setBackgroundColor:[NSColor colorWithDeviceRed:0.88
-                                                             green:0.76 
-                                                              blue:0.60 
-                                                             alpha:1.0]];
+			                                green:0.76 
+			                                 blue:0.60 
+			                                alpha:1.0]];
   [errorOutput setDrawsGrid:NO];
   [errorOutput setTarget:self];
   [errorOutput setAction:@selector(errorItemClick:)];
@@ -206,8 +206,7 @@
   /*
    *  Log output
    */
-  logScroll = [[NSScrollView alloc] 
-    initWithFrame:NSMakeRect (0, 0, 480, 133)];
+  logScroll = [[NSScrollView alloc] initWithFrame:NSMakeRect(0,0,480,133)];
   [logScroll setHasHorizontalScroller:NO];
   [logScroll setHasVerticalScroller:YES];
   [logScroll setBorderType:NSBezelBorder];
@@ -237,9 +236,9 @@
    * Split view
    */
   [split addSubview:errorScroll];
-  RELEASE (errorScroll);
+  RELEASE(errorScroll);
   [split addSubview:logScroll];
-  RELEASE (logScroll);
+  RELEASE(logScroll);
 
 //  [split adjustSubviews];
 //  [componentView addSubview:split];
@@ -532,11 +531,16 @@
     }
 
   // Create root build directory if not exist
-  buildDir = [NSString stringWithFormat:@"%@.build", [project projectName]];
-  buildDir = [rootBuildDir stringByAppendingPathComponent:buildDir];
-  if (![fm fileExistsAtPath:rootBuildDir] || ![fm fileExistsAtPath:buildDir])
+  if (rootBuildDir && ![rootBuildDir isEqualToString:@""])
     {
-      [pcfm createDirectoriesIfNeededAtPath:buildDir];
+      buildDir = [NSString 
+	stringWithFormat:@"%@.build", [project projectName]];
+      buildDir = [rootBuildDir stringByAppendingPathComponent:buildDir];
+      if (![fm fileExistsAtPath:rootBuildDir] || 
+	  ![fm fileExistsAtPath:buildDir])
+	{
+	  [pcfm createDirectoriesIfNeededAtPath:buildDir];
+	}
     }
 
   return YES;
@@ -597,6 +601,11 @@
   [makeTask setStandardOutput:logPipe];
   [makeTask setStandardError:errorPipe];
 
+  [self logString:
+    [NSString stringWithFormat:@"=== %@ started ===", buildStatusTarget]
+   	    error:NO
+	  newLine:YES];
+
   NS_DURING
     {
       [makeTask launch];
diff --git a/Framework/PCProjectInspector.m b/Framework/PCProjectInspector.m
index d98e47c..595ff99 100644
--- a/Framework/PCProjectInspector.m
+++ b/Framework/PCProjectInspector.m
@@ -377,6 +377,9 @@
   // Table
   [searchOrderList setCornerView:nil];
   [searchOrderList setHeaderView:nil];
+  [searchOrderList setTarget:self];
+  [searchOrderList setAction:@selector(searchOrderClick:)];
+//  [searchOrderColumn setEditable:NO];
 
   // Buttons
   [self setSearchOrderButtonsState];
@@ -390,15 +393,19 @@
 {
   NSString *selectedTitle = [sender titleOfSelectedItem];
   
-  if ([selectedTitle isEqualToString: @"Header Directories Search Order"])
+  if ([selectedTitle isEqualToString:@"Header Directories Search Order"])
     {
       ASSIGN(searchItems, searchHeaders);
     }
-  else if ([selectedTitle isEqualToString: @"Library Directories Search Order"])
+  else if ([selectedTitle isEqualToString:@"Library Directories Search Order"])
     {
       ASSIGN(searchItems, searchLibs);
     }
-  else
+  else if ([selectedTitle isEqualToString:@"Build Targets"])
+    {
+      ASSIGN(searchItems,[project buildTargets]);
+    }
+  else  
     {
       ASSIGN(searchItems,nil);
     }
@@ -415,8 +422,6 @@
 
 - (void)searchOrderClick:(id)sender
 {
-  // Warning! NSTableView doesn't call action method
-  // TODO: Fix NSTableView (NSCell/NSActionCell?)
   [self setSearchOrderButtonsState];
 }
 
@@ -425,8 +430,6 @@
   // Disable until implemented
   [searchOrderSet setEnabled:NO];
 
-  return; // See searchOrderClick
-  
   if ([searchOrderList selectedRow] == -1)
     {
       [searchOrderRemove setEnabled:NO];
@@ -472,17 +475,20 @@
   pIndex = [searchOrderPopup indexOfSelectedItem];
   switch (pIndex)
     {
-    case 0:
+    case 0: // Headers
       [project setProjectDictObject:searchItems
                              forKey:PCSearchHeaders
 			     notify:YES];
       break;
-    case 1:
+    case 1: // Libraries
       [project setProjectDictObject:searchItems
                              forKey:PCSearchLibs
 			     notify:YES];
       break;
-    case 2:
+    case 2: // Targets
+      [project setProjectDictObject:searchItems
+                             forKey:PCBuilderTargets
+			     notify:YES];
       return;
     }
 }
diff --git a/Headers/ProjectCenter/PCDefines.h b/Headers/ProjectCenter/PCDefines.h
index 67d6fa8..48fed06 100644
--- a/Headers/ProjectCenter/PCDefines.h
+++ b/Headers/ProjectCenter/PCDefines.h
@@ -163,7 +163,7 @@ static NSString * const PCSearchHeaders        = @"SEARCH_HEADER_DIRS";
 static NSString * const PCSearchLibs           = @"SEARCH_LIB_DIRS";
 
 // Project Builder options
-static NSString * const PCBuilderOptions       = @"BUILDER_OPTIONS";
+static NSString * const PCBuilderTargets       = @"BUILDER_TARGETS";
 static NSString * const PCBuilderArguments     = @"BUILDER_ARGS";
 static NSString * const PCBuilderDebug         = @"BUILDER_DEBUG";
 static NSString * const PCBuilderStrip         = @"BUILDER_STRIP";