X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8b34970a14e32997af77cb78cacc611f4da7bf9f;hb=e68ef38c186896f71b899d9975e245f9124b79d8;hp=d48ca3110e8e7693c7110ccce764547772724328;hpb=9900f812e2fc72b1e9389c4e7a0602007f256718;p=mono.git
diff --git a/Makefile.am b/Makefile.am
index d48ca3110e8..8b34970a14e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,23 +4,22 @@ AM_CFLAGS = $(WERROR_CFLAGS)
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
+# Some tools might not build when cross-compiling
if CROSS_COMPILING
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests
-# Keep in sync with SUBDIRS
-## 'tools' is not normally built
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
+tools_dir =
else
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests
-# Keep in sync with SUBDIRS
-## 'tools' is not normally built
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
+tools_dir = tools
endif
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+# Keep in sync with SUBDIRS
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+
all: update_submodules
SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
update_submodules:
- @$(srcdir)/scripts/update_submodules
+ @$(srcdir)/scripts/update_submodules.sh
.PHONY: update_submodules
@@ -32,7 +31,8 @@ EXTRA_DIST= \
mono-uninstalled.pc.in \
winconfig.h \
code_of_conduct.md \
- external
+ external \
+ mcs/class/referencesource
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
@@ -42,13 +42,16 @@ dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
rm -rf `find $(top_distdir)/external -path '*\.git'`
- rm -f `find $(top_distdir)/external -path '*\.exe'`
- rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
+ rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
+ rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
+mac-sdk-package:
+ external/bockbuild/bb MacSDK --package
+
pkgconfigdir = $(libdir)/pkgconfig
noinst_DATA = mono-uninstalled.pc
DISTCLEANFILES= mono-uninstalled.pc
@@ -67,6 +70,14 @@ get-monolite-latest:
cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
cd $(mcslib) && mv -f monolite-* monolite
+if BITCODE
+BITCODE_CHECK=yes
+endif
+
+.PHONY: check-ci
+check-ci:
+ MONO_LLVMONLY=$(BITCODE_CHECK) $(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
+
.PHONY: validate do-build-mono-mcs mcs-do-clean mcs-do-tests
validate: do-build-mono-mcs
$(MAKE) mcs-do-tests
@@ -152,6 +163,7 @@ package-inputs:
read libou; echo " $$libou"; \
read fx_ver; echo " $$fx_ver"; \
read profile; echo " $$profile"; \
+ read resxt; echo " $$resxt"; \
read resp; echo " $$resp"; \
echo " ") >> msvc/scripts/order.xml; \
done
@@ -163,3 +175,7 @@ update-llvm-version:
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
+update-solution-files:
+ make update-csproj
+ make package-inputs
+ (cd msvc/scripts; make genproj.exe; mono genproj.exe)