From cbd52e03a3aa2eb63d94544a4d3316426defff13 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Sun, 15 Aug 2021 04:27:25 -0400
Subject: [PATCH] Add switch to determine if we are in strict mode.

---
 ChangeLog                                     |   2 +-
 .../BuilderOptions.gorm/data.classes          |   3 ++-
 .../BuilderOptions.gorm/data.info             | Bin 184 -> 184 bytes
 .../BuilderOptions.gorm/objects.gorm          | Bin 4909 -> 6343 bytes
 Framework/PCProjectBuilder.m                  |  22 ++++++++++++++----
 Framework/PCProjectBuilderOptions.m           |   6 +++++
 Headers/ProjectCenter/PCDefines.h             |   1 +
 Headers/ProjectCenter/PCProjectBuilder.h      |   3 ++-
 .../ProjectCenter/PCProjectBuilderOptions.h   |   1 +
 9 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dddf01a..711c9fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2021-08-11 Gregory John Casamento <greg.casamento@gmail.com>
 
-	* Framework/PCProjectBuilder.m: Fix issue where environment var
+	* Framework/PCProjectBuilder.m: Quick Fix issue where environment var
 	was causing build to fail.  Explicitly set environment for NSTask
 	for build to prevent this problem.
 
diff --git a/Framework/English.lproj/BuilderOptions.gorm/data.classes b/Framework/English.lproj/BuilderOptions.gorm/data.classes
index e6952ac..c118240 100644
--- a/Framework/English.lproj/BuilderOptions.gorm/data.classes
+++ b/Framework/English.lproj/BuilderOptions.gorm/data.classes
@@ -19,7 +19,8 @@
 	    optionsPanel,
 	    stripButton,
 	    sharedLibsButton,
-	    targetPopup
+	    targetPopup,
+	    strictButton
 	);
 	Super = NSObject;
     };
