From 7277b160178a800d3cd78a9c9c6c0fcbb2f2e1ce Mon Sep 17 00:00:00 2001
From: Scott Fennell <spfennell@gmail.com>
Date: Fri, 23 Oct 2020 15:45:32 -0500
Subject: [PATCH] #1063 move sim service xml file (#1069)

Co-authored-by: Fennell, Scott P 263712616 <scott.p.fennell@nasa.gov>
---
 Makefile                                                    | 5 ++++-
 libexec/trick/sie_concat                                    | 2 +-
 share/trick/xml/.gitignore                                  | 1 +
 trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp | 4 ++--
 trick_source/sim_services/include/Makefile                  | 5 +----
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 share/trick/xml/.gitignore

diff --git a/Makefile b/Makefile
index 5c73a08b..be8bd0cd 100644
--- a/Makefile
+++ b/Makefile
@@ -346,7 +346,7 @@ sim_test:
 ################################################################################
 
 
-clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java
+clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java clean_sim_serv_xml
 	@/bin/rm -rf $(TRICK_BIN_DIR)
 	@/bin/rm -rf $(TRICK_LIB_DIR)
 
@@ -394,6 +394,9 @@ clean_dp:
 clean_java:
 	@ $(MAKE) -C ${TRICK_HOME}/trick_source/java clean
 
+clean_sim_serv_xml:
+	@/bin/rm -rf ${TRICK_HOME}/share/trick/xml/*
+
 
 # FIXME: Seems to me that the for loop below should be removed and that the
 #        'clean' target in trick_sims/makefile should be doing this. --Penn
diff --git a/libexec/trick/sie_concat b/libexec/trick/sie_concat
index aa080e28..f1da5b59 100755
--- a/libexec/trick/sie_concat
+++ b/libexec/trick/sie_concat
@@ -13,7 +13,7 @@ while(my $line = <$classes_resource>) {
 }
 close($classes_resource);
 
-open(my $sim_services_resource, "<", "$ENV{TRICK_HOME}/trick_source/sim_services/include/sim_services_classes.resource")
+open(my $sim_services_resource, "<", "$ENV{TRICK_HOME}/share/trick/xml/sim_services_classes.resource")
 	or open(my $sim_services_resource, "<", "$ENV{TRICK_HOME}/temp_src/io_src/sim_services_classes.resource")
 	or die "cannot open sim_services_classes.resource";
 
diff --git a/share/trick/xml/.gitignore b/share/trick/xml/.gitignore
new file mode 100644
index 00000000..ff84eba6
--- /dev/null
+++ b/share/trick/xml/.gitignore
@@ -0,0 +1 @@
+*sim_services_classes.resource
diff --git a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
index 279626de..51a6f9fc 100644
--- a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
@@ -279,7 +279,7 @@ void PrintAttributes::printSieClass( ClassValues * cv ) {
     #ifdef EXTERNAL_BUILD
         xmlFileName = output_dir + "/sim_services_classes.resource";
     #else
-        xmlFileName = std::string(getenv("TRICK_HOME")) + "/trick_source/sim_services/include/sim_services_classes.resource";
+        xmlFileName = std::string(getenv("TRICK_HOME")) + "/share/trick/xml/sim_services_classes.resource";
     #endif
     } else {
         xmlFileName = "build/classes.resource";
@@ -320,7 +320,7 @@ void PrintAttributes::printSieEnum( EnumValues * ev ) {
     #ifdef EXTERNAL_BUILD
         xmlFileName = output_dir + "/sim_services_classes.resource";
     #else
-        xmlFileName = std::string(getenv("TRICK_HOME")) + "/trick_source/sim_services/include/sim_services_classes.resource";
+        xmlFileName = std::string(getenv("TRICK_HOME")) + "/share/trick/xml/include/sim_services_classes.resource";
     #endif
 
     } else {
diff --git a/trick_source/sim_services/include/Makefile b/trick_source/sim_services/include/Makefile
index e1035144..780ed514 100644
--- a/trick_source/sim_services/include/Makefile
+++ b/trick_source/sim_services/include/Makefile
@@ -2,7 +2,4 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefi
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
 
-resource_clean:
-	$(RM) -f sim_services_classes.resource
-
-real_clean: resource_clean
+real_clean: