projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 351934c)
In .:
authorRaja R Harinath <harinath@hurrynot.org>
Tue, 11 Apr 2006 09:32:47 +0000 (09:32 -0000)
committerRaja R Harinath <harinath@hurrynot.org>
Tue, 11 Apr 2006 09:32:47 +0000 (09:32 -0000)
2006-04-11  Raja R Harinath  <rharinath@novell.com>

* Makefile (SUBDIRS): Remove tools/resgen.

In build:
2006-04-11  Raja R Harinath  <rharinath@novell.com>

* profiles/default.make (BOOTSTRAP_PROFILE): Define.
* profiles/net_2_0.make (BOOTSTRAP_PROFILE): Define.
* rules.make (INTERNAL_RESGEN): Pick from bootstrap profile.

In class/Microsoft.VisualBasic:
2006-04-11  Raja R Harinath  <rharinath@novell.com>

* Makefile (bootstrap_profile): Remove.
(ilasm): Use BOOTSTRAP_PROFILE from $(PROFILE).make.

In tools:
2006-04-11  Gert Driesen  <gert.driesen@telenet.be>
    Raja R Harinath  <rharinath@novell.com>

* Makefile (net_1_1_bootstrap_SUBDIRS): Add 'resgen'.
(net_2_0_bootstrap_SUBDIRS, net_2_0_SUBDIRS): Likewise.

In tools/resgen:
2006-04-11  Gert Driesen  <gert.driesen@telenet.be>
    Raja R Harinath  <rharinath@novell.com>

* Makefile (PROGRAM): Make profile-specific.
(PROGRAM_COMPILE): Don't set.
(CLEAN_FILES): Add 'resgen.exe'.

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

12 files changed:
mcs/ChangeLog patch | blob | history
mcs/Makefile patch | blob | history
mcs/build/ChangeLog patch | blob | history
mcs/build/profiles/default.make patch | blob | history
mcs/build/profiles/net_2_0.make patch | blob | history
mcs/build/rules.make patch | blob | history
mcs/class/Microsoft.VisualBasic/ChangeLog patch | blob | history
mcs/class/Microsoft.VisualBasic/Makefile patch | blob | history
mcs/tools/ChangeLog patch | blob | history
mcs/tools/Makefile patch | blob | history
mcs/tools/resgen/ChangeLog patch | blob | history
mcs/tools/resgen/Makefile patch | blob | history

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index 3dc3daad2121e69ffec49b13c66224d1280e548a..cabd9b954ce339366740cfb1cd811f0d5b85dbe2 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-11  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (SUBDIRS): Remove tools/resgen.
+
 2005-11-21  Raja R Harinath  <rharinath@novell.com>
 
        * Makefile (net_2_0_bootstrap_SUBDIRS): Add ilasm.
diff --git a/mcs/Makefile b/mcs/Makefile
index 99ce95ef399438ee6d0c55992a554c3c50c2edc3..69f5c7c3229d1c695dd85511aeda0a6829920dbd 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,6 +1,6 @@
 thisdir := .
 
-SUBDIRS := build jay mcs tools/resgen class mbas nunit20 ilasm tools tests errors docs
+SUBDIRS := build jay mcs class mbas nunit20 ilasm tools tests errors docs
 DIST_ONLY_SUBDIRS := gmcs
 
 basic_SUBDIRS := build jay mcs class
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 4cbf05c7e5d253b00e6c53bea8e5f7634496bd95..1508412984b8d626392317739cc9f85dd02b5699 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-11  Raja R Harinath  <rharinath@novell.com>
+
+       * profiles/default.make (BOOTSTRAP_PROFILE): Define.
+       * profiles/net_2_0.make (BOOTSTRAP_PROFILE): Define.
+       * rules.make (INTERNAL_RESGEN): Pick from bootstrap profile.
+
 2006-01-19  Raja R Harinath  <rharinath@novell.com>
 
        * library.make (test_lib): Don't allow to be overridden.
diff --git a/mcs/build/profiles/default.make b/mcs/build/profiles/default.make
index f0ebaafce9a37c5ebc24e4f67d7f13d1f00c5f2f..31f830d3279a7eeeaaaa0e71e8fc801101cb2dbf 100644 (file)
--- a/mcs/build/profiles/default.make
+++ b/mcs/build/profiles/default.make
@@ -14,7 +14,8 @@
 # run the compiler; /r: flags are by default loaded from whatever's
 # in the MONO_PATH too).
 
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_1_1_bootstrap/mcs.exe
+BOOTSTRAP_PROFILE = net_1_1_bootstrap
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS)
 MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MBAS)
 
diff --git a/mcs/build/profiles/net_2_0.make b/mcs/build/profiles/net_2_0.make
index e0a3b09c2e9ec15313b78cf04ab911518a71206b..a8666a2425146eb69f463b9c52cb4285a9137d61 100644 (file)
--- a/mcs/build/profiles/net_2_0.make
+++ b/mcs/build/profiles/net_2_0.make
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+BOOTSTRAP_PROFILE = net_2_0_bootstrap
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 
 # nuttzing!
diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 4e078d35373f0089a06785a1b4e430553149c1f5..7225f0dd1e30fe54f5cac4080d5ade63236708a7 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -31,7 +31,7 @@ INTERNAL_MCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/mcs.ex
 INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
 INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/gmcs/gmcs.exe
 INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
-INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/tools/resgen/resgen.exe
+INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/resgen.exe
 corlib = mscorlib.dll
 
 depsdir = $(topdir)/build/deps
diff --git a/mcs/class/Microsoft.VisualBasic/ChangeLog b/mcs/class/Microsoft.VisualBasic/ChangeLog
index 1a06a73fcc464eb0f94e2b523b7d4633321ae898..460c795f7998ea37399df522f80930735a853b2b 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/ChangeLog
+++ b/mcs/class/Microsoft.VisualBasic/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (bootstrap_profile): Remove.
+       (ilasm): Use BOOTSTRAP_PROFILE from $(PROFILE).make.
+
 2006-03-22  Raja R Harinath  <rharinath@novell.com>
 
        * Microsoft.VisualBasic.dll.sources, fixup/fixup.pl:
diff --git a/mcs/class/Microsoft.VisualBasic/Makefile b/mcs/class/Microsoft.VisualBasic/Makefile
index 8d3259a0c8c65ee071f7a5860e7145b5dd7f1088..9cda04f02c39ce4e7ee3f6e8861498215f04c639 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Makefile
+++ b/mcs/class/Microsoft.VisualBasic/Makefile
@@ -20,14 +20,8 @@ TXT_RES = Microsoft.VisualBasic.VBUtils.resources
 
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
 
-ifeq ($(PROFILE), default)
-bootstrap_profile = net_1_1_bootstrap
-else
-bootstrap_profile = $(PROFILE)_bootstrap
-endif
-
-ilasm = $(topdir)/class/lib/$(bootstrap_profile)/ilasm.exe
-ILASM = MONO_PATH="$(topdir)/class/lib/$(bootstrap_profile)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
+ilasm = $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/ilasm.exe
+ILASM = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
 
 the_il = fixup/$(PROFILE)/Microsoft.VisualBasic.il
 
diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index ab9d582f77179fb7da3bf4923dd06a12adcea807..1c1f67f145469a0c43488a20db960531fbec36d3 100644 (file)
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-11  Gert Driesen  <gert.driesen@telenet.be>
+           Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (net_1_1_bootstrap_SUBDIRS): Add 'resgen'.
+       (net_2_0_bootstrap_SUBDIRS, net_2_0_SUBDIRS): Likewise.
+
 2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Makefile : added mono-xmltool.
diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index c84fa184b900133d3325355dd08bd5bbacf36c56..abb03f40acf381335906bdbfa9f5a9a889744301 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -5,9 +5,10 @@ SUBDIRS = \
        resgen macpack mkbundle dtd2rng dtd2xsd mjs prj2make mono-service \
        mono-shlib-cop compiler-tester mono-xmltool
 
-net_1_1_bootstrap_SUBDIRS = gacutil security
+net_1_1_bootstrap_SUBDIRS = gacutil security resgen
+net_2_0_bootstrap_SUBDIRS = resgen
 
-net_2_0_SUBDIRS = corcompare wsdl compiler-tester monop xbuild
+net_2_0_SUBDIRS = corcompare wsdl compiler-tester monop xbuild resgen
 
 DIST_ONLY_SUBDIRS = xbuild
 
diff --git a/mcs/tools/resgen/ChangeLog b/mcs/tools/resgen/ChangeLog
index 4dc1bace5f388a041056c3c9a1fcb9763d579793..38fc051da6ace64cc0602650a3b4be351f9f50b8 100755 (executable)
--- a/mcs/tools/resgen/ChangeLog
+++ b/mcs/tools/resgen/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-11  Gert Driesen  <gert.driesen@telenet.be>
+           Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (PROGRAM): Make profile-specific.
+       (PROGRAM_COMPILE): Don't set.
+       (CLEAN_FILES): Add 'resgen.exe'.
+
 2005-01-13 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * monoresgen.cs: s/monoresgen/resgen/. Open the destination file with
diff --git a/mcs/tools/resgen/Makefile b/mcs/tools/resgen/Makefile
index 5b09cae2b4c919ba36e15928104a29275e5038c0..af6002aa6c25d472b4d81ea39611fcd922ed81aa 100644 (file)
--- a/mcs/tools/resgen/Makefile
+++ b/mcs/tools/resgen/Makefile
@@ -2,8 +2,8 @@ thisdir = tools/resgen
 SUBDIRS =
 include ../../build/rules.make
 
-PROGRAM = resgen.exe
+PROGRAM = $(topdir)/class/lib/$(PROFILE)/resgen.exe
 
-PROGRAM_COMPILE = $(BOOT_COMPILE)
+CLEAN_FILES = resgen.exe
 
 include ../../build/executable.make
my mono mirror. check out Moved to http://github.com/mono/mono