2003-07-20 Peter Williams <peter@newton.cx>

	* nunit20/nunit-console/Makefile (PROGRAM): Put nunit-console.exe
	in $(topdir)/class/lib so we can find our DLL's.

build:

2003-07-20  Peter Williams  <peter@newton.cx>

	* config-default.make (TEST_RUNTIME): Use the platform runtime
	to run tests, by default.

	* profiles/default.make (TEST_RUNTIME): If our test runtime is
	mono, use the --debug flag.

	* executable.make (sourcefile): Add a basename so that we can
	find the nunit sources and so we behave a bit more like
	library.make

	* config-default.make (TEST_HARNESS): Find nunit-console in its
	new home.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index ae2b863b014fe320f9073e21e0b82cc63c3727af..13c62e06a9cd4caadf3b16adb79b8dad93d399d7 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,18 @@
+2003-07-20  Peter Williams  <peter@newton.cx>
+
+       * config-default.make (TEST_RUNTIME): Use the platform runtime
+       to run tests, by default.
+
+       * profiles/default.make (TEST_RUNTIME): If our test runtime is
+       mono, use the --debug flag.
+
+       * executable.make (sourcefile): Add a basename so that we can
+       find the nunit sources and so we behave a bit more like
+       library.make
+
+       * config-default.make (TEST_HARNESS): Find nunit-console in its
+       new home.
+
 2003-07-20  Peter Williams  <peter@newton.cx>
 
        * library.make ($(response)): Do a "Creating ..." line here.

diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make
index 960102835c00db55dc2a01eb2eb9d07fbe2e4b0c..02914efa75f012feb6d69ff66ca8ea34f38926e7 100644 (file)
--- a/mcs/build/config-default.make
+++ b/mcs/build/config-default.make
@@ -7,14 +7,14 @@
 # there.
 
 RUNTIME_FLAGS = 
-TEST_HARNESS = $(topdir)/nunit20/nunit-console/nunit-console.exe
+TEST_HARNESS = $(topdir)/class/lib/nunit-console.exe
 MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS) /nowarn:1595 /nowarn:0169 \
  /nowarn:0109 /nowarn:0067 /nowarn:0649 /nowarn:0679
 LIBRARY_FLAGS = /noconfig
 CFLAGS = -g -O2
 INSTALL = /usr/bin/install
 RUNTIME = mono $(RUNTIME_FLAGS)
-TEST_RUNTIME=MONO_PATH="$(topdir)/class/lib:.:$$MONO_PATH" $(RUNTIME) --debug
+TEST_RUNTIME=$(PLATFORM_RUNTIME)
 prefix = /usr/local
 
 # In case you want to add MCS_FLAGS, this lets you not have to

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 4ccc8d3cf7c98bb2877bcaa5a142bd6ceee6d380..1528cfa68b17984a7db9179089e8beb3a80b7778 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -6,14 +6,15 @@
 # but since on Win32 we need to munge the paths
 # anyway, we might as well.
 
-sourcefile = $(PROGRAM).sources
+base_prog = $(shell basename $(PROGRAM))
+sourcefile = $(base_prog).sources
 ifdef PLATFORM_CHANGE_SEPARATOR_CMD
-response = $(depsdir)/$(PROGRAM).response
+response = $(depsdir)/$(base_prog).response
 else
 response = $(sourcefile)
 endif
-stampfile = $(depsdir)/$(PROGRAM).stamp
-makefrag = $(depsdir)/$(PROGRAM).makefrag
+stampfile = $(depsdir)/$(base_prog).stamp
+makefrag = $(depsdir)/$(base_prog).makefrag
 pdb = $(patsubst %.exe,%.pdb,$(PROGRAM))
 
 all-local: $(PROGRAM)

diff --git a/mcs/build/profiles/default.make b/mcs/build/profiles/default.make
index b17090cb8bd43705b327daf3ec897797933a0196..cabf57344f7edd62940f10f95d2767e469436fad 100644 (file)
--- a/mcs/build/profiles/default.make
+++ b/mcs/build/profiles/default.make
@@ -16,6 +16,7 @@
 
 ifdef PLATFORM_MONO_NATIVE
 MCS = MONO_PATH="$(topdir)/class/lib:$$MONO_PATH" $(INTERNAL_MCS)
+TEST_RUNTIME = MONO_PATH=".:$$MONO_PATH" $(RUNTIME) --debug
 else
 MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib
 endif

diff --git a/mcs/nunit20/nunit-console/Makefile b/mcs/nunit20/nunit-console/Makefile
index d92fb586aa2e7fed7fcd54910d38905c3018c596..5f88172ca6ee260d71247d3b2e184ba220ab87b2 100644 (file)
--- a/mcs/nunit20/nunit-console/Makefile
+++ b/mcs/nunit20/nunit-console/Makefile
@@ -2,7 +2,7 @@ thisdir = nunit20/nunit-console
 SUBDIRS = 
 include ../../build/rules.make
 
-PROGRAM = nunit-console.exe
+PROGRAM = $(topdir)/class/lib/nunit-console.exe
 LOCAL_MCS_FLAGS = /r:NUnit.Framework.dll /r:NUnit.Util.dll
 DISTFILES = app.config App.ico nunit-console.csproj