From bc41b3d84605faafda72e0218d733e7688f0b956 Mon Sep 17 00:00:00 2001
From: Hong Chen <hong.chen-1@nasa.gov>
Date: Wed, 20 Mar 2024 13:59:43 -0500
Subject: [PATCH 1/2] Add trickeifed classes.resource to sie generation after
 cp.

---
 libexec/trick/sie_concat | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/libexec/trick/sie_concat b/libexec/trick/sie_concat
index 29e6817b0..2580d7f25 100755
--- a/libexec/trick/sie_concat
+++ b/libexec/trick/sie_concat
@@ -1,6 +1,13 @@
 #!/usr/bin/perl
 package sie_concat;
 
+use File::Basename ;
+use FindBin qw($RealBin);
+use lib "$RealBin/pm" ;
+use get_paths ;
+
+my @trick_python_paths = get_paths( "TRICK_PYTHON_PATH") ;
+
 open(my $S_sie_resource, ">", "./S_sie.resource")
 	or die "cannot open S_sie.resource $!";
 print $S_sie_resource "<?xml version=\"1.0\"?>\n\n<sie>\n\n";
@@ -14,6 +21,17 @@ while(my $line = <$classes_resource>) {
 
 close($classes_resource);
 
+# Add trickified classes.resource if available
+foreach my $path ( @trick_python_paths ) {
+	my $trickified_dir = dirname($path);
+	open(my $classes_resource, "<", "$trickified_dir/build/classes.resource")
+		or die "cannot open $trickified_dir/build/classes.resource";
+	while(my $line = <$classes_resource>) {
+		print $S_sie_resource $line;
+	}
+	close($classes_resource);
+}
+
 open(my $top_level_objects_resource, "<", "build/top_level_objects.resource")
 	or die "cannot open build/top_level_objects.resource";
 while(my $line = <$top_level_objects_resource>) {

From 6fa7d75d7db936be26e3f058a85d69edb6f6c8f5 Mon Sep 17 00:00:00 2001
From: Hong Chen <hong.chen-1@nasa.gov>
Date: Wed, 27 Mar 2024 13:48:51 -0500
Subject: [PATCH 2/2] Go through all trickified classes.resource files if
 available and don't die on any if not found.

---
 libexec/trick/sie_concat | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libexec/trick/sie_concat b/libexec/trick/sie_concat
index 2580d7f25..afac248e7 100755
--- a/libexec/trick/sie_concat
+++ b/libexec/trick/sie_concat
@@ -24,12 +24,12 @@ close($classes_resource);
 # Add trickified classes.resource if available
 foreach my $path ( @trick_python_paths ) {
 	my $trickified_dir = dirname($path);
-	open(my $classes_resource, "<", "$trickified_dir/build/classes.resource")
-		or die "cannot open $trickified_dir/build/classes.resource";
-	while(my $line = <$classes_resource>) {
-		print $S_sie_resource $line;
+	if (open(my $classes_resource, "<", "$trickified_dir/build/classes.resource")) {
+		while(my $line = <$classes_resource>) {
+			print $S_sie_resource $line;
+		}
+		close($classes_resource);
 	}
-	close($classes_resource);
 }
 
 open(my $top_level_objects_resource, "<", "build/top_level_objects.resource")