[PATCH] Re: [Mono-devel-list] Building Mono under Cygwin on WinXP

[Atsushi Eno]

Hello,

I tried the patch and it looks fine.

Miguel: Ok to commit them?

Atsushi Eno

Raja R Harinath wrote:

> Hi,
> 
> Atsushi Eno <atsushi at ximian.com> writes:
> [snip]
> 
> 
>>Index: runtime/Makefile.am
>>===================================================================
>>RCS file: /mono/mono/runtime/Makefile.am,v
>>retrieving revision 1.79
>>diff -u -r1.79 Makefile.am
>>--- runtime/Makefile.am	18 Jun 2004 12:07:45 -0000	1.79
>>+++ runtime/Makefile.am	27 Jun 2004 07:43:45 -0000
>>@@ -34,8 +34,12 @@
>> 	mcs.exe					\
>> 	mbas.exe
>> 
>>+if PLATFORM_WIN32
>>+monotwo_DATA =
>>+else
>> monotwo_DATA = \
>> 	gmcs.exe
>>+endif
>> 
>> EXTRA_DIST= $(monobins_DATA) $(monoone_DATA) $(monotwo_DATA)
> 
> 
> Looks OK.
>   
> 
>>Index: class/Microsoft.VisualBasic/Makefile
>>===================================================================
>>RCS file: /mono/mcs/class/Microsoft.VisualBasic/Makefile,v
>>retrieving revision 1.3
>>diff -u -r1.3 Makefile
>>--- class/Microsoft.VisualBasic/Makefile	22 Jun 2004 09:15:58 -0000	1.3
>>+++ class/Microsoft.VisualBasic/Makefile	27 Jun 2004 07:47:33 -0000
>>@@ -19,7 +19,7 @@
>> $(the_lib): $(TXT_RESOURCES) $(RESX_RESOURCES)
>> 
>> $(TXT_RESOURCES): %.resources: %.txt
>>-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
>>+	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RESGEN) $<
>> 
>> $(RESX_RESOURCES): %.resources: %.resx
>>-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
>>+	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RESGEN) $<
> 
> 
> I've attached an alternate patch below.
> 
> 
>>Index: class/Mono.CSharp.Debugger/Makefile
>>===================================================================
>>RCS file: /mono/mcs/class/Mono.CSharp.Debugger/Makefile,v
>>retrieving revision 1.6
>>diff -u -r1.6 Makefile
>>--- class/Mono.CSharp.Debugger/Makefile	24 Jun 2004 05:59:44 -0000	1.6
>>+++ class/Mono.CSharp.Debugger/Makefile	27 Jun 2004 07:47:33 -0000
>>@@ -3,7 +3,7 @@
>> include ../../build/rules.make
>> 
>> LIBRARY = Mono.CSharp.Debugger.dll
>>-LIB_MCS_FLAGS = /r:$(corlib)
>>+LIB_MCS_FLAGS = /r:$(topdir)/class/lib/$(PROFILE)/$(corlib)
>> NO_TEST = yes
> 
> 
> OK.
> 
> 
>> ifeq (win32, $(PLATFORM))
>>Index: class/Npgsql/Makefile
>>===================================================================
>>RCS file: /mono/mcs/class/Npgsql/Makefile,v
>>retrieving revision 1.17
>>diff -u -r1.17 Makefile
>>--- class/Npgsql/Makefile	22 Jun 2004 09:19:37 -0000	1.17
>>+++ class/Npgsql/Makefile	27 Jun 2004 07:47:37 -0000
>>@@ -39,7 +39,7 @@
>> all: $(RESX_RES) $(the_lib)
>> 
>> %.resources: %.resx
>>-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
>>+	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RESGEN) $<
>> 
>> clean: clean-recursive clean-local
> 
> 
> See attached patch.
> 
> 
>>Index: mono-build-w32.sh
>>===================================================================
>>RCS file: /mono/mono/web/mono-build-w32.sh,v
>>retrieving revision 1.13
>>diff -u -r1.13 mono-build-w32.sh
>>--- mono-build-w32.sh	19 Mar 2004 18:14:04 -0000	1.13
>>+++ mono-build-w32.sh	27 Jun 2004 14:45:59 -0000
>>@@ -47,7 +47,7 @@
>>     fi
>> fi
>> 
>>-cvs checkout mono || exit -1
>>+cvs checkout mono mcs || exit -1
>> 
>> echo "Checking automake version"
>> automake_required="1.6.2"
>>@@ -191,7 +191,8 @@
>> # Build and install mono
>> echo "Building and installing mono"
>> 
>>-(cd $here/mono; ./autogen.sh --prefix=$prefix || exit -1; make || exit -1; make install || exit -1) || exit -1
>>+# (cd $here/mono; ./autogen.sh --prefix=$prefix || exit -1; make || exit -1; make install || exit -1) || exit -1
>>+(cd $here/mcs; ./configure --prefix=$prefix || exit -1; make || exit -1; cd ../mono; ./autogen.sh --prefix=$prefix || exit -1; make || exit -1; make install || exit -1; cd ../mcs || exit -1; make install || exit -1) || exit -1
>> 
>> 
>> echo ""
> 
> 
> You can probably spilt this into one line for mcs and one for mono.
> BTW, once you 'make install' in 'mono', you don't need to 'make install'
> in mcs.
> 
> OK to apply?
> 
> - Hari