Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mcs/class/Managed.Windows.Forms/Makefile2
-rw-r--r--mcs/class/Mono.C5/Makefile4
-rw-r--r--mcs/class/Mono.Data.Sqlite/Makefile2
-rw-r--r--mcs/class/Mono.Web/Makefile4
-rw-r--r--mcs/class/System.Configuration/Makefile4
-rw-r--r--mcs/class/System.Core/Makefile6
-rw-r--r--mcs/class/System.Data/Makefile2
-rw-r--r--mcs/class/System.Design/Makefile4
-rw-r--r--mcs/class/System.Runtime.Serialization/Makefile2
-rw-r--r--mcs/class/System.Security/Makefile2
-rw-r--r--mcs/class/System.Transactions/Makefile4
-rw-r--r--mcs/class/System.Web.Services/Makefile2
-rw-r--r--mcs/class/System.Web/Makefile6
-rw-r--r--mcs/class/System.Xml.Linq/Makefile6
-rw-r--r--mcs/class/System/Makefile8
15 files changed, 30 insertions, 28 deletions
diff --git a/mcs/class/Managed.Windows.Forms/Makefile b/mcs/class/Managed.Windows.Forms/Makefile
index 6a3dc50ab67..5a7cf2ec64b 100644
--- 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 a6947398e04..f9270ee94f8 100644
--- 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 8d5d0664912..3c11931c08e 100644
--- 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 e1f565ca1e8..d69422eeeb4 100644
--- 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 f85b0acba60..b3a5dc53b6d 100644
--- 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 dea2016bc0e..ef2fe25521f 100644
--- 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 58114dd9072..7a1942ee17c 100644
--- 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 d1f822e603e..98e358ab7b1 100644
--- 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 7dc11db9bb4..e0de13f2a3f 100644
--- 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 840deb07403..b43a235627a 100644
--- 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 bdb66f20c2c..67f787b99b9 100644
--- 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 c4e9c3c19fc..b652da47cda 100644
--- 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 aa76e36e29f..066e160c98d 100644
--- 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 cae404537c9..ccaff652016 100644
--- 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 ad2f217a7a2..99a71340699 100644
--- 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 09:49:39 +0300