From 3205202c3026473946ba9a8779c98b50afbda207 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 27 Apr 2004 06:02:52 +0000 Subject: Put libraries in profile dependant directories so we can build all profiles at once. svn path=/trunk/mcs/; revision=26040 --- mcs/build/ChangeLog | 8 ++++++++ mcs/build/library.make | 14 +++++++------- mcs/build/profiles/bootstrap.make | 2 +- mcs/build/profiles/default.make | 4 ++-- mcs/build/profiles/net_2_0.make | 28 ++++++++++++++++++++++++++++ mcs/class/Mono.Posix/ChangeLog | 5 +++++ mcs/class/Mono.Posix/Makefile | 8 ++++---- mcs/class/System.Data/ChangeLog | 4 ++++ mcs/class/System.Data/Makefile | 2 +- mcs/class/System/ChangeLog | 5 +++++ mcs/class/System/Makefile | 4 ++-- mcs/class/corlib/ChangeLog | 4 ++++ mcs/class/corlib/Makefile | 36 ++++++++++++++++++------------------ mcs/ilasm/ChangeLog | 4 ++++ mcs/ilasm/Makefile | 2 +- mcs/mbas/ChangeLog | 4 ++++ mcs/mbas/Makefile | 8 ++++---- mcs/tools/security/ChangeLog | 4 ++++ mcs/tools/security/Makefile | 2 +- 19 files changed, 107 insertions(+), 41 deletions(-) create mode 100644 mcs/build/profiles/net_2_0.make (limited to 'mcs') diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index 3e51ab83274..75e501e1eea 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,11 @@ +2004-04-26 Jackson Harper + + * library.make: + * profiles/bootstrap.make: + * profiles/default.make: profiles are built in their ownb lib + directory now. + * profiles/net_2_0.make: new .net 2.0 profile. + 2004-04-22 Martin Baulig * profiles/net_1_2.make: Removed. diff --git a/mcs/build/library.make b/mcs/build/library.make index eeafaad0cac..1a43b4813fa 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -10,22 +10,22 @@ sourcefile = $(LIBRARY).sources ifdef PLATFORM_CHANGE_SEPARATOR_CMD -response = $(depsdir)/$(LIBRARY).response +response = $(depsdir)/$(PROFILE)_$(LIBRARY).response else response = $(sourcefile) endif -makefrag = $(depsdir)/$(LIBRARY).makefrag -stampfile = $(depsdir)/$(LIBRARY).stamp -the_lib = $(topdir)/class/lib/$(LIBRARY) +makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag +stampfile = $(depsdir)/$(PROFILE)_$(LIBRARY).stamp +the_lib = $(topdir)/class/lib/$(PROFILE)/$(LIBRARY) the_pdb = $(patsubst %.dll,%.pdb,$(the_lib)) ifndef NO_TEST test_lib = $(patsubst %.dll,%_test.dll,$(LIBRARY)) test_pdb = $(patsubst %.dll,%.pdb,$(test_lib)) test_sourcefile = $(test_lib).sources -test_response = $(depsdir)/$(test_lib).response -test_makefrag = $(depsdir)/$(test_lib).makefrag -test_stampfile = $(depsdir)/$(test_lib).stamp +test_response = $(depsdir)/$(PROFILE)_$(test_lib).response +test_makefrag = $(depsdir)/$(PROFILE)_$(test_lib).makefrag +test_stampfile = $(depsdir)/$(PROFILE)_$(test_lib).stamp test_flags = /r:$(the_lib) /r:$(topdir)/class/lib/NUnit.Framework.dll $(TEST_MCS_FLAGS) endif diff --git a/mcs/build/profiles/bootstrap.make b/mcs/build/profiles/bootstrap.make index 3304851aa9c..b999c1dd5db 100644 --- a/mcs/build/profiles/bootstrap.make +++ b/mcs/build/profiles/bootstrap.make @@ -14,7 +14,7 @@ # run the compiler; /r: flags are by default loaded from whatever's # in the MONO_PATH too). -MCS = MONO_PATH="$(topdir)/class/lib:$$MONO_PATH" $(RUNTIME) $(topdir)/mcs/mcs.exe +MCS = MONO_PATH="$(topdir)/class/lib:$$MONO_PATH" $(RUNTIME) -g $(topdir)/mcs/mcs.exe BOOTSTRAP_MCS = $(MCS) # nuttzing! diff --git a/mcs/build/profiles/default.make b/mcs/build/profiles/default.make index a7cbce86779..8e1f6e714f5 100644 --- a/mcs/build/profiles/default.make +++ b/mcs/build/profiles/default.make @@ -15,10 +15,10 @@ # in the MONO_PATH too). ifdef PLATFORM_MONO_NATIVE -MCS = MONO_PATH="$(topdir)/class/lib:$$MONO_PATH" $(INTERNAL_MCS) +MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS) TEST_RUNTIME = MONO_PATH=".:$$MONO_PATH" $(RUNTIME) --debug else -MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib +MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib/$(PROFILE) endif # nuttzing! diff --git a/mcs/build/profiles/net_2_0.make b/mcs/build/profiles/net_2_0.make new file mode 100644 index 00000000000..6c23d76ae37 --- /dev/null +++ b/mcs/build/profiles/net_2_0.make @@ -0,0 +1,28 @@ +# -*- makefile -*- +# +# The default 'bootstrap' profile -- builds so that we link against +# the libraries as we build them. +# +# We use the platform's native C# runtime and compiler if possible. + +# Note that we have sort of confusing terminology here; BOOTSTRAP_MCS +# is what allows us to bootstrap ourselves, but when we are bootstrapping, +# we use INTERNAL_MCS. + +# When bootstrapping, compile against our new assemblies. +# (MONO_PATH doesn't just affect what assemblies are loaded to +# run the compiler; /r: flags are by default loaded from whatever's +# in the MONO_PATH too). + +ifdef PLATFORM_MONO_NATIVE +MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS) +TEST_RUNTIME = MONO_PATH=".:$$MONO_PATH" $(RUNTIME) --debug +else +MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib/$(PROFILE) +endif + +# nuttzing! + +profile-check: + +PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -2 diff --git a/mcs/class/Mono.Posix/ChangeLog b/mcs/class/Mono.Posix/ChangeLog index b28515ead83..ed9dda304d4 100644 --- a/mcs/class/Mono.Posix/ChangeLog +++ b/mcs/class/Mono.Posix/ChangeLog @@ -1,3 +1,8 @@ +2004-04-26 Jackson Harper + + * Makefile: Dont use explicit lib references so the proper lib + directory is used. Output to profile directory. + 2004-01-07 Gonzalo Paniagua Javier * Makefile: handle win32 paths and copy Mono.Posix.dll to Mono.Posix diff --git a/mcs/class/Mono.Posix/Makefile b/mcs/class/Mono.Posix/Makefile index 7c120370db0..d8c457dc113 100644 --- a/mcs/class/Mono.Posix/Makefile +++ b/mcs/class/Mono.Posix/Makefile @@ -10,11 +10,11 @@ include ../../build/library.make all-local: Mono.Posix/make-map.exe -Mono.Posix/make-map.exe: Mono.Posix/make-map.cs ../lib/Mono.Posix.dll - cp ../lib/Mono.Posix.dll Mono.Posix/ +Mono.Posix/make-map.exe: Mono.Posix/make-map.cs ../lib/$(PROFILE)/Mono.Posix.dll + cp ../lib/$(PROFILE)/Mono.Posix.dll Mono.Posix/ ifneq ($(PLATFORM),win32) - $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:../lib/Mono.Posix.dll Mono.Posix/make-map.cs + $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:Mono.Posix.dll Mono.Posix/make-map.cs else - $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:../lib/Mono.Posix.dll Mono.Posix\\make-map.cs + $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:Mono.Posix.dll Mono.Posix\\make-map.cs endif diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog index 21d4796dfaa..cb4aadfc972 100644 --- a/mcs/class/System.Data/ChangeLog +++ b/mcs/class/System.Data/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: output to profile directory. + 2004-04-26 Atsushi Enomoto * System.Data.dll.sources : added CustomDataClassGenerator.cs. diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index f63d40e0de3..060d651366c 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -7,7 +7,7 @@ include ../../build/rules.make ifeq ($(PROFILE),atomic) system = System.dll else -system = $(topdir)/class/lib/System.dll +system = $(topdir)/class/lib/$(PROFILE)/System.dll endif LIBRARY = System.Data.dll diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog index 7e480d4a0a9..7ae11b15522 100644 --- a/mcs/class/System/ChangeLog +++ b/mcs/class/System/ChangeLog @@ -1,3 +1,8 @@ +2004-04-26 Jackson Harper + + * Makefile: Use new $(PROFILE) directory to search for cyclical + dependancy. + 2004-04-16 Lluis Sanchez Gual * System_test.dll.sources: Added diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 420dc4ff78b..665ad66e7e4 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -22,10 +22,10 @@ ifdef SECOND_PASS include ../../build/library.make else all-local: - @if test ! -f ../lib/$(CYCLIC_DEP) ; then \ + @if test ! -f ../lib/$(PROFILE)/$(CYCLIC_DEP) ; then \ echo "Creating temporary $(LIBRARY) without $(CYCLIC_DEP) reference." ; \ $(MAKE) SECOND_PASS=yes || exit 1 ; \ - rm -f '$(depsdir)/$(LIBRARY).stamp'; \ + rm -f '$(depsdir)/$(PROFILE)_$(LIBRARY).stamp'; \ else \ $(MAKE) SECOND_PASS=yes EXTRA_FLAGS='/define:XML_DEP /r:$(CYCLIC_DEP)' || exit 1; \ fi diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog index 775dd4acb75..4179318f04f 100644 --- a/mcs/class/corlib/ChangeLog +++ b/mcs/class/corlib/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: Use profile dependant directory. + 2004-04-26 Sebastien Pouliot * corlib_test.dll.sources: Added DESTest.cs. diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 85b9f4559ea..54cd9b2aa23 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -16,10 +16,10 @@ endif LOCAL_MCS_FLAGS = /nowarn:649 /nowarn:169 -d:INSIDE_CORLIB -corlib = $(topdir)/class/lib/mscorlib.dll +corlib = $(topdir)/class/lib/$(PROFILE)/mscorlib.dll testlib = corlib_test.dll -cmplib = $(topdir)/class/lib/corlib_cmp.dll -reslib = $(topdir)/class/lib/corlib_res.dll +cmplib = $(topdir)/class/lib/$(PROFILE)/corlib_cmp.dll +reslib = $(topdir)/class/lib/$(PROFILE)/corlib_res.dll plattestlib = corlib_plattest.dll corpdb = $(patsubst %.dll,%.pdb,$(corlib)) @@ -29,33 +29,33 @@ respdb = $(patsubst %.dll,%.pdb,$(reslib)) plattestpdb = $(patsubst %.dll,%.pdb,$(plattestlib)) sourcefile = corlib.dll.sources -response = $(depsdir)/corlib.dll.response -makefrag = $(depsdir)/corlib.dll.makefrag -stampfile = $(depsdir)/corlib.dll.stamp +response = $(depsdir)/$(PROFILE)_corlib.dll.response +makefrag = $(depsdir)/$(PROFILE)_corlib.dll.makefrag +stampfile = $(depsdir)/$(PROFILE)_corlib.dll.stamp # disable, until people fix their code... #corlib_flags = /unsafe /nostdlib /d:INSIDE_CORLIB corlib_flags = /unsafe /nostdlib test_sourcefile = corlib_test.dll.sources -test_response = $(depsdir)/$(testlib).response -test_makefrag = $(depsdir)/$(testlib).makefrag -test_stampfile = $(depsdir)/$(testlib).stamp +test_response = $(depsdir)/$(PROFILE)_$(testlib).response +test_makefrag = $(depsdir)/$(PROFILE)_$(testlib).makefrag +test_stampfile = $(depsdir)/$(PROFILE)_$(testlib).stamp test_flags = /nowarn:0618 /nowarn:0672 /r:$(test_against) /r:$(topdir)/class/lib/NUnit.Framework.dll -cmp_response = $(depsdir)/corlib_cmp.dll.response -cmp_makefrag = $(depsdir)/corlib_cmp.dll.makefrag -cmp_stampfile = $(depsdir)/corlib_cmp.dll.stamp +cmp_response = $(depsdir)/$(PROFILE)_corlib_cmp.dll.response +cmp_makefrag = $(depsdir)/$(PROFILE)_corlib_cmp.dll.makefrag +cmp_stampfile = $(depsdir)/$(PROFILE)_corlib_cmp.dll.stamp cmp_flags = /r:$(PLATFORM_CORLIB) $(corlib_flags) -res_response = $(depsdir)/corlib_res.dll.response -res_makefrag = $(depsdir)/corlib_res.dll.makefrag -res_stampfile = $(depsdir)/corlib_res.dll.stamp +res_response = $(depsdir)/$(PROFILE)_corlib_res.dll.response +res_makefrag = $(depsdir)/$(PROFILE)_corlib_res.dll.makefrag +res_stampfile = $(depsdir)/$(PROFILE)_corlib_res.dll.stamp res_flags = /r:$(PLATFORM_CORLIB) $(corlib_flags) plattest_excludes = corlib_plattest.dll.excludes -plattest_response = $(depsdir)/$(plattestlib).response -plattest_makefrag = $(depsdir)/$(plattestlib).makefrag -plattest_stampfile = $(depsdir)/$(plattestlib).stamp +plattest_response = $(depsdir)/$(PROFILE)_$(plattestlib).response +plattest_makefrag = $(depsdir)/$(PROFILE)_$(plattestlib).makefrag +plattest_stampfile = $(depsdir)/$(PROFILE)_$(plattestlib).stamp plattest_flags = /debug+ /debug:full /nowarn:0618 /nowarn:0672 /r:$(PLATFORM_CORLIB) /r:$(topdir)/class/lib/NUnit.Framework.dll # Here, we make all. diff --git a/mcs/ilasm/ChangeLog b/mcs/ilasm/ChangeLog index 1f2630a72d1..565d741acbe 100644 --- a/mcs/ilasm/ChangeLog +++ b/mcs/ilasm/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: Get libs from the default profile directory + 2004-04-05 Jackson Harper * Driver.cs: Accept output option. Usage shows /output instead of diff --git a/mcs/ilasm/Makefile b/mcs/ilasm/Makefile index 0edc068b6a1..b4c43980169 100644 --- a/mcs/ilasm/Makefile +++ b/mcs/ilasm/Makefile @@ -4,7 +4,7 @@ include ../build/rules.make PROGRAM = ilasm.exe BUILT_SOURCES = ILParser.cs -LOCAL_MCS_FLAGS = /lib:../class/lib/ /r:PEAPI.dll +LOCAL_MCS_FLAGS = /lib:../class/lib/default /r:PEAPI.dll CLEAN_FILES = parser/y.output diff --git a/mcs/mbas/ChangeLog b/mcs/mbas/ChangeLog index 3b6824a40a2..e5ac7d30e1a 100644 --- a/mcs/mbas/ChangeLog +++ b/mcs/mbas/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: Get libs from default profile directory. + 2004-04-23 Anirban Bhattacharjee * mb-parser.jay: Grammar changes for array * expression.cs: exception number changed for "Incorrectly structured array initializer" exception diff --git a/mcs/mbas/Makefile b/mcs/mbas/Makefile index 17cf83cc326..7a9b5299b9e 100644 --- a/mcs/mbas/Makefile +++ b/mcs/mbas/Makefile @@ -6,7 +6,7 @@ PROGRAM = mbas.exe BUILT_SOURCES = mb-parser.cs HAS_TEST = yes -LOCAL_MCS_FLAGS = /r:System.dll /r:$(topdir)/class/lib/Mono.GetOptions.dll +LOCAL_MCS_FLAGS = /r:System.dll /r:$(topdir)/class/lib/$(PROFILE)/Mono.GetOptions.dll EXTRA_DISTFILES = mb-parser.jay mbas.csproj mbas.ico mbas.sln CLEAN_FILES = y.output testmbas/WriteOK.exe @@ -22,10 +22,10 @@ mb-parser.cs: mb-parser.jay $(topdir)/jay/jay -ctv <$(topdir)/jay/skeleton.cs $< >$@ verbose: mbas.exe - $(TEST_RUNTIME) ./mbas.exe --verbosegetoptions --verbose --stacktrace /libpath:../class/lib /r:Mono.GetOptions /r:System.Data,System.Windows.Forms --main WriteOK testmbas/WriteOK.vb testmbas/WriteOK2.mbs + $(TEST_RUNTIME) ./mbas.exe --verbosegetoptions --verbose --stacktrace /libpath:../class/lib/$(PROFILE) /r:Mono.GetOptions /r:System.Data,System.Windows.Forms --main WriteOK testmbas/WriteOK.vb testmbas/WriteOK2.mbs testmbas/WriteOK.exe: mbas.exe testmbas/*.vb testmbas/*.mbs - $(TEST_RUNTIME) ./mbas.exe --stacktrace --verbosegetoptions /libpath:../class/lib /r:Mono.GetOptions /r:System.Data,System.Windows.Forms --main WriteOK testmbas/WriteOK.vb testmbas/WriteOK2.mbs + $(TEST_RUNTIME) ./mbas.exe --stacktrace --verbosegetoptions /libpath:../class/lib/$(PROFILE) /r:Mono.GetOptions /r:System.Data,System.Windows.Forms --main WriteOK testmbas/WriteOK.vb testmbas/WriteOK2.mbs test-aspx: mbas.exe testmbas/aspx_temp.vb - $(TEST_RUNTIME) --debug ./mbas.exe --stacktrace --verbosegetoptions /libpath:../class/lib /target:library /r:"System.dll" /r:"System.Xml.dll" /r:"System.Data.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Drawing.dll" -- testmbas/aspx_temp.vb + $(TEST_RUNTIME) --debug ./mbas.exe --stacktrace --verbosegetoptions /libpath:../class/lib/$(PROFILE) /target:library /r:"System.dll" /r:"System.Xml.dll" /r:"System.Data.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Drawing.dll" -- testmbas/aspx_temp.vb diff --git a/mcs/tools/security/ChangeLog b/mcs/tools/security/ChangeLog index 18c1583a1ec..ef1521549f0 100644 --- a/mcs/tools/security/ChangeLog +++ b/mcs/tools/security/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: use profile libraries from the default profile. + 2004-04-22 Sebastien Pouliot * cert2spc.cs: Updated to match changes in Mono.Security.dll. Better diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile index feb1b8dcbe2..ae984d1a799 100644 --- a/mcs/tools/security/Makefile +++ b/mcs/tools/security/Makefile @@ -3,7 +3,7 @@ SUBDIRS = DIST_ONLY_SUBDIRS = certview include ../../build/rules.make -LOCAL_MCS_FLAGS = /r:$(topdir)/class/lib/Mono.Security.dll +LOCAL_MCS_FLAGS = /lib:../class/lib/default /r:Mono.Security.dll SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe MakeCert.exe chktrust.exe signcode.exe setreg.exe certmgr.exe -- cgit v1.2.3