[fdo-commits] r760 - in branches/3.2.x/Fdo: Managed/UnitTest UnitTest Unmanaged/Src/Fdo/ClientServices

[svn_fdo at osgeo.org]

Author: jacklee
Date: 2007-02-12 12:00:44 -0500 (Mon, 12 Feb 2007)
New Revision: 760

Modified:
   branches/3.2.x/Fdo/Managed/UnitTest/mgClientServicesTest.cs
   branches/3.2.x/Fdo/UnitTest/ClientServicesTest.cpp
   branches/3.2.x/Fdo/UnitTest/UnitTest.vcproj
   branches/3.2.x/Fdo/Unmanaged/Src/Fdo/ClientServices/RegistryUtility.cpp
Log:
Change version to 3.2.2

Modified: branches/3.2.x/Fdo/Managed/UnitTest/mgClientServicesTest.cs
===================================================================
--- branches/3.2.x/Fdo/Managed/UnitTest/mgClientServicesTest.cs	2007-02-10 04:42:19 UTC (rev 759)
+++ branches/3.2.x/Fdo/Managed/UnitTest/mgClientServicesTest.cs	2007-02-12 17:00:44 UTC (rev 760)
@@ -49,8 +49,8 @@
             dt1.name = "Autodesk.Oracle.3.2";
             dt1.displayname = "Oracle";
             dt1.description = "Oracle Spatial FDO Provider";
-            dt1.version = "3.2.0.0";
-            dt1.fdoVersion = "3.2.0.0";
+            dt1.version = "3.2.2.0";
+            dt1.fdoVersion = "3.2.2.0";
             dt1.libraryPath = "FdoRdbms.dll";
             dt1.isManaged = false;
 
@@ -58,8 +58,8 @@
             dt2.name = "TestData2";
             dt2.displayname = "TestData2";
             dt2.description = "TestDescription2";
-            dt2.version = "3.2.0.0";
-            dt2.fdoVersion = "3.2.0.0";
+            dt2.version = "3.2.2.0";
+            dt2.fdoVersion = "3.2.2.0";
             dt2.libraryPath = "c:\\Test2\\test2.dll";
             dt2.isManaged = true;
 
@@ -67,8 +67,8 @@
             dt3.name = "TestData3";
             dt3.displayname = "TestData3";
             dt3.description = "TestDescription3";
-            dt3.version = "3.2.0.0";
-            dt3.fdoVersion = "3.2.0.0";
+            dt3.version = "3.2.2.0";
+            dt3.fdoVersion = "3.2.2.0";
             dt3.libraryPath = "c:\\Test3\\test.dll";
             dt3.isManaged = true;
 

Modified: branches/3.2.x/Fdo/UnitTest/ClientServicesTest.cpp
===================================================================
--- branches/3.2.x/Fdo/UnitTest/ClientServicesTest.cpp	2007-02-10 04:42:19 UTC (rev 759)
+++ branches/3.2.x/Fdo/UnitTest/ClientServicesTest.cpp	2007-02-12 17:00:44 UTC (rev 760)
@@ -47,8 +47,8 @@
     dt1 = new FdoCSTestData(std::wstring(L"Autodesk.Oracle.3.2"), 
                             std::wstring(L"Oracle"), 
                             std::wstring(L"Oracle Spatial FDO Provider"), 
-                            std::wstring(L"3.2.0.0"), 
-                            std::wstring(L"3.2.0.0"), 
+                            std::wstring(L"3.2.2.0"), 
+                            std::wstring(L"3.2.2.0"), 
 #ifdef _WIN32
                             std::wstring(L"FdoRdbms.dll"), // relies on the unit test being in the same 
 #else
@@ -61,7 +61,7 @@
                             std::wstring(L"TestData2"), 
                             std::wstring(L"TestDescription2"), 
                             std::wstring(L"3.0.3.0"), 
-                            std::wstring(L"3.2.0.0"), 
+                            std::wstring(L"3.2.2.0"), 
                             std::wstring(L"c:\\Test2\\test2.dll"),
                             true);
 
@@ -69,7 +69,7 @@
                             std::wstring(L"TestData3"), 
                             std::wstring(L"TestDescription3"), 
                             std::wstring(L"3.0.3.0"), 
-                            std::wstring(L"3.2.0.0"), 
+                            std::wstring(L"3.2.2.0"), 
                             std::wstring(L"c:\\Test3\\test.dll"),
                             true);
 

Modified: branches/3.2.x/Fdo/UnitTest/UnitTest.vcproj
===================================================================
--- branches/3.2.x/Fdo/UnitTest/UnitTest.vcproj	2007-02-10 04:42:19 UTC (rev 759)
+++ branches/3.2.x/Fdo/UnitTest/UnitTest.vcproj	2007-02-12 17:00:44 UTC (rev 760)
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(FDOTHIRDPARTY)\cppunit\include;..\Unmanaged\Inc;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__CPPUNIT_MFC_APP"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="Pch.h"

Modified: branches/3.2.x/Fdo/Unmanaged/Src/Fdo/ClientServices/RegistryUtility.cpp
===================================================================
--- branches/3.2.x/Fdo/Unmanaged/Src/Fdo/ClientServices/RegistryUtility.cpp	2007-02-10 04:42:19 UTC (rev 759)
+++ branches/3.2.x/Fdo/Unmanaged/Src/Fdo/ClientServices/RegistryUtility.cpp	2007-02-12 17:00:44 UTC (rev 760)
@@ -784,7 +784,7 @@
             const char *me;
             char *home;
             char *last;
-            char *install = "/usr/local/fdo-3.2.0/lib/";
+            char *install = "/usr/local/fdo-3.2.2/lib/";
 
             // try where we are
             me = SELFPATH;