projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 51ec1e4)
In build:
authorRaja R Harinath <harinath@hurrynot.org>
Tue, 23 Nov 2004 10:35:41 +0000 (10:35 -0000)
committerRaja R Harinath <harinath@hurrynot.org>
Tue, 23 Nov 2004 10:35:41 +0000 (10:35 -0000)
* executable.make (NO_INSTALL): New option.  Disables installation.
* library.make (NO_INSTALL): Likewise.
(install-local) [!NO_INSTALL, !LIBRARY_INSTALL_DIR]: Pass both
/gacdir and /root options to gacutil.
* platforms/linux.make (platform-check): Print the BOOTSTRAP_MCS
command that was tried, in case of failure.
* profiles/basic.make (NO_TEST, NO_INSTALL): Define.
* profiles/net_1_1_bootstrap.make: Likewise.
* profiles/net_2_0_bootstrap.make: Likewise.

In nunit20/nunit-console:
* Makefile (NO_INSTALL): Don't install nunit-console.exe.

In nunit20/core, nunit20/framework, nunit20/util:
* Makefile (NO_INSTALL) [PROFILE=net_2_0]: Don't install dll.

svn path=/trunk/mcs/; revision=36427

15 files changed:
mcs/build/ChangeLog patch | blob | history
mcs/build/executable.make patch | blob | history
mcs/build/library.make patch | blob | history
mcs/build/platforms/linux.make patch | blob | history
mcs/build/profiles/basic.make patch | blob | history
mcs/build/profiles/net_1_1_bootstrap.make patch | blob | history
mcs/build/profiles/net_2_0_bootstrap.make patch | blob | history
mcs/nunit20/core/ChangeLog patch | blob | history
mcs/nunit20/core/Makefile patch | blob | history
mcs/nunit20/framework/ChangeLog patch | blob | history
mcs/nunit20/framework/Makefile patch | blob | history
mcs/nunit20/nunit-console/ChangeLog patch | blob | history
mcs/nunit20/nunit-console/Makefile patch | blob | history
mcs/nunit20/util/ChangeLog patch | blob | history
mcs/nunit20/util/Makefile patch | blob | history

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index e333daca1a0a0a255bf01db92d968d998d31bdff..1ccb5060cce440449d199247a6ca78d44c64dc84 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-23  Raja R Harinath  <rharinath@novell.com>
+
+       * executable.make (NO_INSTALL): New option.  Disables installation.
+       * library.make (NO_INSTALL): Likewise.
+       (install-local) [!NO_INSTALL, !LIBRARY_INSTALL_DIR]: Pass both
+       /gacdir and /root options to gacutil.
+       * platforms/linux.make (platform-check): Print the BOOTSTRAP_MCS
+       command that was tried, in case of failure.     
+       * profiles/basic.make (NO_TEST, NO_INSTALL): Define.
+       * profiles/net_1_1_bootstrap.make: Likewise.
+       * profiles/net_2_0_bootstrap.make: Likewise.
+
 2004-11-22  Raja R Harinath  <rharinath@novell.com>
 
        * library.make (SN): New define.  Use the net_1_1_bootstrap sn.exe.
diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index f985537e75a5e016a46cc2514a112b008f937ac5..9267087c74b9e3037c107802a5b79fec41468c06 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -23,11 +23,17 @@ pdb = $(patsubst %.exe,%.pdb,$(PROGRAM))
 mdb = $(patsubst %.exe,%.mdb,$(PROGRAM))
 executable_CLEAN_FILES += $(makefrag) $(pdb) $(mdb)
 
+all-local: $(PROGRAM) $(PROGRAM_config)
+
+ifdef NO_INSTALL
+install-local uninstall-local:
+       @:
+else
+
 ifndef PROGRAM_INSTALL_DIR
 PROGRAM_INSTALL_DIR = $(prefix)/bin
 endif
 
-all-local: $(PROGRAM) $(PROGRAM_config)
 
 install-local: $(PROGRAM) $(PROGRAM_config)
        $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
@@ -39,6 +45,7 @@ endif
 
 uninstall-local:
        -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb
+endif
 
 clean-local:
        -rm -f $(executable_CLEAN_FILES) $(CLEAN_FILES)
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 4c6c9d77390c976af9b66d4152cf5b58863370e0..6b89ef73531f33550a93fc5c26fc470f0f4506d6 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -93,14 +93,24 @@ ifeq ($(PROFILE), net_2_0)
 PACKAGE = 2.0
 endif
 
+libdir = $(prefix)/lib
+
 ifeq ($(PLATFORM), win32)
