ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#1063 move sim service xml file (#1069)

Browse Source 
Co-authored-by: Fennell, Scott P 263712616 <scott.p.fennell@nasa.gov>
This commit is contained in:
Scott Fennell 2020-10-23 15:45:32 -05:00 committed by GitHub
parent e72f703e5b
commit 7277b16017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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

2
libexec/trick/sie_concat
View File

@ -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";

1
share/trick/xml/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*sim_services_classes.resource

4
trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
View File

@ -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 {

5
trick_source/sim_services/include/Makefile
View File

@ -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: