Author: miguel
Date: 2007-01-10 17:44:17 -0500 (Wed, 10 Jan 2007)
New Revision: 70820
Added:
trunk/mono-basic/build/profiles/bootstrap.make
trunk/mono-basic/class/lib/bootstrap/Microsoft.VisualBasic.dll
Modified:
trunk/mono-basic/build/config-default.make
trunk/mono-basic/build/config.make
trunk/mono-basic/build/library.make
trunk/mono-basic/build/profiles/vbnc.make
trunk/mono-basic/build/rules.make
trunk/mono-basic/vbnc/vbnc/Makefile
Log:
Some more work, not ready yet
Modified: trunk/mono-basic/build/config-default.make
===================================================================
--- trunk/mono-basic/build/config-default.make 2007-01-10 22:11:09 UTC (rev
70819)
+++ trunk/mono-basic/build/config-default.make 2007-01-10 22:44:17 UTC (rev
70820)
@@ -9,6 +9,7 @@
RUNTIME_FLAGS =
TEST_HARNESS = $(topdir)/class/lib/$(PROFILE)/nunit-console.exe
MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
+VBNC_FLAGS = $(PLATFORM_DEBUG_FLAGS)
MBAS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
LIBRARY_FLAGS = /noconfig
CFLAGS = -g -O2
@@ -22,6 +23,7 @@
# keep track of the default value
DEFAULT_MCS_FLAGS := $(MCS_FLAGS)
+DEFAULT_VBNC_FLAGS := $(VBNC_FLAGS)
# You shouldn't need to set these but might on a
# weird platform.
Modified: trunk/mono-basic/build/config.make
===================================================================
--- trunk/mono-basic/build/config.make 2007-01-10 22:11:09 UTC (rev 70819)
+++ trunk/mono-basic/build/config.make 2007-01-10 22:44:17 UTC (rev 70820)
@@ -1,7 +1,7 @@
prefix=/usr/local
exec_prefix=${prefix}
mono_libdir=${exec_prefix}/lib
-MCS_FLAGS=-debug+
-MCS=vbnc
+VBNC_FLAGS=-debug+
+VBNC=vbnc
RUNTIME=mono
MONO_BASIC_VERSION=0.1
Modified: trunk/mono-basic/build/library.make
===================================================================
--- trunk/mono-basic/build/library.make 2007-01-10 22:11:09 UTC (rev 70819)
+++ trunk/mono-basic/build/library.make 2007-01-10 22:44:17 UTC (rev 70820)
@@ -70,7 +70,7 @@
test_pdb = $(test_lib:.dll=.pdb)
test_response = $(depsdir)/$(test_lib).response
test_makefrag = $(depsdir)/$(test_lib).makefrag
-test_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
+test_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_VBNC_FLAGS)
library_CLEAN_FILES += $(LIBRARY:.dll=_test*.dll) $(LIBRARY:.dll=_test*.pdb)
$(test_response) $(test_makefrag)
ifndef btest_lib
Added: trunk/mono-basic/build/profiles/bootstrap.make
===================================================================
--- trunk/mono-basic/build/profiles/bootstrap.make 2007-01-10 22:11:09 UTC
(rev 70819)
+++ trunk/mono-basic/build/profiles/bootstrap.make 2007-01-10 22:44:17 UTC
(rev 70820)
@@ -0,0 +1,23 @@
+# -*- 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).
+
+VBNC = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME)
$(RUNTIME_FLAGS) --debug $(topdir)/class/lib/bootstrap/vbnc.exe
+BOOTSTRAP_VBNC =
MONO_PATH="$(topdir)/class/lib/bootstrap(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/bootstrap/vbnc.exe
+
+
+# nuttzing!
+
+profile-check:
Modified: trunk/mono-basic/build/profiles/vbnc.make
===================================================================
--- trunk/mono-basic/build/profiles/vbnc.make 2007-01-10 22:11:09 UTC (rev
70819)
+++ trunk/mono-basic/build/profiles/vbnc.make 2007-01-10 22:44:17 UTC (rev
70820)
@@ -1,7 +1,7 @@
# -*- makefile -*-
-BOOTSTRAP_VBNC =
MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(INTERNAL_VBNC)
-VBNC =
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(INTERNAL_VBNC)
+BOOTSTRAP_VBNC = $(INTERNAL_VBNC)
+VBNC = $(INTERNAL_VBNC)
# nuttzing!
Modified: trunk/mono-basic/build/rules.make
===================================================================
--- trunk/mono-basic/build/rules.make 2007-01-10 22:11:09 UTC (rev 70819)
+++ trunk/mono-basic/build/rules.make 2007-01-10 22:44:17 UTC (rev 70820)
@@ -16,19 +16,19 @@
VERSION = 0.93
USE_MCS_FLAGS = $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS)
$(MCS_FLAGS)
+USE_VBNC_FLAGS = $(LOCAL_VBNC_FLAGS) $(PLATFORM_VBNC_FLAGS)
$(PROFILE_VBNC_FLAGS) $(VBNC_FLAGS)
USE_MBAS_FLAGS = $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS)
$(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
CSCOMPILE = $(MCS) $(USE_MCS_FLAGS)
-BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
CCOMPILE = $(CC) $(USE_CFLAGS)
-BOOT_COMPILE = $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
+BOOT_COMPILE = $(BOOTSTRAP_VBNC) $(USE_VBNC_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 = mcs
-INTERNAL_MBAS = mbas
+INTERNAL_VBNC = $(RUNTIME) $(RUNTIME_FLAGS)
$(topdir)/class/lib/$(PROFILE)/vbnc.exe
INTERNAL_GMCS = gmcs
INTERNAL_ILASM = ilasm
INTERNAL_RESGEN = resgen
@@ -41,6 +41,8 @@
export PLATFORM
export PROFILE
export MCS
+export VBNC
+export VBNC_FLAGS
export MCS_FLAGS
export CC
export CFLAGS
@@ -48,6 +50,7 @@
export MKINSTALLDIRS
export TEST_HARNESS
export BOOTSTRAP_MCS
+export BOOTSTRAP_VBNC
export DESTDIR
export RESGEN
Added: trunk/mono-basic/class/lib/bootstrap/Microsoft.VisualBasic.dll
===================================================================
(Binary files differ)
Property changes on:
trunk/mono-basic/class/lib/bootstrap/Microsoft.VisualBasic.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/mono-basic/vbnc/vbnc/Makefile
===================================================================
--- trunk/mono-basic/vbnc/vbnc/Makefile 2007-01-10 22:11:09 UTC (rev 70819)
+++ trunk/mono-basic/vbnc/vbnc/Makefile 2007-01-10 22:44:17 UTC (rev 70820)
@@ -2,11 +2,9 @@
SUBDIRS =
include ../../build/rules.make
-BOOTSTRAP_MCS =
MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe
$(DEBUG_FLAGS)
-
-
LOCAL_VBNC_FLAGS = /res:source/vbnc.rsp /res:source/Resources/Errors.resx
-PROGRAM = $(topdir)/class/lib/$(PROFILE)/vbnc.exe
+PROGRAM = $(topdir)/class/lib/vbnc/vbnc.exe
+PROGRAM_COMPILE = $(BOOT_COMPILE)
include ../../build/executable.make
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
