Skip to content

Commit 33b13b6

Browse files
Pherring04hchen99
andauthored
Trick ify (#1808)
* Implmented trick-ify * Cleaning up code * CI Fix * Shared library test fix * CI Fix * CI Fix * Added old trickify test * Added S_source.hh * Changed old trickified test to generate an archive * Added support for archive trickify builds on mac * Trickify MAC fixes * Trickify shared on mac fix * Moved the py files to their appropriate directory * CI fix * Improved trick-ify arguments * CI * CI * CI * CI * CI * CI * CI * Added C support * Removed trickified shared test from MAC CI * Start of trickify GUI * Checkpoint * Trickify GUI * Test fix * CI * CI * CI * S_overrides fix * Updated to support the dylib build type for Mac and implement a compatible approach for ONESHELL that works with both make 3.81 and 4.2.1. Updated to support the dylib build type for Mac and implement a compatible approach for ONESHELL that works with both make 3.81 and 4.2.1. * Removed unnecessary -rpath as -install_name has the correct path during compilation. Removed unnecessary -rpath as -install_name has the correct path during compilation. * Added USER_ADDITIONAL_OPTIONS for user to provide additional options to build trickified lib. Added USER_ADDITIONAL_OPTIONS for user to provide additional options to build trickified lib. Updated SIM_trickified_shared to use this option to pass in code coverage options to satisfy trick code coverage ci. * Checkpoint * Lots of changes * Defaulted fPIC for shared libraries on linux * S_overrides * Addressed issues with trickify s overrides * Updated tests to use trickify s overrides * Fxied some dir paths * CI * CI * Fixed S_overrides.mk for SIM_trickified_shared to set proper shared lib based on build type. * S_overrides fix * Camel Caseified * Text fix * Added gui insets * Added exclusions and other cleanup * Some fixes * GUI changes. Will be broken until script changes pushed * Checkpoint * Permission change * Another checkpoint * Checkpoint * Tidying * Fixes for jeod * Checkpoint * Missed some comments * Auto rebuilding implemented for multiple libs + minor fixes * Fixed test * Bug fix * C bug fix * Some makefile changes * Wrapped trickify make into sim make * Docs * Forgot the demo makefile * Removing some leftover test code * Doc cleanup * Doc cleanup * Doc Cleanup * Doc updates * Relative path support * Docs * Docs * Docs * Docs --------- Co-authored-by: Hong Chen <hchen99@users.noreply.github.com>
1 parent 56218ed commit 33b13b6

File tree

113 files changed

+4924
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+4924
-272
lines changed

bin/trick-CP

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ if ( -f $sdefine ) {
5757
open MAKEFILE, ">$makefile" ;
5858
print MAKEFILE $makefile_text ;
5959
close MAKEFILE ;
60+
61+
#Rebuild trickified libraries
62+
if(not defined $ENV{'AM_I_TRICKIFYING'} and -e "trickify.mk")
63+
{
64+
my $cmd_ret = `make -f trickify.mk rebuild_trickify 2>&1` ;
65+
if($cmd_ret ne "")
66+
{
67+
print "$cmd_ret" ;
68+
}
69+
}
70+
6071
system("make -f makefile " . $makefileAddArgs) ;
6172
exit $? >> 8;
6273
} else {
@@ -143,6 +154,7 @@ __END__
143154
# CP found at SUB_TRICK_BIN
144155
145156
# Disable built-in implicit rules to increase build speed.
157+
146158
.SUFFIXES:
147159
148160
.PHONY: all
@@ -245,7 +257,10 @@ Simulation make options:\n\
245257
make print-<variable> - Prints a makefile or environment variable"
246258
247259
CLEAN_TARGETS = tidy clean spotless distclean apocalypse
248-
ifeq ($(findstring ${MAKECMDGOALS},$(CLEAN_TARGETS)),)
260+
ifdef AM_I_TRICKIFYING
261+
include build/Makefile_S_define
262+
include build/Makefile_src
263+
else ifeq ($(findstring ${MAKECMDGOALS},$(CLEAN_TARGETS)),)
249264
include build/Makefile_S_define
250265
include build/Makefile_src
251266
include build/Makefile_src_deps
@@ -256,6 +271,7 @@ include build/Makefile_swig_deps
256271
endif
257272
-include build/Makefile_overrides
258273
-include S_overrides.mk
274+
-include trickify.mk
259275
-include S_post.mk
260276
261277
ifndef MAKE_RESTARTS
@@ -277,15 +293,19 @@ tidy:
277293
-rm -f S_main* T_main*
278294
-rm -f build/Makefile_*
279295
280-
clean: tidy
296+
clean: tidy clean_trickify
281297
-rm -f DP_Product/DP_rt_frame DP_Product/DP_rt_itimer
282298
-rm -f DP_Product/DP_rt_jobs DP_Product/DP_rt_timeline DP_Product/DP_mem_stats
283299
-rm -rf build .trick trick.zip
284300
-rm -f makefile
285301
286-
spotless: clean
302+
spotless: clean spotless_trickify
287303
288304
distclean: clean
289305
290-
apocalypse: clean
291-
@echo "I love the smell of napalm in the morning"
306+
apocalypse: clean apocalypse_trickify
307+
@echo "I love the smell of napalm in the morning <3"
308+
309+
clean_trickify: ;
310+
spotless_trickify: ;
311+
apocalypse_trickify: ;

0 commit comments

Comments
 (0)