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

Jump to bottom

Mimic frameworks by installing libraries to THEOS_LIBRARY_PATH in internal stage #748

Merged
merged 2 commits into from
May 16, 2024
Merged

Mimic frameworks by installing libraries to THEOS_LIBRARY_PATH in internal stage #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae8a63
Mimic frameworks by installing libraries to THEOS_LIBRARY_PATH in int…
L1ghtmann Jul 8, 2023
016e166
Merge branch 'master' into lib-stage-install
L1ghtmann Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions makefiles/instance/library.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,23 @@ internal-library-stage_::
$(ECHO_NOTHING)mkdir -p "$(THEOS_STAGING_DIR)$(LOCAL_INSTALL_PATH)/"$(ECHO_END)
ifneq (static,$(_LOCAL_LINKAGE_TYPE))
$(ECHO_NOTHING)cp $(THEOS_OBJ_DIR)/$(THEOS_CURRENT_INSTANCE)$(_LOCAL_LIBRARY_EXTENSION) "$(THEOS_STAGING_DIR)$(LOCAL_INSTALL_PATH)/"$(ECHO_END)
ifeq ($(_THEOS_CURRENT_TYPE),library)
ifeq ($(THEOS_PACKAGE_SCHEME),)
$(ECHO_COPYING_LIBRARY)rsync -ra "$(THEOS_OBJ_DIR)/$(THEOS_CURRENT_INSTANCE)$(_LOCAL_LIBRARY_EXTENSION)" "$(THEOS_LIBRARY_PATH)"$(ECHO_END)
else
$(ECHO_COPYING_LIBRARY)rsync -ra "$(THEOS_OBJ_DIR)/$(THEOS_CURRENT_INSTANCE)$(_LOCAL_LIBRARY_EXTENSION)" "$(THEOS_LIBRARY_PATH)/$(THEOS_TARGET_NAME)/$(or $(THEOS_PACKAGE_SCHEME),rootful)"$(ECHO_END)
endif
endif
endif
ifneq (,$(filter static both,$(_LOCAL_LINKAGE_TYPE)))
$(ECHO_NOTHING)cp $(THEOS_OBJ_DIR)/$(THEOS_CURRENT_INSTANCE)$(_LOCAL_ARCHIVE_EXTENSION) "$(THEOS_STAGING_DIR)$(LOCAL_INSTALL_PATH)/"$(ECHO_END)
ifeq ($(_THEOS_CURRENT_TYPE),library)
ifeq ($(THEOS_PACKAGE_SCHEME),)
$(ECHO_COPYING_LIBRARY)rsync -ra "$(THEOS_OBJ_DIR)/$(THEOS_CURRENT_INSTANCE)$(_LOCAL_ARCHIVE_EXTENSION)" "$(THEOS_LIBRARY_PATH)"$(ECHO_END)
else
$(ECHO_COPYING_LIBRARY)rsync -ra "$(THEOS_OBJ_DIR)/$(THEOS_CURRENT_INSTANCE)$(_LOCAL_ARCHIVE_EXTENSION)" "$(THEOS_LIBRARY_PATH)/$(THEOS_TARGET_NAME)/$(or $(THEOS_PACKAGE_SCHEME),rootful)"$(ECHO_END)
endif
endif
endif
endif

Expand Down
2 changes: 2 additions & 0 deletions makefiles/messages.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ endif
ECHO_COPYING_PUBLIC_HEADERS = $(ECHO_BEGIN)$(PRINT_FORMAT_MAGENTA) "Copying public headers into the $(_THEOS_CURRENT_TYPE) wrapper"$(ECHO_END); $(ECHO_PIPEFAIL) (
ifeq ($(THEOS_PACKAGE_SCHEME),)
ECHO_COPYING_FRAMEWORK = $(ECHO_BEGIN)$(PRINT_FORMAT_MAGENTA) "Installing $(_THEOS_CURRENT_TYPE) to $(THEOS_LIBRARY_PATH)"$(ECHO_END); $(ECHO_PIPEFAIL) (
ECHO_COPYING_LIBRARY = $(ECHO_BEGIN)$(PRINT_FORMAT_MAGENTA) "Installing $(_THEOS_CURRENT_TYPE) to $(THEOS_LIBRARY_PATH)"$(ECHO_END); $(ECHO_PIPEFAIL) (
else
ECHO_COPYING_LIBRARY = $(ECHO_BEGIN)$(PRINT_FORMAT_MAGENTA) "Installing $(_THEOS_CURRENT_TYPE) to $(THEOS_LIBRARY_PATH)/$(THEOS_TARGET_NAME)/$(or $(THEOS_PACKAGE_SCHEME),rootful)"$(ECHO_END); $(ECHO_PIPEFAIL) (
ECHO_COPYING_FRAMEWORK = $(ECHO_BEGIN)$(PRINT_FORMAT_MAGENTA) "Installing $(_THEOS_CURRENT_TYPE) to $(THEOS_LIBRARY_PATH)/$(THEOS_TARGET_NAME)/$(or $(THEOS_PACKAGE_SCHEME),rootful)"$(ECHO_END); $(ECHO_PIPEFAIL) (
endif
ECHO_PRE_UNLOADING = $(ECHO_BEGIN)$(PRINT_FORMAT_CYAN) "Unloading $(PREINSTALL_TARGET_PROCESSES)"$(ECHO_END); $(ECHO_PIPEFAIL) (
Expand Down