X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=blobdiff_plain;f=Makefile.am;h=12b27f14b08425ea15bae3ce0d3af13287c02368;hp=c0672460ea05b19b410a140f5790651cafd6b6cf;hb=HEAD;hpb=d74cf1d5dcc9ce6a65b028263486ab53fd756cf0
diff --git a/Makefile.am b/Makefile.am
index c0672460ea0..12b27f14b08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,25 +2,24 @@ ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(WERROR_CFLAGS)
-MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
+MONOTOUCH_SUBDIRS = $(libgc_dir) 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 llvm
-# 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 llvm
+tools_dir =
else
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests llvm
-# 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 llvm
+tools_dir = tools
endif
+SUBDIRS = po $(libgc_dir) 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) 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
@@ -43,30 +42,25 @@ 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/*'`
- 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
+ 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/*'`
pkgconfigdir = $(libdir)/pkgconfig
noinst_DATA = mono-uninstalled.pc
DISTCLEANFILES= mono-uninstalled.pc
# building with monolite
-mcslib = $(mcs_topdir)/class/lib
-monolite = $(mcslib)/monolite
-mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
-monolite_url = http://download.mono-project.com/monolite/monolite-$(mono_corlib_version)-latest.tar.gz
.PHONY: get-monolite-latest
get-monolite-latest:
- -rm -fr $(mcslib)/monolite-*
- -mkdir -p $(mcslib)
- test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
- test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
- cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
- cd $(mcslib) && mv -f monolite-* monolite
+ $(MAKE) -C $(mcs_topdir)/class get-monolite-latest
+
+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
@@ -115,23 +109,6 @@ monotouch-do-clean:
endif
-win32getdeps:
- wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
- wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip
- wget http://www.go-mono.com/archive/glib-dev-2.0.4-20020703.zip
- wget http://www.go-mono.com/archive/libiconv-1.7.zip
- wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip
- wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
- unzip -n -d / pkgconfig-0.11-20020310.zip
- unzip -n -d / glib-2.0.4-20020703.zip
- unzip -n -d / glib-dev-2.0.4-20020703.zip
- unzip -n -d / libiconv-1.7.zip
- unzip -n -d / libiconv-dev-1.7.zip
- unzip -n -d / libintl-0.10.40-20020101.zip
-
-win32setup:
- makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
-
update-csproj:
-rm msvc/scripts/order
-rm msvc/scripts/order.xml
@@ -153,6 +130,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
@@ -167,4 +145,7 @@ update-llvm-version:
update-solution-files:
make update-csproj
make package-inputs
- (cd msvc/scripts; make genproj.exe; mono genproj.exe)
+ (cd msvc/scripts; make genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
+
+update-solution-files-with-tests:
+ make "GENPROJ_ARGS=2012 true true" update-solution-files