diff --git a/Framework/English.lproj/BuilderOptions.gorm/data.info b/Framework/English.lproj/BuilderOptions.gorm/data.info
index da98e4327f70ff8ec64d5cb98405097d84145e8a..26bb98e9164142d86386ac44f3a15b22024dd0ac 100644
GIT binary patch
delta 36
rcmdnNxPwvL-7mDbB(*>xu_!qsvn<uXz#z@U$i!fxxId%J#PmP_+q?@;

delta 36
qcmdnNxPwvL-7mDbB(*>xu_!qsvn<sB2#iwAlP8M%GjdK$4+H?*v<qzj

diff --git a/Framework/English.lproj/BuilderOptions.gorm/objects.gorm b/Framework/English.lproj/BuilderOptions.gorm/objects.gorm
index 5f414397ce1ab68a04b58dd61c178c5a216afed2..94f810ecbb2fe953a0c0890e37196993a65aa72f 100644
GIT binary patch
literal 6343
zcmd^D-E-T<5kErIHziZnheO*^Xf<)Iv`H6=Y`1QkP@*HnvP3C{<+M(}K=Mq%CJ7b<
zEqnUXr}nLb@q1?aCxHJ!XYvpAv2V%l9&myUN{%P;Ogoh<`iHya-rfFo54*cnIq3Sb
zQ?$L>q4QJ%z@xR*HMoTUe^yr`aPvk40H-o$Moe#66{lKu+rI6zr6+_iOhb%Sti9@E
zS@ZE(2r$eck*ip{J>RZ2r6qaT%!=WP6+MWnD3^gDb6DiJtS_B*-95T5Tb-uuOPVo9
zXr*$~?slysyVK#7P;=HCrNu1YbJ`6OWJROzBb=DWkI}5C2uth>TeO7~O><0)R;+!y
zEt{-%oW8A=!{;G$LQGbyd$QYc+jU+eBS@DB78Y`!{+o~xxze%%3%Qc_PlmaYEHc>U
zPt<fL0s@7em-r!9`r9)GFl<hWk&5-ekw-Z2hD+d1SPOn=FkmN!z~79KiFb592w=p_
ziD}Kly64%?NtHQ8Mu{Jl3CGEL<1lJYlSS^!Xa1%mn{^z_nCHZJ#Ujc*m#uhgBGN`b
zxzbnvVt^a_f&mU)SKx&Gzbf|X{sr!Tte+!45!$#gZsx_g#Qw^%Nn0|^8FIMwn(w&n
zXe?u%C!<GCSpgIMQPMU}1P}9ZjdiclYst3X4PeroCGkx>Ce9D>8HXp=OG1Pbyf?D%
z;9qU?G!QWz8fY0k5`$be2!fP+JS)Bz(3T2b1duc5i0HE0bSY4W1WYLt%;<QTQSnm2
zcxhq0)J0jiqKSVVMo|YxYeK@b`qqdx+=yX4$J?U?=hV!so|!d#be#>m_N3vty>^|~
zhJ1f6oC>F5Cd~kevk=)fcme18)1-_8kp8EiT*)pmI9u<UO?lT`KM(Wi!``>OhV+AQ
zGMqob17g3><fcKIJ}r})I%`h|b74NR?}9lmrtn5|I|rSOp6|PDv~0#)pnLK7`8dK$
z_mt_8gCa@_y5Al%Kw54na6*K?D#o@;+)xu3;TKXIyklMvGcRp0ir^vh9lp$DyLShD
zPe*=%B42GimK0D>EQ$aw_SrkL!2s$qiLo>rMjVSnF-Q?LASkl|Trw}xRkDjaMFV9-
zSb)pwoEf@yGO%b~5)(>*j)G%Z6bcJ!o&2%ZZ*@Ey8N3|u3@`KuKW0RLGjFoL0cSW?
z`637l^v{T-5?dM3iv+<W@y;K5Py_a}@KT_a#vpSFFa#|17j)p4?$H7i_>tPA(}9|M
zozq2PgPiW&l+zXa1-PPIW=Y>=OU9PO6bCbsVqI2yjRvM1MW_A9^;$N)XJFa9O!w=Z
zmfeuJsSLh<;Ya2oy`bXMC(cs@=P6@a_n5I|Sx1gvI}9&|R}yX*-z3TZPjOA{qXTHw
zl*HhS-!JSc@LvBi9{c_NBE4Jl`ha<TKub0;F_iTIKBW(a&iy){LKnF@&_$v|;%r^y
z$0--NhAy(AT!i0HoIy+*52ROhyRzu^{7%mgmyynu|6w}A_kK7{9}J{vEehMj>*I$<
z@=sDU{S;~XP|-A}opH`MK#IDDwkPYwrc?E7&yigw>%;$ZvOXF}*2dc)>t`vl0Ld~H
zS&N#iMT4rlPEkISHB~@%i*~zSbh*G(tYOJ{>aV_7^tGrjN)7bXDd26~m}e1UtBEZ6
zI72(G!5%CAURQ&?D#kWVWN1`_eVk%#t)Hi>|6*8(I7p^ZT!UgA%KXGH9&O<?FW+No
za5nr#JRVn&SQl|Nj61|?<N84FKX@D7e<Nkbo9O*NSKdFVy?>IuzvdTPZe7w11;2RR
zOXt)`Kt56|Xwzw+SvUp!x5mOPDlXxd%1T_Lawljcixup1(G@<{wJrFSnx7{_^Za~P
z90>=zM0KookHiMox=%y{D_>XicwE=Q@au$je({eOs)+=jsF^8E;FPh^bDH(yUWanT
zZum*EkyO;4_08WI=1SlE<*$U|<e1_o{!<8ZqnKezu_jJPe82t=slk-_AD=UTPa}te
zQViD3B{8dW)7uVrOKeZ|gx;kx>g6%cS*Kt_9Wkemm@{;L=-TQ^cpl11BH39{1=+Q=
zmGC;;R@2F}DN%o3gOzXrK09p@lo*B06Boffd;nW&`eh=hzNMm&*0>3uE0I*Ua1Z&X
zZlMQvl*9#n)C<ObdEaxXwaK(fFX9!pPuvc!wFGz7^kAczE8!~aoT%XAmGC3jRny6m
zf!mmLlp(07Sw0Fo<fuX2MVcIjy%RO#!dGEm`9pzf(E@y77OAXOP2D!0lY2$j^{Rxs
z0o>~s!_UG>02YD`0{0QzCUAgYo4^AEdj!5juu0%I2zChk*1RI-SovPhZ%XX+v=d9f
z!^A0)?ORPqxC>vY$|7k<SA`av1Af=P5<U!X!|#<`@+S4UZ-cJZ>%bpaY!CjZ#FB3E
zRHg9BW8qIMxD9q%A6J2qSe3<gpq3WvQu-2!)mdy4q!LTkM=BlNajM-&_K~?P=3^$P
z*ZQ)x(CQDNq4XqE+t?a(%<`e#ZpivAIP5PYClA3<@_g;FpUfMPyjrx}bZSrN3y<*&
z+h|A!o*>#`)I_w&sD*^yB|_VLp1a^Gy~&WS(zS;T)h;)Vp@WilaR+}^l1V?VV@24&
mvKl;8TPC$#1Y2P_0H5`jp{G0}$vT;pqL5-5p7xixGyEMx&rL4?

literal 4909
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
Un&~{MtEOsTqYZ!So#&GOKQdq}1^@s6

diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m
index 0cfd57a..d119fe2 100644
--- a/Framework/PCProjectBuilder.m
+++ b/Framework/PCProjectBuilder.m
@@ -366,6 +366,15 @@
       verboseBuilding = NO;
     }
 
+  if ([[projectDict objectForKey:PCBuilderStrict] isEqualToString:@"YES"])
+    {
+      strictBuilding = YES;
+    }
+  else
+    {
+      strictBuilding = NO;
+    }
+  
   return args;
 }
 
