Compare commits

...
29 changed files with 16 additions and 241 deletions

No files matched your search

+1 -4
View File
@@ -3199,7 +3199,7 @@ case "x$libgc" in
;;
esac
AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0/3.5 FX (defaults to yes)], [], [with_profile2=yes])
AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0/3.5 FX (defaults to yes)], [], [with_profile2=no])
AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to yes)], [], [with_profile4=yes])
AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes])
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
@@ -3275,7 +3275,6 @@ dnl Consistency settings
dnl
if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
DISABLE_MCS_DOCS=yes
with_profile2=no
with_profile4=no
with_profile4_5=no
with_monodroid=no
@@ -3299,7 +3298,6 @@ AC_SUBST(OPROFILE_LIBS)
libmono_ldflags="$libmono_ldflags $LIBS"
AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
@@ -3744,7 +3742,6 @@ echo "
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
Libraries:
.NET 2.0/3.5: $with_profile2
.NET 4.0: $with_profile4
.NET 4.5: $with_profile4_5
MonoDroid: $with_monodroid
+1 -5
View File
@@ -6,14 +6,12 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
basic_SUBDIRS := build jay mcs class
build_SUBDIRS := build class mcs class/aot-compiler tools
net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
monodroid_SUBDIRS := build class
monotouch_SUBDIRS := build class
monotouch_runtime_SUBDIRS := build class
xammac_SUBDIRS := build class
mobile_SUBDIRS := build class
mobile_static_SUBDIRS := build class
net_3_5_SUBDIRS := build class tools/xbuild
net_4_0_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
xbuild_12_SUBDIRS := build class tools/xbuild
@@ -88,7 +86,7 @@ dir-check:
# fun specialty targets
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12 xbuild_14
PROFILES = net_3_5 net_4_0 net_4_5 xbuild_12 xbuild_14
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -111,14 +109,12 @@ $(_boot_:%=profile-do--xbuild_14--%): profile-do--xbuild_14--%:
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--%
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
testcorlib:
-16
View File
@@ -1,16 +0,0 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.0
XBUILD_VERSION = 2.0
-20
View File
@@ -1,20 +0,0 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 3.5
XBUILD_VERSION = 3.5
TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
-2
View File
@@ -231,14 +231,12 @@ xbuild_4_0_dirs := \
$(xbuild_2_0_dirs) \
Microsoft.Build
net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
monodroid_SUBDIRS := $(monodroid_dirs)
monotouch_SUBDIRS := $(monotouch_dirs)
monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
+1 -1
View File
@@ -10,7 +10,7 @@ NO_TEST = yes
# This is a .NET 2.0+ only assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-Mono.Simd.dll
NO_INSTALL = yes
+1 -6
View File
@@ -12,17 +12,12 @@ LIB_MCS_FLAGS = \
/resource:./src/DbLinq/Schema/Dbml/DbmlSchema.xsd,DbLinq.Schema.Dbml.DbmlSchema.xsd \
/d:MONO_STRICT /d:MONO_DEPLOY -warn:1
ifeq (2.0, $(FRAMEWORK_VERSION))
# 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
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = src/DbLinq/Schema/Dbml/DbmlSchema.xsd
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.Data.Linq.dll
NO_INSTALL = yes
@@ -15,7 +15,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES =
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.IdentityModel.Selectors.dll
NO_INSTALL = yes
+1 -1
View File
@@ -26,7 +26,7 @@ EXTRA_DISTFILES = \
Test/Resources/test.pfx \
Test/Resources/test2.pfx
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.IdentityModel.dll
NO_INSTALL = yes
+1 -1
View File
@@ -12,7 +12,7 @@ LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:168,169,183,219,414,1595
VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter moonlight_raw net_4_0 net_4_5, $(PROFILE))
EXTRA_DISTFILES = \
Test/System.Security.Cryptography.Xml/sample.pfx \
+1 -6
View File
@@ -8,17 +8,12 @@ LIB_MCS_FLAGS = \
/r:System.Core.dll \
/r:System.Web.dll
ifeq (2.0, $(FRAMEWORK_VERSION))
# This is a .NET 3.5 only assembly, but built during the 2.0 build
LIB_MCS_FLAGS += -d:NET_3_5
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES =
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.Web.Abstractions.dll
NO_INSTALL = yes
+1 -6
View File
@@ -15,11 +15,6 @@ LIB_MCS_FLAGS = \
/r:System.Web.Abstractions.dll \
/r:System.Web.Routing.dll
ifeq (2.0, $(FRAMEWORK_VERSION))
# This is a .NET 3.5 only assembly, but built during the 2.0 build
LIB_MCS_FLAGS += -d:NET_3_5
endif
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
endif
@@ -186,7 +181,7 @@ endif
EXTRA_DISTFILES = $(foreach resource,$(TEST_RESOURCE_FILES), $(shell echo $(subst \`,\\\`,$(resource)) | cut -d ',' -f 1))
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.Web.DynamicData.dll
NO_INSTALL = yes
+1 -6
View File
@@ -9,11 +9,6 @@ LIB_MCS_FLAGS = \
/r:System.Web.dll \
/r:System.Web.Abstractions.dll
ifeq (2.0, $(FRAMEWORK_VERSION))
# This is a .NET 3.5 only assembly, but built during the 2.0 build
LIB_MCS_FLAGS += -d:NET_3_5 -d:SYSTEMCORE_DEP
endif
ifdef DEBUG
LIB_MCS_FLAGS += -define:DEBUG
endif
@@ -23,7 +18,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES =
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.Web.Routing.dll
NO_INSTALL = yes
-4
View File
@@ -272,10 +272,6 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,159
$(foreach file,$(NUNIT_APP_CODE_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_Code/\2 ;g')) \
$(foreach file,$(NUNIT_APP_GLOBALRESOURCES_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_GlobalResources/\2 ;g'))
ifeq (net_2_0, $(PROFILE))
TEST_MCS_FLAGS += -r:System.Web.Extensions.dll -d:TEST
endif
EXTRA_DISTFILES = \
$(RESOURCE_FILES_4) \
$(RESOURCE_FILES_2) \
-14
View File
@@ -21,23 +21,9 @@ EXTRA_DISTFILES = \
CLEAN_FILES = $(RESX_RES)
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
include ../../../build/library.make
$(the_lib): $(RESX_RES)
$(RESX_RES): %.resources: %.resx
$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -13,18 +13,4 @@ NO_TEST = yo
EXTRA_DISTFILES = nunit-console.csproj nunit-console_VS2005.csproj
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
-14
View File
@@ -8,20 +8,6 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LOCAL_MCS_FLAGS= -r:nunit.framework.dll -r:nunit.core.interfaces.dll -r:System.dll /d:StronglyNamedAssembly -warn:1
NO_TEST = yo
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
EXTRA_DISTFILES = nunit.core.dll.csproj nunit.core.dll_VS2005.csproj
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
-14
View File
@@ -8,20 +8,6 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
EXTRA_DISTFILES = nunit.core.interfaces.dll.csproj nunit.core.interfaces.dll_VS2005.csproj
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
-14
View File
@@ -11,22 +11,8 @@ LIB_MCS_FLAGS = \
/r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
EXTRA_DISTFILES = \
nunit.core.extensions.dll.csproj \
nunit.core.extensions.dll_VS2005.csproj
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -8,22 +8,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
EXTRA_DISTFILES = \
nunit.framework.extensions.dll.csproj \
nunit.framework.extensions.dll_VS2005.csproj
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -9,22 +9,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LIB_MCS_FLAGS = /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly -warn:1
NO_TEST = yo
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
EXTRA_DISTFILES = \
nunit.framework.dll.csproj \
nunit.framework.dll_VS2005.csproj
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
-14
View File
@@ -8,22 +8,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
ifneq (net_2_0, $(PROFILE))
NO_INSTALL = yes
install-local: install-symlink
uninstall-local: uninstall-symlink
endif
EXTRA_DISTFILES = \
nunit.mocks.csproj \
nunit.mocks_VS2005.csproj
include ../../../build/library.make
symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
install-symlink:
$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
uninstall-symlink:
rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
+1 -1
View File
@@ -61,7 +61,7 @@ build-compiler-lib:
cd ../class/Mono.CSharp && $(MAKE) NO_DIR_CHECK=yes
qcheck: build-compiler-lib qcheck2
qcheck2:
$(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS)
+1 -1
View File
@@ -1,4 +1,4 @@
// Compiler options: -r:../class/lib/net_2_0/Mono.Cecil.dll
// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
using System;
using System.IO;
+1 -1
View File
@@ -1,4 +1,4 @@
// Compiler options: -r:../class/lib/net_2_0/Mono.Cecil.dll
// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
using System;
using Mono.Cecil;
+1 -2
View File
@@ -53,11 +53,10 @@ net_2_0_dirs := \
$(per_profile_dirs)
build_SUBDIRS = gacutil security culevel
net_2_0_SUBDIRS := $(basic_SUBDIRS) $(net_2_0_dirs)
net_4_0_SUBDIRS := $(net_4_0_dirs) $(basic_SUBDIRS)
net_4_5_SUBDIRS := $(net_4_0_SUBDIRS)
SUBDIRS = $(basic_SUBDIRS) $(net_2_0_SUBDIRS)
SUBDIRS = $(basic_SUBDIRS) $(net_2_0_dirs)
DIST_SUBDIRS = $(SUBDIRS) $(net_4_0_dirs)
include ../build/rules.make
+1 -1
View File
@@ -6,7 +6,7 @@ PROGRAM = resgen.exe
CLEAN_FILES = resgen.exe
INSTALL_PROFILE := $(filter net_2_0 net_4_5, $(PROFILE))
INSTALL_PROFILE := $(filter net_4_5, $(PROFILE))
ifndef INSTALL_PROFILE
NO_INSTALL = yes
endif
-36
View File
@@ -25,24 +25,10 @@ copy-targets: copy-targets-$(XBUILD_VERSION)
clean-targets: clean-targets-$(XBUILD_VERSION)
XBUILD_2_0_PROFILE_DIR=$(topdir)/class/lib/net_2_0
XBUILD_3_5_PROFILE_DIR=$(topdir)/class/lib/net_3_5
XBUILD_4_0_PROFILE_DIR=$(topdir)/class/lib/net_4_5
XBUILD_12_0_PROFILE_DIR=$(topdir)/class/lib/xbuild_12
XBUILD_14_0_PROFILE_DIR=$(topdir)/class/lib/xbuild_14
copy-targets-2.0:
cp $(XBUILD_DATA_DIR)/2.0/Microsoft.Common.targets $(XBUILD_2_0_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/2.0/Microsoft.Common.tasks $(XBUILD_2_0_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/2.0/Microsoft.CSharp.targets $(XBUILD_2_0_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_2_0_PROFILE_DIR)
copy-targets-3.5:
cp $(XBUILD_DATA_DIR)/3.5/Microsoft.Common.targets $(XBUILD_3_5_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/3.5/Microsoft.Common.tasks $(XBUILD_3_5_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/3.5/Microsoft.CSharp.targets $(XBUILD_3_5_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_3_5_PROFILE_DIR)
copy-targets-4.0:
cp $(XBUILD_DATA_DIR)/4.0/Microsoft.Common.targets $(XBUILD_4_0_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/4.0/Microsoft.Common.tasks $(XBUILD_4_0_PROFILE_DIR)
@@ -61,18 +47,6 @@ copy-targets-14.0:
cp $(XBUILD_DATA_DIR)/14.0/Microsoft.CSharp.targets $(XBUILD_14_0_PROFILE_DIR)
cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_14_0_PROFILE_DIR)
clean-targets-2.0:
rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.Common.targets
rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.Common.tasks
rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.CSharp.targets
rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.VisualBasic.targets
clean-targets-3.5:
rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.Common.targets
rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.Common.tasks
rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.CSharp.targets
rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.VisualBasic.targets
clean-targets-4.0:
rm -f $(XBUILD_4_0_PROFILE_DIR)/Microsoft.Common.targets
rm -f $(XBUILD_4_0_PROFILE_DIR)/Microsoft.Common.tasks
@@ -92,18 +66,8 @@ clean-targets-14.0:
rm -f $(XBUILD_14_0_PROFILE_DIR)/Microsoft.VisualBasic.targets
#allow tests to find older versions of libs and targets
ifneq (2.0, $(XBUILD_VERSION))
TEST_MONO_PATH := $(topdir)/class/lib/net_2_0
copy-targets: copy-targets-2.0
clean-targets: clean-targets-2.0
ifneq (3.5, $(XBUILD_VERSION))
TEST_MONO_PATH := $(topdir)/class/lib/net_3_5$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)
copy-targets: copy-targets-3.5
clean-targets: clean-targets-3.5
ifneq (4.0, $(XBUILD_VERSION))
TEST_MONO_PATH := $(topdir)/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)
copy-targets: copy-targets-4.0
clean-targets: clean-targets-4.0
endif
endif
endif
+1 -8
View File
@@ -33,11 +33,6 @@ build_profiles = xammac
else
build_profiles =
if INSTALL_2_0
build_profiles += net_2_0 net_3_5
al_profile = net_2_0
endif
if INSTALL_4_0
build_profiles += net_4_0
al_profile = net_4_0
@@ -134,9 +129,7 @@ mcs-compileall: mono-wrapper etc/mono/config
if [ "net_4_0" = "$$profile" ]; then \
continue; \
fi; \
if [ "net_3_5" = "$$profile" ]; then \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
elif [ "xbuild_12" = "$$profile" ]; then \
if [ "xbuild_12" = "$$profile" ]; then \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
elif [ "xbuild_14" = "$$profile" ]; then \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \