? Release
? wiztesting/Release
? wiztime/Release
Index: wizard.cpp
===================================================================
RCS file: /scotty/wizard/wizard.cpp,v
retrieving revision 1.1.2.11.2.7
diff -c -r1.1.2.11.2.7 wizard.cpp
*** wizard.cpp	7 Jun 2012 07:25:35 -0000	1.1.2.11.2.7
--- wizard.cpp	22 Jun 2012 08:25:09 -0000
***************
*** 223,230 ****
--- 223,234 ----
  	bTrial = false;
  	bNeedsActivate = false;
  	if(license.type==licTrial) bTrial = true;
+ #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135))
  	else if(license.type==licMulti) bNeedsActivate = true;
  	else if((license.type==licUnlimited)||(license.type==licISV)) { bTrial = false; bNeedsActivate = false; }
+ #else
+ 	else if(license.type==licFull) bTrial = false; 
+ #endif
  	else
  	{
  		/* This *should* be caught in CheckLicense, but just in case it slips through.. */
Index: wizcfg/wizcfg.cpp
===================================================================
RCS file: /scotty/wizard/wizcfg/wizcfg.cpp,v
retrieving revision 1.1.2.12.2.52
diff -c -r1.1.2.12.2.52 wizcfg.cpp
*** wizcfg/wizcfg.cpp	7 Jun 2012 07:25:35 -0000	1.1.2.12.2.52
--- wizcfg/wizcfg.cpp	22 Jun 2012 08:25:09 -0000
***************
*** 1804,1809 ****
--- 1804,1810 ----
  		cvs::string licString;
  		if (cmdInfo.m_bLicenseGenerateTrial)
  			licgen.type = licTrial;
+ #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135))
  		else
  		if (cmdInfo.m_bLicenseGenerateISV)
  		{
***************
*** 1815,1820 ****
--- 1816,1824 ----
  			licgen.type = licMulti;
  		else
  			licgen.type = licUnlimited;
+ #else
+ 			licgen.type = licFull;
+ #endif
  		licgen.company = cvs::narrow((const wchar_t *)cmdInfo.m_szCompanyName);
  		licgen.daysLeft = cmdInfo.m_iLicenseDays;
  		licgen.daysLeft2 = -1; // TRIAL_DAYS2
? Release
? scccfg/Release
Index: CVSNTSCCI.cpp
===================================================================
RCS file: /scotty/vs.net/CVSNTSCCI.cpp,v
retrieving revision 1.43.4.83.2.24
diff -c -r1.43.4.83.2.24 CVSNTSCCI.cpp
*** CVSNTSCCI.cpp	8 Jun 2012 07:40:05 -0000	1.43.4.83.2.24
--- CVSNTSCCI.cpp	22 Jun 2012 08:25:09 -0000
***************
*** 480,485 ****
--- 480,486 ----
  	}
  
  	if(license.type==licTrial) bTrial = true;
+ #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135))
  	else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense1!=0)||(license.type==licMulti)) bTrial = false;
  	else if(license.type==licISV && license.otherLicense1==0)
  	{
***************
*** 489,494 ****
--- 490,498 ----
  							MB_ICONSTOP|MB_OK);
  		return SCC_E_NOTAUTHORIZED;
  	}
+ #else
+ 	else if(license.type==licFull) bTrial = false; 
+ #endif
  	else
  	{
  		/* This *should* be caught in CheckLicense, but just in case it slips through.. */
? Release
Index: WorkspaceManager.cpp
===================================================================
RCS file: /scotty/WorkspaceManager/WorkspaceManager.cpp,v
retrieving revision 1.40.2.9
diff -c -r1.40.2.9 WorkspaceManager.cpp
*** WorkspaceManager.cpp	7 Jun 2012 07:24:51 -0000	1.40.2.9
--- WorkspaceManager.cpp	22 Jun 2012 08:26:18 -0000
***************
*** 1142,1153 ****
--- 1142,1157 ----
  	}
  
  	if(license.type==licTrial) g_bTrial = true;
+ #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135))
  	else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense3!=0)||(license.type==licMulti)) g_bTrial = false;
  	else if(license.type==licISV && license.otherLicense3==0)
  	{
  			AfxMessageBox(_T("You are not licensed for this feature.\n\nTo upgrade to this feature purchase CVS Suite online at march-hare.com/cvsnt\n"));
  		return false;
  	}
+ #else
+ 	else if(license.type==licFull) g_bTrial = false; 
+ #endif
  	else
  	{
  		/* This *should* be caught in CheckLicense, but just in case it slips through.. */
CVSNT crashed.
? Release
Index: ReleaseManager.cpp
===================================================================
RCS file: /scotty/releasemanager/ReleaseManager.cpp,v
retrieving revision 1.13.2.3
diff -c -r1.13.2.3 ReleaseManager.cpp
*** ReleaseManager.cpp	7 Jun 2012 07:25:06 -0000	1.13.2.3
--- ReleaseManager.cpp	22 Jun 2012 08:25:09 -0000
***************
*** 111,122 ****
--- 111,126 ----
  	}
  
  	if(license.type==licTrial) bTrial = true;
+ #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135))
  	else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense2!=0)||(license.type==licMulti)) bTrial = false;
  	else if(license.type==licISV && license.otherLicense2==0)
  	{
  			AfxMessageBox(_T("You are not licensed for this feature.\n\nTo upgrade to this feature purchase CVS Suite online at march-hare.com/cvsnt\n"));
  		return false;
  	}
+ #else
+ 	else if(license.type==licFull) bTrial = false; 
+ #endif
  	else
  	{
  		/* This *should* be caught in CheckLicense, but just in case it slips through.. */