Merge pull request #439 from mono-soc-2012/garyb/iconfix

[mono.git] / mcs / build / rules.make

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index b38031c0d3b82653e3f4f814b0d3c9f5545fd234..d1d2832be4df8cb35e793f000d2bfc86761bbdf1 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -7,33 +7,47 @@
 # If you need to edit this file, that's a bug; email
 # peter@newton.cx about it.
 
-# Some more variables. The leading period in the sed expression prevents
-# thisdir = . from being changed into '..' for the toplevel directory.
+empty :=
+space := $(empty) $(empty)
 
-dots := $(shell echo $(thisdir) |sed -e 's,[^./][^/]*,..,g')
-topdir := $(dots)
+# given $(thisdir), we compute the path to the top directory
+#
+# split_path = $(filter-out .,$(subst /,$(space),$(1)))
+# make_path = ./$(subst $(space),/,$(1))
+# dotdottify = $(patsubst %,..,$(1))
+# topdir = $(call make_path,$(call dotdottify,$(call split_path,$(thisdir))))
+topdir := ./$(subst $(space),/,$(patsubst %,..,$(filter-out .,$(subst /,$(space),$(thisdir)))))
 
 VERSION = 0.93
 
+Q=$(if $(V),,@)
+# echo -e "\\t" does not work on some systems, so use 5 spaces
+Q_MCS=$(if $(V),,@echo "MCS     [$(PROFILE)] $(notdir $(@))";)
+
+ifndef BUILD_TOOLS_PROFILE
+BUILD_TOOLS_PROFILE = build
+endif
+
 USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
 USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
-USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
-CSCOMPILE = $(MCS) $(USE_MCS_FLAGS)
+USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
+CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
 BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
 CCOMPILE = $(CC) $(USE_CFLAGS)
-BOOT_COMPILE = $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
+BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
 INSTALL = $(SHELL) $(topdir)/../mono/install-sh
 INSTALL_DATA = $(INSTALL) -c -m 644
 INSTALL_BIN = $(INSTALL) -c -m 755
 INSTALL_LIB = $(INSTALL_BIN)
 MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
-INTERNAL_MCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/mcs.exe
 INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mcs/gmcs.exe
+INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/mcs.exe
 INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
-INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/resgen.exe
 corlib = mscorlib.dll
 
+INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/resgen.exe
+RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
+
 depsdir = $(topdir)/build/deps
 
 # Make sure these propagate if set manually
@@ -89,19 +103,30 @@ endif
 # Rest of the configuration
 
 ifndef PROFILE
-PROFILE = default
+PROFILE = $(DEFAULT_PROFILE)
 endif
 
 include $(topdir)/build/profiles/$(PROFILE).make
 -include $(topdir)/build/config.make
 
+ifdef BCL_OPTIMIZE
+PROFILE_MCS_FLAGS += -optimize
+endif
+
 ifdef OVERRIDE_TARGET_ALL
 all: all.override
 else
 all: do-all
 endif
 
-STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
+ifdef NO_INSTALL
+GACUTIL = :
+else
+gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe
+GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
+endif
+
+STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
 
 $(STD_TARGETS): %: do-%
 
@@ -111,6 +136,11 @@ do-run-test:
 do-%: %-recursive
        $(MAKE) $*-local
 
+.PHONY: all-local $(STD_TARGETS:=-local)
+all-local $(STD_TARGETS:=-local):
+
+csproj: do-csproj
+
 # The way this is set up, any profile-specific subdirs list should
 # be listed _before_ including rules.make.  However, the default
 # SUBDIRS list can come after, so don't use the eager := syntax when
@@ -158,15 +188,22 @@ dist-default:
        if test -f makefile; then m=m; fi; \
        if test -f GNUmakefile; then m=GNUm; fi; \
        for f in $${m}akefile $(DISTFILES) ; do \
-           dest=`dirname $(distdir)/$$f` ; \
-           $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
+           dest=`dirname "$(distdir)/$$f"` ; \
+           $(MKINSTALLDIRS) $$dest && cp -p "$$f" $$dest || exit 1 ; \
        done
+       if test -d Documentation ; then \
+               find . -name '*.xml' > .files ; \
+               tar cTf .files - | (cd $(distdir); tar xf -) ; \
+               rm .files ; \
+       fi
 
-$(depsdir)/.stamp:
+%/.stamp:
        $(MKINSTALLDIRS) $(@D)
        touch $@
 
-# Useful
+## Documentation stuff
+
+Q_MDOC =$(if $(V),,@echo "MDOC    [$(PROFILE)] $(notdir $(@))";)
+# net_2_0 is needed because monodoc is only compiled in that profile
+MDOC   =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
 
-withmcs:
-       $(MAKE) MCS='$(INTERNAL_MCS)' BOOTSTRAP_MCS='$(INTERNAL_MCS)' all