Skip to content

Commit a5ea108

Browse files
authored
Remove a lot of legacy build logic and simplify remaining logic. (#21745)
* Remove lots of legacy build logic. * When building native bits, put them in ".libs/\<runtimeidentifier\>" as opposed to ".libs/\<not quite runtimeidentifier\>", because it simplifies a lot of logic.
1 parent 9d66ed2 commit a5ea108

File tree

67 files changed

+976
-2091
lines changed

Some content is hidden

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

67 files changed

+976
-2091
lines changed

Make.config

Lines changed: 55 additions & 232 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ show-versions:
4343
@echo " The .NET NuGet(s):"
4444
@$(foreach platform,$(DOTNET_PLATFORMS),echo " Microsoft.$(platform) $($(shell echo $(platform) | tr 'a-z' 'A-Z')_NUGET_VERSION_FULL)";)
4545

46-
check-permissions:
47-
ifdef INCLUDE_MAC
48-
@UNREADABLE=`find $(MAC_DESTDIR) ! -perm -0644`; if ! test -z "$$UNREADABLE"; then echo "There are files with invalid permissions (all installed files at least be readable by everybody, and writable by owner: 0644): "; find $(MAC_DESTDIR) ! -perm -0644 | xargs ls -la; exit 1; fi
49-
@echo Validated file permissions for Xamarin.Mac.
50-
endif
51-
ifdef INCLUDE_IOS
52-
@UNREADABLE=`find $(IOS_DESTDIR) ! -perm -0644`; if ! test -z "$$UNREADABLE"; then echo "There are files with invalid permissions (all installed files at least be readable by everybody, and writable by owner: 0644): "; find $(IOS_DESTDIR) ! -perm -0644 | xargs ls -la; exit 1; fi
53-
@echo Validated file permissions for Xamarin.iOS.
54-
endif
55-
5646
all-local:: global.json
5747

5848
# This tells NuGet to use the exact same dotnet version we've configured in Make.config
@@ -71,34 +61,6 @@ install-hook::
7161
fi
7262

7363
install-hook::
74-
@$(MAKE) check-permissions
75-
ifdef INCLUDE_IOS
76-
ifneq ($(findstring $(IOS_DESTDIR)$(MONOTOUCH_PREFIX),$(shell ls -l /Library/Frameworks/Xamarin.iOS.framework/Versions/Current 2>&1)),)
77-
@echo
78-
@echo " This build of Xamarin.iOS is the now default version on your system. "
79-
@echo
80-
else
81-
@echo
82-
@echo " Xamarin.iOS has not been installed into your system by 'make install'"
83-
@echo " In order to set the currently built Xamarin.iOS as your system version,"
84-
@echo " execute 'make install-system'".
85-
@echo
86-
endif
87-
endif
88-
ifdef INCLUDE_MAC
89-
ifndef INCLUDE_IOS
90-
@echo
91-
endif
92-
ifneq ($(findstring $(abspath $(MAC_DESTDIR)$(MAC_FRAMEWORK_DIR)/Versions),$(shell ls -l $(MAC_FRAMEWORK_DIR)/Versions/Current 2>&1)),)
93-
@echo " This build of Xamarin.Mac is the now default version on your system. "
94-
@echo
95-
else
96-
@echo " Xamarin.Mac has not been installed into your system by 'make install'"
97-
@echo " In order to set the currently built Xamarin.Mac as your system version,"
98-
@echo " execute 'make install-system'".
99-
@echo
100-
endif
101-
endif
10264
$(Q) $(MAKE) -C dotnet shutdown-build-server
10365

10466
.PHONY: package release
@@ -117,41 +79,6 @@ package release:
11779
dotnet-install-system:
11880
$(Q) $(MAKE) -C dotnet install-system
11981

120-
install-system: install-system-ios install-system-mac
121-
@# Clean up some old files
122-
$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS
123-
$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Xamarin.ObjcBinding.CSharp.targets
124-
$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Xamarin.Common.CSharp.targets
125-
$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Xamarin.ObjcBinding.Tasks.dll
126-
$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac
127-
$(Q) $(MAKE) install-symlinks MAC_DESTDIR=/ MAC_INSTALL_VERSION=Current IOS_DESTDIR=/ IOS_INSTALL_VERSION=Current -C msbuild V=$(V)
128-
129-
install-system-ios:
130-
ifdef INCLUDE_IOS
131-
@if ! test -s "$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/buildinfo"; then echo "The Xamarin.iOS build seems incomplete. Did you run \"make install\"?"; exit 1; fi
132-
$(Q) rm -f /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
133-
$(Q) mkdir -p /Library/Frameworks/Xamarin.iOS.framework/Versions
134-
$(Q) ln -s $(IOS_DESTDIR)$(MONOTOUCH_PREFIX) /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
135-
$(Q) echo Installed Xamarin.iOS into /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
136-
endif
137-
138-
install-system-mac:
139-
ifdef INCLUDE_MAC
140-
@if ! test -s "$(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/buildinfo" ; then echo "The Xamarin.Mac build seems incomplete. Did you run \"make install\"?"; exit 1; fi
141-
$(Q) rm -f $(MAC_FRAMEWORK_DIR)/Versions/Current
142-
$(Q) mkdir -p $(MAC_FRAMEWORK_DIR)/Versions
143-
$(Q) ln -s $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR) $(MAC_FRAMEWORK_DIR)/Versions/Current
144-
$(Q) echo Installed Xamarin.Mac into $(MAC_FRAMEWORK_DIR)/Versions/Current
145-
endif
146-
147-
fix-install-permissions:
148-
sudo mkdir -p /Library/Frameworks/Mono.framework/External/
149-
sudo mkdir -p /Library/Frameworks/Xamarin.iOS.framework
150-
sudo mkdir -p /Library/Frameworks/Xamarin.Mac.framework
151-
sudo chown -R $(USER) /Library/Frameworks/Mono.framework/External/
152-
sudo chown -R $(USER) /Library/Frameworks/Xamarin.iOS.framework
153-
sudo chown -R $(USER) /Library/Frameworks/Xamarin.Mac.framework
154-
15582
fix-xcode-select:
15683
sudo xcode-select -s $(XCODE_DEVELOPER_ROOT)
15784