-GACDIR = `cygpath -w $(DESTDIR)$(prefix)/lib`
+GACDIR = `cygpath -w $(libdir)`
+GACROOT = `cygpath -w $(DESTDIR)$(libdir)`
 else
-GACDIR = $(DESTDIR)$(prefix)/lib
+GACDIR = $(libdir)
+GACROOT = $(DESTDIR)$(libdir)
 endif
 
 all-local install-local test-local: $(the_lib)
 
+ifdef NO_INSTALL
+install-local uninstall-local:
+       @:
+
+else
+
 ifdef LIBRARY_INSTALL_DIR
 install-local:
        $(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR)
@@ -113,13 +123,13 @@ uninstall-local:
 else
 
 install-local: $(gacutil)
-       $(GACUTIL) /i $(the_lib) /f /root $(GACDIR) /package $(PACKAGE)
+       $(GACUTIL) /i $(the_lib) /f /gacdir $(GACDIR) /root $(GACROOT) /package $(PACKAGE)
 
 uninstall-local: $(gacutil)
        $(GACUTIL) /u $(LIBRARY_NAME:.dll=)
 
 endif
-
+endif
 
 clean-local:
        -rm -f $(library_CLEAN_FILES) $(CLEAN_FILES)
diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
index 1a89331ea26023190d5ddc7cc55fe73faa962417..f0c30003e9111e1c1e66c4cc1a5d8e698f3ff5f4 100644 (file)
--- a/mcs/build/platforms/linux.make
+++ b/mcs/build/platforms/linux.make
@@ -25,6 +25,7 @@ hidden_suffix =
 platform-check:
        @set fnord $(BOOTSTRAP_MCS) ; while test "$$#" -gt 2; do case $$2 in *=*) shift ;; *) break ;; esac done ; \
        if type $$2 >/dev/null 2>&1 ; then :; else \
+           echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be available"; \
            echo "*** You need a C# compiler installed to build MCS. (make sure mcs works from the command line)" ; \
            echo "*** Read INSTALL.txt for information on how to bootstrap" ; \
            echo "*** a Mono installation." ; \
diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make
index 1921f40079f25b8de941f13c97cf520c9bc87cce..f5eeec3420a45e9c8cbeeba6444fb4e9e36820ba 100644 (file)
--- a/mcs/build/profiles/basic.make
+++ b/mcs/build/profiles/basic.make
@@ -5,6 +5,8 @@ MCS = false
 PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1 -d:BOOTSTRAP_WITH_OLDLIB
 USE_BOOT_COMPILE = yes
 NO_SIGN_ASSEMBLY = yes
+NO_TEST = yes
+NO_INSTALL = yes
 
 profile-check:
        @:
diff --git a/mcs/build/profiles/net_1_1_bootstrap.make b/mcs/build/profiles/net_1_1_bootstrap.make
index 5c0f740bafccee5b4d1829c1a9bf08b21baa0c84..21ab07255579c17871a9dca3800d6d7cd74b6b18 100644 (file)
--- a/mcs/build/profiles/net_1_1_bootstrap.make
+++ b/mcs/build/profiles/net_1_1_bootstrap.make
@@ -5,6 +5,8 @@ MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
 MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
 
 NO_SIGN_ASSEMBLY = yes
+NO_TEST = yes
+NO_INSTALL = yes
 
 profile-check:
        @:
diff --git a/mcs/build/profiles/net_2_0_bootstrap.make b/mcs/build/profiles/net_2_0_bootstrap.make
index 8bf82748c0535b93c48a576e7c9ce7f2264c4e2e..5551e573c3edcd3956adb8e02b58d824b1b551ce 100644 (file)
--- a/mcs/build/profiles/net_2_0_bootstrap.make
+++ b/mcs/build/profiles/net_2_0_bootstrap.make
@@ -20,6 +20,8 @@ $(topdir)/class/lib/$(PROFILE)/mcs.exe.config: $(topdir)/gmcs/gmcs.exe.config
 PROFILE_MCS_FLAGS = -d:NET_1_1 -d:BOOTSTRAP_NET_2_0
 FRAMEWORK_VERSION = 2.0
 NO_SIGN_ASSEMBLY = yes
+NO_TEST = yes
+NO_INSTALL = yes
 
 clean-local: clean-profile
 
diff --git a/mcs/nunit20/core/ChangeLog b/mcs/nunit20/core/ChangeLog
index fcfa9770d79cb20e20079977dd386bbb392e98a5..b6b9b837d61dec23a953aaf937e8bf52dbd7f2e5 100755 (executable)
--- a/mcs/nunit20/core/ChangeLog
+++ b/mcs/nunit20/core/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-23  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (NO_INSTALL) [PROFILE=net_2_0]: Don't install dll.
+
 2004-10-28  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Updated to NUnit 2.2.0 Final Release.
