projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 80d2ae0)
Add handling of new net_4_0 profile
authorMarek Safar <marek.safar@gmail.com>
Wed, 3 Jun 2009 17:46:12 +0000 (17:46 -0000)
committerMarek Safar <marek.safar@gmail.com>
Wed, 3 Jun 2009 17:46:12 +0000 (17:46 -0000)
svn path=/trunk/mcs/; revision=135326

15 files changed:
mcs/class/Managed.Windows.Forms/Makefile patch | blob | history
mcs/class/Mono.C5/Makefile patch | blob | history
mcs/class/Mono.Data.Sqlite/Makefile patch | blob | history
mcs/class/Mono.Web/Makefile patch | blob | history
mcs/class/System.Configuration/Makefile patch | blob | history
mcs/class/System.Core/Makefile patch | blob | history
mcs/class/System.Data/Makefile patch | blob | history
mcs/class/System.Design/Makefile patch | blob | history
mcs/class/System.Runtime.Serialization/Makefile patch | blob | history
mcs/class/System.Security/Makefile patch | blob | history
mcs/class/System.Transactions/Makefile patch | blob | history
mcs/class/System.Web.Services/Makefile patch | blob | history
mcs/class/System.Web/Makefile patch | blob | history
mcs/class/System.Xml.Linq/Makefile patch | blob | history
mcs/class/System/Makefile patch | blob | history

diff --git a/mcs/class/Managed.Windows.Forms/Makefile b/mcs/class/Managed.Windows.Forms/Makefile
index 6a3dc50ab674ccad2374b8503e70c09967e760e8..5a7cf2ec64b5c0312795c9f5292621dd255539c8 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Makefile
+++ b/mcs/class/Managed.Windows.Forms/Makefile
@@ -11,7 +11,7 @@ LIB_MCS_FLAGS = /unsafe \
        @System.Windows.Forms.dll.resources \
        -debug -nowarn:618,612,809
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += /r:System.Configuration.dll
 endif
 
diff --git a/mcs/class/Mono.C5/Makefile b/mcs/class/Mono.C5/Makefile
index a6947398e0447b612090c94703f065dfb15aff9b..f9270ee94f8b125c61802b5896462f723e458e7e 100644 (file)
--- a/mcs/class/Mono.C5/Makefile
+++ b/mcs/class/Mono.C5/Makefile
@@ -11,8 +11,8 @@ EXTRA_DISTFILES = \
        LICENSE.txt \
        c5.pub c5.snk c5.xml
 
-# This is a .NET 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE))
+# 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
diff --git a/mcs/class/Mono.Data.Sqlite/Makefile b/mcs/class/Mono.Data.Sqlite/Makefile
index 8d5d06649125ed26a8a547291d4ab84c42d990b7..3c11931c08e2f693fe949fed8034683eeab6ad27 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Makefile
+++ b/mcs/class/Mono.Data.Sqlite/Makefile
@@ -2,7 +2,7 @@ thisdir = class/Mono.Data.Sqlite
 SUBDIRS =
 include ../../build/rules.make
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_LIB_MCS_FLAGS = /r:System.Transactions.dll
 
 RESX_RESOURCES = resources/SR.resources
diff --git a/mcs/class/Mono.Web/Makefile b/mcs/class/Mono.Web/Makefile
index e1f565ca1e81cc99164701b1b492fd9814152904..d69422eeeb478ad44cff9add5977e278020ed68d 100644 (file)
--- a/mcs/class/Mono.Web/Makefile
+++ b/mcs/class/Mono.Web/Makefile
@@ -6,8 +6,8 @@ LIBRARY = Mono.Web.dll
 
 NO_TEST = yes
 
-# This is a .NET 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE))
+# This is a .NET 2.0+ only assembly
+VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE))
 ifdef VALID_PROFILE
 
 LIB_MCS_FLAGS = -r:$(corlib) \
diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile
index f85b0acba600f634e169e358497fd7c778cb1690..b3a5dc53b6d4f6653f64d9d48d1c682b08b45451 100644 (file)
--- a/mcs/class/System.Configuration/Makefile
+++ b/mcs/class/System.Configuration/Makefile
@@ -8,8 +8,8 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.dll
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
-# This is a .NET 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE))
+# This is a .NET 2.0+ only assembly
+VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Configuration.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index dea2016bc0e33677268a82c1c65516f09022c2ed..ef2fe25521f660de2eb0901066b7d9e8dbb49b51 100644 (file)
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -6,14 +6,14 @@ LIBRARY = System.Core.dll
 
 LIB_MCS_FLAGS = -d:LIBC /r:$(corlib) /r:System
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
-# This is a .NET > 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_2_1_raw, $(PROFILE))
+# This is a .NET 2.0+ only assembly
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Core.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 58114dd90725b96b2cad02f96077c4f03d49aa7f..7a1942ee17ce0b9f0927f38ec081b5caa6ef719b 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -10,7 +10,7 @@ else
 system = $(topdir)/class/lib/$(PROFILE)/System.dll
 endif
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_LIB_MCS_FLAGS = -r:System.Configuration.dll \
                        -r:System.Transactions.dll
 endif
diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index d1f822e603e6238201e84ff6d313e23b94e8b645..98e358ab7b1e408e914c09bc475fcddaa49d8bc7 100644 (file)
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = System.Design.dll
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
@@ -20,7 +20,7 @@ LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Web.dll \
        -r:System.Windows.Forms.dll -r:System.Drawing.dll \
        -r:Accessibility.dll -r:System.Data.dll
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += -r:System.Configuration.dll
 endif
 
diff --git a/mcs/class/System.Runtime.Serialization/Makefile b/mcs/class/System.Runtime.Serialization/Makefile
index 7dc11db9bb4cfd39ff210570d3c43f72b7607f41..e0de13f2a3f6b48e23fcef7e90e1936bf60ff901 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Makefile
+++ b/mcs/class/System.Runtime.Serialization/Makefile
@@ -23,7 +23,7 @@ EXTRA_DISTFILES = $(RESOURCE_FILES) \
        Test/Resources/FrameworkTypes/* \
        Test/System.Runtime.Serialization/one.xml
 
-VALID_PROFILE := $(filter net_2_0 net_2_1_raw, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Runtime.Serialization.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index 840deb0740348e0a1a9f0e380e09764f29e990be..b43a235627a72b41bcfd1e0acdefb36a083dee25 100644 (file)
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -8,7 +8,7 @@ LIB_MCS_FLAGS = -nowarn:618 \
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,1595
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += -r:Mono.Security.dll -nowarn:414
 TEST_MCS_FLAGS += -nowarn:168,183,414
 endif
diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile
index bdb66f20c2c4668222efb63de70aeaabe5fc4d2d..67f787b99b9021d15455f68080909e9f47ebb0a8 100644 (file)
--- a/mcs/class/System.Transactions/Makefile
+++ b/mcs/class/System.Transactions/Makefile
@@ -7,8 +7,8 @@ LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
 
 TEST_MCS_FLAGS = /nowarn:1595 $(LIB_MCS_FLAGS)
 
-# This is a .NET 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE))
+# This is a .NET 2.0+ only assembly
+VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Transactions.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index c4e9c3c19fcb2e804eda358b4b9a1db8ed0527d0..b652da47cda8ce0316659469db3c649173e6fd63 100644 (file)
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -11,7 +11,7 @@ LIB_MCS_FLAGS = \
        -r:System.Xml.dll                       \
        -r:System.Web.dll
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += \
        -r:System.Configuration.dll \
        -resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd \
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index aa76e36e29f55b3d2aa455d9f97b883cdcb41b87..066e160c98d4f096ca91bb827ae30b3ab8cbb225 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = System.Web.dll
 
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
@@ -171,12 +171,12 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx
 
 RESX_DIST =  resources/TranslationResources.resx
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 RESX_RES = $(RESX_DIST:.resx=.resources)
 endif
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_RES += $(RESOURCE_FILES_2)
 OTHER_LIB_MCS_FLAGS = -d:INSIDE_SYSTEM_WEB -nowarn:618 -r:System.Configuration.dll -r:Mono.Data.Sqlite.dll
 endif
diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile
index cae404537c99f74ae07814efef678606ac4e816f..ccaff652016be0ac460c99e8d4df00473ad5af79 100644 (file)
--- a/mcs/class/System.Xml.Linq/Makefile
+++ b/mcs/class/System.Xml.Linq/Makefile
@@ -8,8 +8,8 @@ LIB_MCS_FLAGS = \
                /r:System.Core.dll \
                /r:System.Xml.dll
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
+# This is a .NET 3.5+ only assembly, but built during the 2.0 build
 LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
 endif
 
@@ -17,7 +17,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter net_2_0 net_2_1_raw, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xml.Linq.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index ad2f217a7a2ddf812a69fc1949930b743e1261db..99a713406996f6db4c5f3423e58633eea8646a5b 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -23,7 +23,7 @@ TEST_RESOURCES = \
 TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -nowarn:1595 -nowarn:0618 -nowarn:219 -nowarn:67 -nowarn:169 -nowarn:612 \
        $(foreach f, $(TEST_RESOURCES), -resource:$(f),$(notdir $(f)))
 
-ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%)
 TEST_MCS_FLAGS += -r:System.Configuration
 endif
@@ -39,10 +39,12 @@ EXTRA_DISTFILES = \
        Test/System.Security.Cryptography.X509Certificates/pkits/x509build.cs   \
        $(RESOURCE_FILES)                               \
        $(TEST_RESOURCES)
+       
+PROFILE_2_OR_4 := $(filter net_2_0 net_4_0, $(PROFILE))        
 
 lib_file := $(wildcard ../lib/$(PROFILE)/System.dll)
 ifdef lib_file
-ifeq (2.0, $(FRAMEWORK_VERSION))
+ifdef PROFILE_2_OR_4
 LIB_MCS_FLAGS += -r:PrebuiltSystem=$(lib_file)
 endif
 else
@@ -89,7 +91,7 @@ endif
 
 endif
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
+ifdef PROFILE_2_OR_4
 # $(eval $(call cyclic-dep,Mono.Security.dll,SECURITY_DEP))
 CYCLIC_DEPS += Mono.Security.dll
 ifndef USE_BOOT_COMPILE
my mono mirror. check out Moved to http://github.com/mono/mono