projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement System.Double runtime support
[mono.git]
/
runtime
/
Makefile.am
diff --git
a/runtime/Makefile.am
b/runtime/Makefile.am
index 6c57fe73214fe2886bc77797e3cfc60fe96d1416..223b73852dcbf3762ccd27934beb22ddf5e87687 100644
(file)
--- a/
runtime/Makefile.am
+++ b/
runtime/Makefile.am
@@
-5,7
+5,7
@@
noinst_SCRIPTS = mono-wrapper monodis-wrapper
etctmp = etc
symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
etctmp = etc
symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
-if INSTALL_4_
5
+if INSTALL_4_
x
symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
endif
symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
endif
@@
-25,17
+25,11
@@
$(symlinks):
SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
-if ONLY_MONOTOUCH
-build_profiles = monotouch
-else
-if ONLY_XAMMAC
-build_profiles = xammac
-else
build_profiles =
build_profiles =
-if INSTALL_4_
5
-build_profiles +=
net_4_0 net_4_5
xbuild_12 xbuild_14
-al_profile = net_4_
5
+if INSTALL_4_
x
+build_profiles +=
binary_reference_assemblies net_4_x
xbuild_12 xbuild_14
+al_profile = net_4_
x
endif
if INSTALL_MONODROID
endif
if INSTALL_MONODROID
@@
-46,15
+40,24
@@
if INSTALL_MONOTOUCH
build_profiles += monotouch monotouch_runtime
endif
build_profiles += monotouch monotouch_runtime
endif
-if INSTALL_
XAMMAC
-build_profiles +=
xammac
+if INSTALL_
MONOTOUCH_WATCH
+build_profiles +=
monotouch_watch monotouch_watch_runtime
endif
endif
-test_profiles = $(build_profiles)
+if INSTALL_MONOTOUCH_TV
+build_profiles += monotouch_tv monotouch_tv_runtime
+endif
+if INSTALL_MOBILE_STATIC
+build_profiles += mobile_static
endif
endif
+
+if INSTALL_XAMMAC
+build_profiles += xammac xammac_net_4_5
endif
endif
+test_profiles = $(build_profiles)
+
if BUILD_MCS
MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
if BUILD_MCS
MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
@@
-79,15
+82,13
@@
install-data:
uninstall:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
uninstall:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
-## mono --wapi=semdel will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
clean-local:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
clean-local:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
- -./mono-wrapper --wapi=semdel
- -rm -fr $(etctmp) $(tmpinst) .wapi
+ -rm -fr $(etctmp) $(tmpinst)
endif BUILD_MCS
endif BUILD_MCS
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/
dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/
al
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(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
@@
-110,17
+111,17
@@
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.
# 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
net 4.0
assemblies because they contain metadata only
+# Skip
binary_reference_
assemblies because they contain metadata only
mcs-compileall: mono-wrapper etc/mono/config
save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
for profile in $(test_profiles); do \
mcs-compileall: mono-wrapper etc/mono/config
save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
for profile in $(test_profiles); do \
- if [ "
net_4_0
" = "$$profile" ]; then \
+ if [ "
binary_reference_assemblies
" = "$$profile" ]; then \
continue; \
fi; \
if [ "xbuild_12" = "$$profile" ]; then \
continue; \
fi; \
if [ "xbuild_12" = "$$profile" ]; then \
- MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_
5
$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_
x
$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
elif [ "xbuild_14" = "$$profile" ]; then \
elif [ "xbuild_14" = "$$profile" ]; then \
- MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_
5
$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_
x
$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
else \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
fi; \
else \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
fi; \
@@
-140,7
+141,7
@@
if NACL_CODEGEN
check-local:
else
check-local: mcs-compileall mcs-do-test-profiles
check-local:
else
check-local: mcs-compileall mcs-do-test-profiles
- $(MAKE)
ONLY_CENTUM_TESTS=yes
mcs-do-run-test-profiles
+ $(MAKE) mcs-do-run-test-profiles
endif
# Compile all mcs tests
endif
# Compile all mcs tests
@@
-151,7
+152,7
@@
CLEANFILES = etc/mono/config
# depend on $(symlinks) to ensure 'etc/mono' directory exists
etc/mono/config: ../data/config Makefile $(symlinks)
d=`cd ../support && pwd`; \
# depend on $(symlinks) to ensure 'etc/mono' directory exists
etc/mono/config: ../data/config Makefile $(symlinks)
d=`cd ../support && pwd`; \
- sed 's,target="$
(prefix)/$(reloc_libdir)
/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t
+ sed 's,target="$
$mono_libdir
/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t
if test -z "$(libgdiplus_loc)"; then :; else \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@t > $@tt; \
mv -f $@tt $@t; fi
if test -z "$(libgdiplus_loc)"; then :; else \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@t > $@tt; \
mv -f $@tt $@t; fi
@@
-167,24
+168,12
@@
$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe"'" "$$@"' >> $@ ; \
chmod +x $@
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe"'" "$$@"' >> $@ ; \
chmod +x $@
-$(tmpinst)/bin/dmcs: $(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 -sdk:4"'" "$$@"' >> $@ ; \
- chmod +x $@
-
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \
chmod +x $@
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \
chmod +x $@
-$(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile
- echo '#! /bin/sh' > $@ ; \
- r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
- echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/al.exe"'" "$$@"' >> $@ ; \
- chmod +x $@
-
$(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`; \