diff --git a/mcs/nunit20/core/Makefile b/mcs/nunit20/core/Makefile
index 575e4f0652a3dfbc61f221a449138149e2678c2e..b63ee548269dcb27712797b71f9056cad8005e53 100644 (file)
--- a/mcs/nunit20/core/Makefile
+++ b/mcs/nunit20/core/Makefile
@@ -8,6 +8,10 @@ LIBRARY_SNK = $(topdir)/nunit.key
 LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
+ifeq (net_2_0, $(PROFILE))
+NO_INSTALL = yes
+endif
+
 EXTRA_DISTFILES = nunit.core.dll.csproj
 
 include ../../build/library.make
diff --git a/mcs/nunit20/framework/ChangeLog b/mcs/nunit20/framework/ChangeLog
index 4b8f8862f973803a1e8179acbd124f142a1a2973..8d7944ec444a8ecc68e10e98a76e8df02e6c572d 100755 (executable)
--- a/mcs/nunit20/framework/ChangeLog
+++ b/mcs/nunit20/framework/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-23  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (NO_INSTALL) [PROFILE=net_2_0]: Don't install dll.
+
 2004-10-28  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Updated to NUnit 2.2.0 Final Release.
diff --git a/mcs/nunit20/framework/Makefile b/mcs/nunit20/framework/Makefile
index 2538dc968d2ad3713d2e6a433b30436c4db1033e..6f571eb719f434f7c8d2c6fd7b4eef71dee4ecd5 100644 (file)
--- a/mcs/nunit20/framework/Makefile
+++ b/mcs/nunit20/framework/Makefile
@@ -9,6 +9,10 @@ LIBRARY_SNK = $(topdir)/nunit.key
 LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
+ifeq (net_2_0, $(PROFILE))
+NO_INSTALL = yes
+endif
+
 EXTRA_DISTFILES = \
        nunit.framework.dll.csproj
 
diff --git a/mcs/nunit20/nunit-console/ChangeLog b/mcs/nunit20/nunit-console/ChangeLog
index fa8273f250612492971e82e90a7641f83651648b..0c5eb7809c4f9dde82217098914b07f8f37c76d3 100644 (file)
--- a/mcs/nunit20/nunit-console/ChangeLog
+++ b/mcs/nunit20/nunit-console/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-23  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (NO_INSTALL): Don't install nunit-console.exe.
+
 2004-10-28  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Updated to NUnit 2.2.0 Final Release.
diff --git a/mcs/nunit20/nunit-console/Makefile b/mcs/nunit20/nunit-console/Makefile
index 0a33bca390afe330f964c27e8be887de7a204a8b..37bdb0dadb1a79e418f1bf28e5cce630122bb3ec 100644 (file)
--- a/mcs/nunit20/nunit-console/Makefile
+++ b/mcs/nunit20/nunit-console/Makefile
@@ -6,4 +6,6 @@ PROGRAM = $(topdir)/class/lib/$(PROFILE)/nunit-console.exe
 LOCAL_MCS_FLAGS = /r:nunit.framework.dll /r:nunit.util.dll /r:nunit.core.dll
 DISTFILES = app.config App.ico nunit-console.csproj
 
+NO_INSTALL = yes
+
 include ../../build/executable.make
diff --git a/mcs/nunit20/util/ChangeLog b/mcs/nunit20/util/ChangeLog
index ce93dd668172cc49693890e3399a6a502214047c..8e513928d0543dfd3f7968e3cc29c468c7f3bd6c 100644 (file)
--- a/mcs/nunit20/util/ChangeLog
+++ b/mcs/nunit20/util/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-23  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (NO_INSTALL) [PROFILE=net_2_0]: Don't install dll.
+
 2004-10-28  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Updated to NUnit 2.2.0 Final Release.
diff --git a/mcs/nunit20/util/Makefile b/mcs/nunit20/util/Makefile
index 29ed5b4a5eac7ece7ef45b0bcc84b9d7becbb766..1f7e6fe486b7ef1725e0fef8827823b2b4848c9a 100644 (file)
--- a/mcs/nunit20/util/Makefile
+++ b/mcs/nunit20/util/Makefile
@@ -14,6 +14,10 @@ LOCAL_MCS_FLAGS= \
        -r:System.Xml.dll /d:MONO /d:StronglyNamedAssembly -debug
 NO_TEST = yo
 
+ifeq (net_2_0, $(PROFILE))
+NO_INSTALL = yes
+endif
+
 EXTRA_DISTFILES = \
        nunit.util.dll.csproj   \
        Transform.resx
my mono mirror. check out Moved to http://github.com/mono/mono