diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2009-07-17 23:22:02 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2009-07-17 23:22:02 +0400 |
| commit | 1a3e569c0c7feca6f708fa2f0b312d87ff4e9ec4 (patch) | |
| tree | e325d2e360f583174672c898d1cb1521c0fe7fff /mcs/class/Mono.C5 | |
| parent | daa224478268e11854d5b98ea27759eeb00f68c4 (diff) | |
2009-07-17 Zoltan Varga <vargaz@gmail.com>
* add-conditional.pl Makefile: Applied patch from Marcus Griep
<marcus@griep.us>. Remove workarounds for compiling this assembly in the
net 1.1 profile.
svn path=/trunk/mcs/; revision=138151
Diffstat (limited to 'mcs/class/Mono.C5')
| -rw-r--r-- | mcs/class/Mono.C5/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/Mono.C5/Makefile | 9 | ||||
| -rwxr-xr-x | mcs/class/Mono.C5/add-conditional.pl | 16 |
3 files changed, 6 insertions, 25 deletions
diff --git a/mcs/class/Mono.C5/ChangeLog b/mcs/class/Mono.C5/ChangeLog index 8e7b2861eb1..bb535c06af3 100644 --- a/mcs/class/Mono.C5/ChangeLog +++ b/mcs/class/Mono.C5/ChangeLog @@ -1,3 +1,9 @@ +2009-07-17 Zoltan Varga <vargaz@gmail.com> + + * add-conditional.pl Makefile: Applied patch from Marcus Griep + <marcus@griep.us>. Remove workarounds for compiling this assembly in the + net 1.1 profile. + 2006-03-07 Martin Baulig <martin@ximian.com> * Test/hashing/HashDictionaryTests.cs: Temporarily disable some diff --git a/mcs/class/Mono.C5/Makefile b/mcs/class/Mono.C5/Makefile index f9270ee94f8..9b981fea78d 100644 --- a/mcs/class/Mono.C5/Makefile +++ b/mcs/class/Mono.C5/Makefile @@ -11,13 +11,4 @@ EXTRA_DISTFILES = \ LICENSE.txt \ c5.pub c5.snk c5.xml -# This is a .NET 2.0+ only assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) -ifndef VALID_PROFILE -LIBRARY_NAME = dummy-Mono.C5.dll -NO_INSTALL = yes -NO_SIGN_ASSEMBLY = yes -NO_TEST = yes -endif - include ../../build/library.make diff --git a/mcs/class/Mono.C5/add-conditional.pl b/mcs/class/Mono.C5/add-conditional.pl index ac758cc9b6b..e69de29bb2d 100755 --- a/mcs/class/Mono.C5/add-conditional.pl +++ b/mcs/class/Mono.C5/add-conditional.pl @@ -1,16 +0,0 @@ -#!/usr/bin/perl -w -use strict; - -foreach my $file (@ARGV) { - open FILE,"+<",$file; - my $contents = ""; - while (defined ($_ = <FILE>)) { - $contents .= $_; - } - truncate FILE, 0; - seek FILE, 0, 0; - print FILE "#if NET_2_0\n"; - print FILE $contents . "\n"; - print FILE "#endif\n"; - close FILE; -} |