mk/quiet.mk

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,6 @@ Q_PROF_SN = $(if $(V),,@echo "SN [$(1)] $(@F)";)
4646
Q_1 = $(if $(V),,@echo "$(1) $(@F)";)
4747
Q_2 = $(if $(V),,@echo "$(1) $(2) $(@F)";)
4848

49-
ASCOMPILE = $(Q_AS) $(AS)
50-
CSCOMPILE = $(Q_MCS) $(MCS)
51-
CCOMPILE = $(Q_CC) $(CC)
52-
CXXCOMPILE = $(Q_CC) $(CXX)
53-
OBJCCOMPILE = $(Q_OBJC) $(CC)
54-
55-
DEVICE_OBJCCOMPILE = $(Q_OBJC) $(DEVICE_CC)
56-
DEVICE_OBJCTCOMPILE = $(QT_OBJC) $(DEVICE_CC)
57-
DEVICE_CCOMPILE = $(Q_CC) $(DEVICE_CC)
58-
DEVICE_CTCOMPILE = $(QT_CC) $(DEVICE_CC)
59-
60-
SIMULATOR_OBJCCOMPILE = $(Q_OBJC) $(SIMULATOR_CC)
61-
SIMULATOR_OBJCTCOMPILE = $(QT_OBJC) $(SIMULATOR_CC)
62-
SIMULATOR_CCOMPILE = $(Q_CC) $(SIMULATOR_CC)
63-
SIMULATOR_CTCOMPILE = $(QT_CC) $(SIMULATOR_CC)
64-
SIMULATOR_ASCOMPILE = $(Q_AS) $(SIMULATOR_CC)
65-
6649
ifeq ($(V),)
6750
ifeq ($(BUILD_REVISION)$(JENKINS_HOME),)
6851
# non-verbose local build

0 commit comments

Comments
 (0)