@@ -598,14 +607,17 @@
 
   NSMutableDictionary *env = [[NSMutableDictionary alloc] init];
 
-  // optionally copy in existing environment first:
-  // (we could also copy values for a limited set of specific keys, if we wanted.)
   [env addEntriesFromDictionary:[[NSProcessInfo processInfo] environment]];
-  // then add/remove anything else we might want:
-  [env removeObjectForKey:@"GNUSTEP_USER_ROOT"];
+  if (strictBuilding == NO)
+    {
+      [env setObject: @"no" forKey:@"GNUSTEP_MAKE_STRICT_V2_MODE"];
+    }
+  else
+    {
+      [env setObject: @"yes" forKey:@"GNUSTEP_MAKE_STRICT_V2_MODE"];
+    }
 
   makeTask = [[NSTask alloc] init];
-  // now set the task up to use this newly-built environment:
   [makeTask setEnvironment:env];
   [makeTask setArguments:buildArgs];
   [makeTask setCurrentDirectoryPath:[project projectPath]];
diff --git a/Framework/PCProjectBuilderOptions.m b/Framework/PCProjectBuilderOptions.m
index 55a5093..be1eb6f 100644
--- a/Framework/PCProjectBuilderOptions.m
+++ b/Framework/PCProjectBuilderOptions.m
@@ -86,6 +86,7 @@
   [debugButton setRefusesFirstResponder:YES];
   [stripButton setRefusesFirstResponder:YES];
   [sharedLibsButton setRefusesFirstResponder:YES];
+  [strictButton setRefusesFirstResponder:YES];
 
   [self loadProjectProperties:nil];
 }
@@ -161,6 +162,8 @@
     key = PCBuilderStrip;
   if (sender == sharedLibsButton)
     key = PCBuilderSharedLibs;
+  if (sender == strictButton)
+    key = PCBuilderStrict;
 
   [project setProjectDictObject:value forKey:key notify:NO];
 }
@@ -191,6 +194,9 @@
   [self _setStateForButton:sharedLibsButton
 		       key:PCBuilderSharedLibs
 	      defaultState:NSOnState];
+  [self _setStateForButton:strictButton
+		       key:PCBuilderStrict
+	      defaultState:NSOffState];
 }
 
 @end
diff --git a/Headers/ProjectCenter/PCDefines.h b/Headers/ProjectCenter/PCDefines.h
index 3abde90..6762bbd 100644
--- a/Headers/ProjectCenter/PCDefines.h
+++ b/Headers/ProjectCenter/PCDefines.h
@@ -171,6 +171,7 @@ static NSString * const PCBuilderDebug         = @"BUILDER_DEBUG";
 static NSString * const PCBuilderStrip         = @"BUILDER_STRIP";
 static NSString * const PCBuilderVerbose       = @"BUILDER_VERBOSE";
 static NSString * const PCBuilderSharedLibs    = @"BUILDER_SHARED_LIBS";
+static NSString * const PCBuilderStrict        = @"BUILDER_STRICT";
 
 // Application specific
 static NSString * const PCAppIcon              = @"APPLICATIONICON";
diff --git a/Headers/ProjectCenter/PCProjectBuilder.h b/Headers/ProjectCenter/PCProjectBuilder.h
index 400f6de..c7a189d 100644
--- a/Headers/ProjectCenter/PCProjectBuilder.h
+++ b/Headers/ProjectCenter/PCProjectBuilder.h
@@ -55,7 +55,8 @@ typedef enum _ErrorLevel {
 
   // Options panel
   BOOL            verboseBuilding;
-
+  BOOL            strictBuilding;
+  
   NSString        *buildStatus;
   NSMutableString *buildStatusTarget;
   NSMutableString *buildTarget;
diff --git a/Headers/ProjectCenter/PCProjectBuilderOptions.h b/Headers/ProjectCenter/PCProjectBuilderOptions.h
index 1b346b1..9913735 100644
--- a/Headers/ProjectCenter/PCProjectBuilderOptions.h
+++ b/Headers/ProjectCenter/PCProjectBuilderOptions.h
@@ -39,6 +39,7 @@
   NSButton      *debugButton;       // debug=no
   NSButton      *stripButton;       // strip=yes
   NSButton      *sharedLibsButton;  // shared=no
+  NSButton      *strictButton;      // GNUSTEP_MAKE_STRICT_V2_MODE yes/no
 }
 
 - (id)initWithProject:(PCProject *)aProject delegate:(id)aDelegate;