Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trick ify #1808

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open

Trick ify #1808

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
be8a772
Implmented trick-ify
Pherring04 Nov 25, 2024
ba693dc
Cleaning up code
Pherring04 Nov 25, 2024
1e7f5db
CI Fix
Pherring04 Nov 25, 2024
377e8c8
Shared library test fix
Pherring04 Nov 26, 2024
d290eeb
CI Fix
Pherring04 Nov 26, 2024
8afa83a
CI Fix
Pherring04 Nov 26, 2024
973a473
Added old trickify test
Pherring04 Nov 26, 2024
f285e2a
Added S_source.hh
Pherring04 Dec 2, 2024
df19738
Changed old trickified test to generate an archive
Pherring04 Dec 2, 2024
5960500
Added support for archive trickify builds on mac
Pherring04 Dec 2, 2024
ffb2e34
Trickify MAC fixes
Pherring04 Dec 3, 2024
573211e
Trickify shared on mac fix
Pherring04 Dec 3, 2024
d0316b5
Moved the py files to their appropriate directory
Pherring04 Dec 9, 2024
c5e044a
CI fix
Pherring04 Jan 2, 2025
2b4054f
Improved trick-ify arguments
Pherring04 Jan 3, 2025
fc96481
CI
Pherring04 Jan 6, 2025
1e9a2e1
CI
Pherring04 Jan 6, 2025
f420dca
CI
Pherring04 Jan 7, 2025
e25aaa3
CI
Pherring04 Jan 7, 2025
c3cd94e
CI
Pherring04 Jan 9, 2025
a2d4455
CI
Pherring04 Jan 13, 2025
04c0fea
CI
Pherring04 Jan 13, 2025
74c7512
Added C support
Pherring04 Jan 14, 2025
4af3fc3
Removed trickified shared test from MAC CI
Pherring04 Jan 15, 2025
ae86640
Start of trickify GUI
Pherring04 Jan 22, 2025
2e46a84
Checkpoint
Pherring04 Jan 22, 2025
e30ebf8
Trickify GUI
Pherring04 Feb 3, 2025
9578258
Merge branch 'master' into Trick-ify
Pherring04 Feb 3, 2025
7f4c78d
Test fix
Pherring04 Feb 3, 2025
9b44b2d
CI
Pherring04 Feb 3, 2025
c2f32a2
CI
Pherring04 Feb 4, 2025
011c4e7
CI
Pherring04 Feb 4, 2025
22c3ddd
S_overrides fix
Pherring04 Feb 13, 2025
15a61e1
Updated to support the dylib build type for Mac and implement a compa…
hchen99 Feb 19, 2025
94b5f2f
Removed unnecessary -rpath as -install_name has the correct path duri…
hchen99 Feb 20, 2025
6c8f198
Added USER_ADDITIONAL_OPTIONS for user to provide additional options …
hchen99 Feb 20, 2025
389a3e0
Checkpoint
Pherring04 Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CI
  • Loading branch information
@Pherring04
Pherring04 committed Jan 9, 2025
commit c3cd94ea994685e30e5453960eac4d21ae26533c
54 changes: 19 additions & 35 deletions share/trick/makefiles/trickify.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,29 +108,9 @@ IO_LINK_LIST := $(BUILD_DIR)trickify_io_link_list
OBJ_LINK_LIST := trickify_obj_list
UNAME := $(shell uname)
ifdef FULL_TRICKIFY_BUILD
ifeq ($(UNAME), Linux)
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST)
else ifeq ($(UNAME), Darwin)
ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
LINK_LISTS := $(IO_LINK_LIST) $(PY_LINK_LIST) $(OBJ_LINK_LIST)
else
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST)
endif
else
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST)
endif
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST)
else
ifeq ($(UNAME), Linux)
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST)
else ifeq ($(UNAME), Darwin)
ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
LINK_LISTS := $(IO_LINK_LIST) $(PY_LINK_LIST)
else
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST)
endif
else
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST)
endif
LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST)
endif
ifneq ($(wildcard $(BUILD_DIR)),)
SWIG_OBJECTS := $(shell cat $(PY_LINK_LIST))
Expand All @@ -155,19 +135,23 @@ endif
all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR)

$(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME))
$(info $(call COLOR,Linking) $@)
ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
$(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS))
else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
$(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_LIB_OPT) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS))
else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
@echo "-----Printing LS-----"
@ls
@echo "-----Printing LS build-----"
@ls build
@echo "-----Ending LS-----"
$(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS))
endif
@if [ "$(TRICKIFY_BUILD_TYPE)" = "PLO" ] ; then \
$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS) ; \
elif [ "$(TRICKIFY_BUILD_TYPE)" = "SHARED" ] ; then \
$(TRICK_CXX) $(SHARED_LIB_OPT) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS) ; \
elif [ "$(TRICKIFY_BUILD_TYPE)" = "STATIC" ] ; then \
export FILES= ; \
while read -r line ; do \
export FILES="$$FILES $$line" ; \
done < $(PY_LINK_LIST) ; \
while read -r line ; do \
export FILES="$$FILES $$line" ; \
done < $(IO_LINK_LIST) ; \
while read -r line ; do \
export FILES="$$FILES $$line" ; \
done < $(OBJ_LINK_LIST) ; \
ar rcs $@ $ $$FILES ; \
fi

$(dir $(TRICKIFY_OBJECT_NAME)) $(BUILD_DIR) $(dir $(TRICKIFY_PYTHON_DIR)) .trick:
@mkdir -p $@
Expand Down
Loading