[nant-commits] nant Makefile, 1.26.2.3, 1.26.2.4 Makefile.nmake, 1.17.2.3, 1.17.2.4

[Ryan B. <rm...@us...>]

Update of /cvsroot/nant/nant
In directory vz-cvs-3.sog:/tmp/cvs-serv14102

Modified Files:
      Tag: sandbox_91_branch
	Makefile Makefile.nmake 
Log Message:
Fixed both makefiles to account for both net-* and mono-* targets.

Index: Makefile.nmake
===================================================================
RCS file: /cvsroot/nant/nant/Makefile.nmake,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -d -r1.17.2.3 -r1.17.2.4
*** Makefile.nmake	13 Mar 2011 20:34:24 -0000	1.17.2.3
--- Makefile.nmake	28 Apr 2011 00:54:10 -0000	1.17.2.4
***************
*** 15,27 ****
  TARGET_FRAMEWORK = -t:$(TARGET)
  
! !if "$(TARGET)" == "net-1.0"
  DEFINE = $(DEFINE),NET_1_0,ONLY_1_0
  !else if "$(TARGET)" == "net-1.1"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,ONLY_1_1
! !else if "$(TARGET)" == "net-2.0"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,ONLY_2_0
! !else if "$(TARGET)" == "net-3.5"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,ONLY_3_5
! !else if "$(TARGET)" == "net-4.0"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,NET_4_0,ONLY_4_0
  !endif
--- 15,27 ----
  TARGET_FRAMEWORK = -t:$(TARGET)
  
! !if "$(TARGET)" == "net-1.0" || "$(TARGET)" == "mono-1.0"
  DEFINE = $(DEFINE),NET_1_0,ONLY_1_0
  !else if "$(TARGET)" == "net-1.1"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,ONLY_1_1
! !else if "$(TARGET)" == "net-2.0" || "$(TARGET)" == "mono-2.0"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,ONLY_2_0
! !else if "$(TARGET)" == "net-3.5" || "$(TARGET)" == "mono-3.5"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,ONLY_3_5
! !else if "$(TARGET)" == "net-4.0" || "$(TARGET)" == "mono-4.0"
  DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,NET_4_0,ONLY_4_0
  !endif

Index: Makefile
===================================================================
RCS file: /cvsroot/nant/nant/Makefile,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -C2 -d -r1.26.2.3 -r1.26.2.4
*** Makefile	13 Mar 2011 20:34:24 -0000	1.26.2.3
--- Makefile	28 Apr 2011 00:54:10 -0000	1.26.2.4
***************
*** 30,43 ****
  TARGET_FRAMEWORK = -t:$(TARGET)
  
! ifeq ($(TARGET),net-1.0)
! DEFINE = $(DEFINE),NET_1_0,ONLY_1_0
! else ifeq ($(TARGET),net-1.1)
! DEFINE = $(DEFINE),NET_1_0,NET_1_1,ONLY_1_1
! else ifeq ($(TARGET),net-2.0)
! DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,ONLY_2_0
! else ifeq ($(TARGET),net-3.5)
! DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,ONLY_3_5
! else ifeq ($(TARGET),net-4.0)
! DEFINE = $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,NET_4_0,ONLY_4_0
  endif
  
--- 30,43 ----
  TARGET_FRAMEWORK = -t:$(TARGET)
  
! ifeq ($(findstring 1.0,$(TARGET)),1.0)
! DEFINE := $(DEFINE),NET_1_0,ONLY_1_0
! else ifeq ($(findstring 1.1,$(TARGET)),1.1)
! DEFINE := $(DEFINE),NET_1_0,NET_1_1,ONLY_1_1
! else ifeq ($(findstring 2.0,$(TARGET)),2.0)
! DEFINE := $(DEFINE),NET_1_0,NET_1_1,NET_2_0,ONLY_2_0
! else ifeq ($(findstring 3.5,$(TARGET)),3.5)
! DEFINE := $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,ONLY_3_5
! else ifeq ($(findstring 4.0,$(TARGET)),4.0)
! DEFINE := $(DEFINE),NET_1_0,NET_1_1,NET_2_0,NET_3_5,NET_4_0,ONLY_4_0
  endif