projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[msvc] Update csproj files (#4336)
[mono.git]
/
runtime
/
Makefile.am
diff --git
a/runtime/Makefile.am
b/runtime/Makefile.am
index 9ca318346557b586ab6b35914619cfa8fbe249dc..b540ee13f009dc7877f26c120cb2169ad3430e42 100644
(file)
--- a/
runtime/Makefile.am
+++ b/
runtime/Makefile.am
@@
-29,7
+29,7
@@
build_profiles =
if INSTALL_4_x
build_profiles += binary_reference_assemblies net_4_x xbuild_12 xbuild_14
if INSTALL_4_x
build_profiles += binary_reference_assemblies net_4_x xbuild_12 xbuild_14
-
al
_profile = net_4_x
+
net
_profile = net_4_x
endif
if INSTALL_MONODROID
endif
if INSTALL_MONODROID
@@
-48,14
+48,26
@@
if INSTALL_MONOTOUCH_TV
build_profiles += monotouch_tv monotouch_tv_runtime
endif
build_profiles += monotouch_tv monotouch_tv_runtime
endif
-if INSTALL_MOBILE_STATIC
-build_profiles += mobile_static
+if INSTALL_TESTING_AOT_HYBRID
+build_profiles += testing_aot_hybrid
+endif
+
+if INSTALL_TESTING_AOT_FULL
+build_profiles += testing_aot_full
+endif
+
+if INSTALL_WINAOT
+build_profiles += winaot
endif
if INSTALL_XAMMAC
build_profiles += xammac xammac_net_4_5
endif
endif
if INSTALL_XAMMAC
build_profiles += xammac xammac_net_4_5
endif
+if INSTALL_ORBIS
+build_profiles += orbis
+endif
+
test_profiles = $(build_profiles)
if BUILD_MCS
test_profiles = $(build_profiles)
if BUILD_MCS
@@
-88,7
+100,7
@@
clean-local:
endif BUILD_MCS
endif BUILD_MCS
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/al
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/
csc $(tmpinst)/bin/
mcs $(tmpinst)/bin/al
mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
@@
-109,20
+121,20
@@
cur_dir_cmd = pwd
PLATFORM_PATH_SEPARATOR = :
endif
PLATFORM_PATH_SEPARATOR = :
endif
-if
INSTALL_MOBILE_STATIC
-# ILASM.exe has features which a
mobile_static
runtime will not support.
+if
FULL_AOT_TESTS
+# ILASM.exe has features which a
testing_aot_full
runtime will not support.
# It is invoked with an external mono when used in the runtime.
# We skip it here because otherwise it will fail to verify.
# It is invoked with an external mono when used in the runtime.
# We skip it here because otherwise it will fail to verify.
-
MOBILE_STATIC
_FILTER=grep -v ilasm
+
FULL_AOT_TESTS
_FILTER=grep -v ilasm
else
else
-
MOBILE_STATIC
_FILTER=echo
+
FULL_AOT_TESTS
_FILTER=echo
endif
# Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
# TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
# Skip binary_reference_assemblies because they contain metadata only
mcs-compileall: mono-wrapper etc/mono/config
endif
# Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
# TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
# Skip binary_reference_assemblies because they contain metadata only
mcs-compileall: mono-wrapper etc/mono/config
- export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(
MOBILE_STATIC
_FILTER)` ; \
+ export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(
FULL_AOT_TESTS
_FILTER)` ; \
save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
for profile in $(test_profiles); do \
if [ "binary_reference_assemblies" = "$$profile" ]; then \
save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
for profile in $(test_profiles); do \
if [ "binary_reference_assemblies" = "$$profile" ]; then \
@@
-177,10
+189,16
@@
$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
$(mkinstalldirs) $(tmpinst)/bin
cp mono-wrapper $@
$(mkinstalldirs) $(tmpinst)/bin
cp mono-wrapper $@
+$(tmpinst)/bin/csc: $(tmpinst)/bin/mono Makefile
+ echo '#! /bin/sh' > $@ ; \
+ r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+ echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$(CSC)"'" "$$@"' >> $@ ; \
+ chmod +x $@
+
$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
- echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/
build
/mcs.exe"'" "$$@"' >> $@ ; \
+ echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/
$(net_profile)
/mcs.exe"'" "$$@"' >> $@ ; \
chmod +x $@
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
chmod +x $@
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
@@
-192,7
+210,7
@@
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
- echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(
al
_profile)/al.exe"'" "$$@"' >> $@ ; \
+ echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(
net
_profile)/al.exe"'" "$$@"' >> $@ ; \
chmod +x $@
test-support-files: $(TEST_SUPPORT_FILES)
chmod +x $@
test-support-files: $(TEST_SUPPORT_FILES)