[mapguide-commits] r9412 - in trunk/MgDev: . Common/Geometry Desktop/UnitTest Oem/CsMapLibrary

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat Nov 17 06:36:34 PST 2018 

Author: jng
Date: 2018-11-17 06:36:33 -0800 (Sat, 17 Nov 2018)
New Revision: 9412

Modified:
   trunk/MgDev/CMakeLists.txt
   trunk/MgDev/Common/Geometry/Geometry.vcxproj
   trunk/MgDev/Common/Geometry/Makefile.am
   trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj
   trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt
   trunk/MgDev/build.bat
   trunk/MgDev/build_oem.sh
   trunk/MgDev/build_sdk.bat
Log:
#2783: Fix up all references to the new CS-Map layout

Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/CMakeLists.txt	2018-11-17 14:36:33 UTC (rev 9412)
@@ -54,7 +54,7 @@
 set(MG_OEM_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Oem")
 set(MG_OEM_ROOT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/Oem")
 
-set(MG_OEM_CSMAP_INCLUDE_DIR "${MG_OEM_ROOT_DIR}/CsMap/Include")
+set(MG_OEM_CSMAP_INCLUDE_DIR "${MG_OEM_ROOT_DIR}/CsMap/CsMapDev/Include")
 set(MG_OEM_AGG_DIR "${MG_OEM_ROOT_DIR}/agg-2.4")
 set(MG_OEM_AGG_INCLUDE_DIR "${MG_OEM_AGG_DIR}/include")
 set(MG_OEM_AGG_FREETYPE_DIR "${MG_OEM_AGG_DIR}/font_freetype")

Modified: trunk/MgDev/Common/Geometry/Geometry.vcxproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcxproj	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/Common/Geometry/Geometry.vcxproj	2018-11-17 14:36:33 UTC (rev 9412)
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\CsMapDev\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -105,7 +105,7 @@
     <Link>
       <AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Oem\CsMap\CsMapDev\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -120,7 +120,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\CsMapDev\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -131,7 +131,7 @@
     <Link>
       <AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Oem\CsMap\CsMapDev\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>..\lib\$(Configuration)64\MgGeometryd.lib</ImportLibrary>
@@ -143,7 +143,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\CsMapDev\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -153,7 +153,7 @@
     <Link>
       <AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Oem\CsMap\CsMapDev\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -170,7 +170,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\CsMapDev\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -180,7 +180,7 @@
     <Link>
       <AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Oem\CsMap\CsMapDev\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/MgDev/Common/Geometry/Makefile.am
===================================================================
--- trunk/MgDev/Common/Geometry/Makefile.am	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/Common/Geometry/Makefile.am	2018-11-17 14:36:33 UTC (rev 9412)
@@ -452,18 +452,18 @@
   -I../../Oem/ACE/ACE_wrappers \
   -I../../Oem/geos/include \
   -I../../Oem/dbxml/xerces-c-src/src \
-  -I../../Oem/CsMap/Include \
+  -I../../Oem/CsMap/CsMapDev/Include \
   -I../../Common/CoordinateSystem
 
 libMgGeometry_la_LIBADD = \
   -lACE \
   -lMgFoundation \
-  ../../Oem/CsMap/.libs/libCsmap.a \
+  ../../Oem/CsMap/CsMapDev/.libs/libCsmap.a \
   ../../Oem/geos/src/.libs/libgeos.a
 
 libMgGeometry_la_LDFLAGS = -release $(PACKAGE_VERSION) \
   -L../../Oem/ACE/ACE_wrappers/ace \
   -L../Foundation \
-  -L../../Oem/CsMap \
+  -L../../Oem/CsMap/CsMapDev \
   -L../../Common/CoordinateSystem
 

Modified: trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj
===================================================================
--- trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj	2018-11-17 14:36:33 UTC (rev 9412)
@@ -111,10 +111,10 @@
 xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
 copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csv $(OutDir)Dictionaries\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -159,10 +159,10 @@
 xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
 copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csv $(OutDir)Dictionaries\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -207,11 +207,11 @@
 xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
 copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
-xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.txt $(OutDir)Dictionaries\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -259,11 +259,11 @@
 xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
 copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y  $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
-xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /Y /I ..\..\Oem\CsMap\CsMapDev\Dictionaries\*.txt $(OutDir)Dictionaries\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

Modified: trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt	2018-11-17 14:36:33 UTC (rev 9412)
@@ -3,146 +3,146 @@
 add_definitions(-DCSCOMPARE -DCSAPI -DMG)
 
 set (CsMap_SRCS
-    ../CsMap/Source/CS_alber.c
-    ../CsMap/Source/CS_angle.c
-    ../CsMap/Source/CS_ansi.c
-    ../CsMap/Source/CS_ats77.c
-    ../CsMap/Source/CS_azmea.c
-    ../CsMap/Source/CS_azmed.c
-    ../CsMap/Source/CS_badekas.c
-    ../CsMap/Source/CS_bonne.c
-    ../CsMap/Source/CS_bpcnc.c
-    ../CsMap/Source/CS_bursa.c
-    ../CsMap/Source/CS_bynFile.c
-    ../CsMap/Source/CS_category.c
-    ../CsMap/Source/CS_csini.c
-    ../CsMap/Source/CS_csio.c
-    ../CsMap/Source/CS_csprm.c
-    ../CsMap/Source/CS_csvFileSupport.cpp
-    ../CsMap/Source/CS_csWktLoc.c
-    ../CsMap/Source/CS_ctio.c
-    ../CsMap/Source/CS_datum.c
-    ../CsMap/Source/CS_defaults.c
-    ../CsMap/Source/CS_defCmp.c
-    ../CsMap/Source/CS_defCmpEx.c
-    ../CsMap/Source/CS_dtcalc.c
-    ../CsMap/Source/CS_dtio.c
-    ../CsMap/Source/CS_dtmBridge.c
-    ../CsMap/Source/CS_edcnc.c
-    ../CsMap/Source/CS_edcyl.c
-    ../CsMap/Source/CS_egm96.c
-    ../CsMap/Source/CS_ekrt4.c
-    ../CsMap/Source/CS_ekrt6.c
-    ../CsMap/Source/CS_elCalc.c
-    ../CsMap/Source/CS_elio.c
-    ../CsMap/Source/CS_epsgStuff.cpp
-    ../CsMap/Source/CS_epsgSupport.cpp
-    ../CsMap/Source/CS_erpt.c
-    ../CsMap/Source/CS_error.c
-    ../CsMap/Source/CS_fips.c
-    ../CsMap/Source/CS_frame.c
-    ../CsMap/Source/CS_frnch.c
-    ../CsMap/Source/CS_gauss.c
-    ../CsMap/Source/CS_general.c
-    ../CsMap/Source/CS_geocn.c
-    ../CsMap/Source/CS_geoct.c
-    ../CsMap/Source/CS_geoid96.c
-    ../CsMap/Source/CS_geoid99.c
-    ../CsMap/Source/CS_geoidHeight.c
-    ../CsMap/Source/CS_gissupprt.c
-    ../CsMap/Source/CS_gnomc.c
-    ../CsMap/Source/CS_gpio.c
-    ../CsMap/Source/CS_gridi.c
-    ../CsMap/Source/CS_groups.c
-    ../CsMap/Source/CS_guiApi.c
-    ../CsMap/Source/CS_gxIndex.c
-    ../CsMap/Source/CS_gxio.c
-    ../CsMap/Source/CS_gxprm.c
-    ../CsMap/Source/CS_hlApi.c
-    ../CsMap/Source/CS_hmlsn.c
-    ../CsMap/Source/CS_hpApi.c
-    ../CsMap/Source/CS_japan.c
-    ../CsMap/Source/CS_krovk.c
-    ../CsMap/Source/CS_lmbrt.c
-    ../CsMap/Source/CS_lmtan.c
-    ../CsMap/Source/CS_mgrs.c
-    ../CsMap/Source/CS_millr.c
-    ../CsMap/Source/CS_modpc.c
-    ../CsMap/Source/CS_molod.c
-    ../CsMap/Source/CS_molwd.c
-    ../CsMap/Source/CS_mrcat.c
-    ../CsMap/Source/CS_mstro.c
-    ../CsMap/Source/CS_mulrg.c
-    ../CsMap/Source/CS_nacyl.c
-    ../CsMap/Source/CS_nadcn.c
-    ../CsMap/Source/CS_nameMapper.cpp
-    ../CsMap/Source/CS_nameMapperSupport.cpp
-    ../CsMap/Source/CS_nerth.c
-    ../CsMap/Source/CS_ntv1.c
-    ../CsMap/Source/CS_ntv2.c
-    ../CsMap/Source/CS_nullx.c
-    ../CsMap/Source/CS_nzlnd.c
-    ../CsMap/Source/CS_oblqm.c
-    ../CsMap/Source/CS_optional.c
-    ../CsMap/Source/CS_ortho.c
-    ../CsMap/Source/CS_osgm91.c
-    ../CsMap/Source/CS_ost02.c
-    ../CsMap/Source/CS_ost97.c
-    ../CsMap/Source/CS_ostn02.c
-    ../CsMap/Source/CS_ostn97.c
-    ../CsMap/Source/CS_ostro.c
-    ../CsMap/Source/CS_parm3.c
-    ../CsMap/Source/CS_parm4.c
-    ../CsMap/Source/CS_parm6.c
-    ../CsMap/Source/CS_parm7.c
-    ../CsMap/Source/CS_plycn.c
-    ../CsMap/Source/CS_plynm.c
-    ../CsMap/Source/CS_pstro.c
-    ../CsMap/Source/CS_rlsUpdt.c
-    ../CsMap/Source/CS_robin.c
-    ../CsMap/Source/CS_sinus.c
-    ../CsMap/Source/CS_sstro.c
-    ../CsMap/Source/CS_supprt.c
-    ../CsMap/Source/CS_swiss.c
-    ../CsMap/Source/CS_sys34.c
-    ../CsMap/Source/CS_system.c
-    ../CsMap/Source/CS_tacyl.c
-    ../CsMap/Source/CS_trmer.c
-    ../CsMap/Source/CS_trmrs.c
-    ../CsMap/Source/CS_units.c
-    ../CsMap/Source/CS_unity.c
-    ../CsMap/Source/CS_vdgrn.c
-    ../CsMap/Source/CS_vertconUS.c
-    ../CsMap/Source/CS_vrtcon.c
-    ../CsMap/Source/CS_wellknowntext.cpp
-    ../CsMap/Source/CS_wgs72.c
-    ../CsMap/Source/CS_winkelTripel.c
-    ../CsMap/Source/CS_wktObject.cpp
-    ../CsMap/Source/CS_wktObjKonstants.cpp
-    ../CsMap/Source/CS_zones.c
-    ../CsMap/Source/CScs2Wkt.cpp
-    ../CsMap/Source/CScscomp.c
-    ../CsMap/Source/CSdata.c
-    ../CsMap/Source/CSdataDT.c
-    ../CsMap/Source/CSdataPJ.c
-    ../CsMap/Source/CSdataU.c
-    ../CsMap/Source/CSdatumCatalog.c
-    ../CsMap/Source/CSdictDiff.c
-    ../CsMap/Source/CSdt2Wkt.cpp
-    ../CsMap/Source/CSdtcomp.c
-    ../CsMap/Source/CSel2Wkt.cpp
-    ../CsMap/Source/CSelcomp.c
-    ../CsMap/Source/CSgeodeticSupport.c
-    ../CsMap/Source/CSgpcomp.c
-    ../CsMap/Source/CSgxcomp.c
-    ../CsMap/Source/CSwktFlavors.c
-    ../CsMap/Source/csIoUtil.cpp
+    ../CsMap/CsMapDev/Source/CS_alber.c
+    ../CsMap/CsMapDev/Source/CS_angle.c
+    ../CsMap/CsMapDev/Source/CS_ansi.c
+    ../CsMap/CsMapDev/Source/CS_ats77.c
+    ../CsMap/CsMapDev/Source/CS_azmea.c
+    ../CsMap/CsMapDev/Source/CS_azmed.c
+    ../CsMap/CsMapDev/Source/CS_badekas.c
+    ../CsMap/CsMapDev/Source/CS_bonne.c
+    ../CsMap/CsMapDev/Source/CS_bpcnc.c
+    ../CsMap/CsMapDev/Source/CS_bursa.c
+    ../CsMap/CsMapDev/Source/CS_bynFile.c
+    ../CsMap/CsMapDev/Source/CS_category.c
+    ../CsMap/CsMapDev/Source/CS_csini.c
+    ../CsMap/CsMapDev/Source/CS_csio.c
+    ../CsMap/CsMapDev/Source/CS_csprm.c
+    ../CsMap/CsMapDev/Source/CS_csvFileSupport.cpp
+    ../CsMap/CsMapDev/Source/CS_csWktLoc.c
+    ../CsMap/CsMapDev/Source/CS_ctio.c
+    ../CsMap/CsMapDev/Source/CS_datum.c
+    ../CsMap/CsMapDev/Source/CS_defaults.c
+    ../CsMap/CsMapDev/Source/CS_defCmp.c
+    ../CsMap/CsMapDev/Source/CS_defCmpEx.c
+    ../CsMap/CsMapDev/Source/CS_dtcalc.c
+    ../CsMap/CsMapDev/Source/CS_dtio.c
+    ../CsMap/CsMapDev/Source/CS_dtmBridge.c
+    ../CsMap/CsMapDev/Source/CS_edcnc.c
+    ../CsMap/CsMapDev/Source/CS_edcyl.c
+    ../CsMap/CsMapDev/Source/CS_egm96.c
+    ../CsMap/CsMapDev/Source/CS_ekrt4.c
+    ../CsMap/CsMapDev/Source/CS_ekrt6.c
+    ../CsMap/CsMapDev/Source/CS_elCalc.c
+    ../CsMap/CsMapDev/Source/CS_elio.c
+    ../CsMap/CsMapDev/Source/CS_epsgStuff.cpp
+    ../CsMap/CsMapDev/Source/CS_epsgSupport.cpp
+    ../CsMap/CsMapDev/Source/CS_erpt.c
+    ../CsMap/CsMapDev/Source/CS_error.c
+    ../CsMap/CsMapDev/Source/CS_fips.c
+    ../CsMap/CsMapDev/Source/CS_frame.c
+    ../CsMap/CsMapDev/Source/CS_frnch.c
+    ../CsMap/CsMapDev/Source/CS_gauss.c
+    ../CsMap/CsMapDev/Source/CS_general.c
+    ../CsMap/CsMapDev/Source/CS_geocn.c
+    ../CsMap/CsMapDev/Source/CS_geoct.c
+    ../CsMap/CsMapDev/Source/CS_geoid96.c
+    ../CsMap/CsMapDev/Source/CS_geoid99.c
+    ../CsMap/CsMapDev/Source/CS_geoidHeight.c
+    ../CsMap/CsMapDev/Source/CS_gissupprt.c
+    ../CsMap/CsMapDev/Source/CS_gnomc.c
+    ../CsMap/CsMapDev/Source/CS_gpio.c
+    ../CsMap/CsMapDev/Source/CS_gridi.c
+    ../CsMap/CsMapDev/Source/CS_groups.c
+    ../CsMap/CsMapDev/Source/CS_guiApi.c
+    ../CsMap/CsMapDev/Source/CS_gxIndex.c
+    ../CsMap/CsMapDev/Source/CS_gxio.c
+    ../CsMap/CsMapDev/Source/CS_gxprm.c
+    ../CsMap/CsMapDev/Source/CS_hlApi.c
+    ../CsMap/CsMapDev/Source/CS_hmlsn.c
+    ../CsMap/CsMapDev/Source/CS_hpApi.c
+    ../CsMap/CsMapDev/Source/CS_japan.c
+    ../CsMap/CsMapDev/Source/CS_krovk.c
+    ../CsMap/CsMapDev/Source/CS_lmbrt.c
+    ../CsMap/CsMapDev/Source/CS_lmtan.c
+    ../CsMap/CsMapDev/Source/CS_mgrs.c
+    ../CsMap/CsMapDev/Source/CS_millr.c
+    ../CsMap/CsMapDev/Source/CS_modpc.c
+    ../CsMap/CsMapDev/Source/CS_molod.c
+    ../CsMap/CsMapDev/Source/CS_molwd.c
+    ../CsMap/CsMapDev/Source/CS_mrcat.c
+    ../CsMap/CsMapDev/Source/CS_mstro.c
+    ../CsMap/CsMapDev/Source/CS_mulrg.c
+    ../CsMap/CsMapDev/Source/CS_nacyl.c
+    ../CsMap/CsMapDev/Source/CS_nadcn.c
+    ../CsMap/CsMapDev/Source/CS_nameMapper.cpp
+    ../CsMap/CsMapDev/Source/CS_nameMapperSupport.cpp
+    ../CsMap/CsMapDev/Source/CS_nerth.c
+    ../CsMap/CsMapDev/Source/CS_ntv1.c
+    ../CsMap/CsMapDev/Source/CS_ntv2.c
+    ../CsMap/CsMapDev/Source/CS_nullx.c
+    ../CsMap/CsMapDev/Source/CS_nzlnd.c
+    ../CsMap/CsMapDev/Source/CS_oblqm.c
+    ../CsMap/CsMapDev/Source/CS_optional.c
+    ../CsMap/CsMapDev/Source/CS_ortho.c
+    ../CsMap/CsMapDev/Source/CS_osgm91.c
+    ../CsMap/CsMapDev/Source/CS_ost02.c
+    ../CsMap/CsMapDev/Source/CS_ost97.c
+    ../CsMap/CsMapDev/Source/CS_ostn02.c
+    ../CsMap/CsMapDev/Source/CS_ostn97.c
+    ../CsMap/CsMapDev/Source/CS_ostro.c
+    ../CsMap/CsMapDev/Source/CS_parm3.c
+    ../CsMap/CsMapDev/Source/CS_parm4.c
+    ../CsMap/CsMapDev/Source/CS_parm6.c
+    ../CsMap/CsMapDev/Source/CS_parm7.c
+    ../CsMap/CsMapDev/Source/CS_plycn.c
+    ../CsMap/CsMapDev/Source/CS_plynm.c
+    ../CsMap/CsMapDev/Source/CS_pstro.c
+    ../CsMap/CsMapDev/Source/CS_rlsUpdt.c
+    ../CsMap/CsMapDev/Source/CS_robin.c
+    ../CsMap/CsMapDev/Source/CS_sinus.c
+    ../CsMap/CsMapDev/Source/CS_sstro.c
+    ../CsMap/CsMapDev/Source/CS_supprt.c
+    ../CsMap/CsMapDev/Source/CS_swiss.c
+    ../CsMap/CsMapDev/Source/CS_sys34.c
+    ../CsMap/CsMapDev/Source/CS_system.c
+    ../CsMap/CsMapDev/Source/CS_tacyl.c
+    ../CsMap/CsMapDev/Source/CS_trmer.c
+    ../CsMap/CsMapDev/Source/CS_trmrs.c
+    ../CsMap/CsMapDev/Source/CS_units.c
+    ../CsMap/CsMapDev/Source/CS_unity.c
+    ../CsMap/CsMapDev/Source/CS_vdgrn.c
+    ../CsMap/CsMapDev/Source/CS_vertconUS.c
+    ../CsMap/CsMapDev/Source/CS_vrtcon.c
+    ../CsMap/CsMapDev/Source/CS_wellknowntext.cpp
+    ../CsMap/CsMapDev/Source/CS_wgs72.c
+    ../CsMap/CsMapDev/Source/CS_winkelTripel.c
+    ../CsMap/CsMapDev/Source/CS_wktObject.cpp
+    ../CsMap/CsMapDev/Source/CS_wktObjKonstants.cpp
+    ../CsMap/CsMapDev/Source/CS_zones.c
+    ../CsMap/CsMapDev/Source/CScs2Wkt.cpp
+    ../CsMap/CsMapDev/Source/CScscomp.c
+    ../CsMap/CsMapDev/Source/CSdata.c
+    ../CsMap/CsMapDev/Source/CSdataDT.c
+    ../CsMap/CsMapDev/Source/CSdataPJ.c
+    ../CsMap/CsMapDev/Source/CSdataU.c
+    ../CsMap/CsMapDev/Source/CSdatumCatalog.c
+    ../CsMap/CsMapDev/Source/CSdictDiff.c
+    ../CsMap/CsMapDev/Source/CSdt2Wkt.cpp
+    ../CsMap/CsMapDev/Source/CSdtcomp.c
+    ../CsMap/CsMapDev/Source/CSel2Wkt.cpp
+    ../CsMap/CsMapDev/Source/CSelcomp.c
+    ../CsMap/CsMapDev/Source/CSgeodeticSupport.c
+    ../CsMap/CsMapDev/Source/CSgpcomp.c
+    ../CsMap/CsMapDev/Source/CSgxcomp.c
+    ../CsMap/CsMapDev/Source/CSwktFlavors.c
+    ../CsMap/CsMapDev/Source/csIoUtil.cpp
 )
 
 add_library(CsMap STATIC ${CsMap_SRCS})
 
 set (CsMapCompiler_SRCS
-    ../CsMap/Dictionaries/CS_Comp.c
+    ../CsMap/CsMapDev/Dictionaries/CS_Comp.c
 )
 add_executable(CsMapCompiler ${CsMapCompiler_SRCS})
 set_target_properties( CsMapCompiler
@@ -151,7 +151,7 @@
 install(TARGETS CsMapCompiler DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
 
 set (CsMapDictDiff_SRCS
-    ../CsMap/Dictionaries/CS_DictDiff.c
+    ../CsMap/CsMapDev/Dictionaries/CS_DictDiff.c
 )
 add_executable(CsMapDictDiff ${CsMapDictDiff_SRCS})
 set_target_properties( CsMapDictDiff
@@ -159,7 +159,7 @@
 target_link_libraries(CsMapDictDiff CsMap)
 install(TARGETS CsMapDictDiff DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
 
-set(CSMAP_DICT_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../CsMap/Dictionaries")
+set(CSMAP_DICT_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../CsMap/CsMapDev/Dictionaries")
 set(CSMAP_DICT_STAGING_DIR "${CMAKE_CURRENT_BINARY_DIR}/CsMap_Install")
 file(COPY ${CSMAP_DICT_SRC_DIR} DESTINATION ${CSMAP_DICT_STAGING_DIR})
 # Remove junk we know to not be related to dictionary data

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/build.bat	2018-11-17 14:36:33 UTC (rev 9412)
@@ -146,7 +146,7 @@
 %MSBUILD_CLEAN% %MG_OEM%\Oem.sln
 if not "%errorlevel%"=="0" goto error
 echo [clean]: Clean Oem - CS-Map
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC110\OpenSource.sln
+%MSBUILD_CLEAN% %MG_OEM%\CSMap\CsMapDev\VC140\OpenSource.sln
 if not "%errorlevel%"=="0" goto error
 if not "%TYPECOMPONENT%"=="all" goto quit
 
@@ -191,7 +191,7 @@
 if not "%errorlevel%"=="0" goto error
 rem CsMap is not in Oem.sln, so we need to build that separately
 echo [build]: Building Oem - CSMap
-%MSBUILD% %MG_OEM%\CsMap\VC140\OpenSource.sln
+%MSBUILD% %MG_OEM%\CSMap\CsMapDev\VC140\OpenSource.sln
 if not "%errorlevel%"=="0" goto error
 if "%TYPECOMPONENT%"=="oem" 	goto quit
 if "%TYPECOMPONENT%"=="server" 	goto quit
@@ -276,7 +276,7 @@
 echo [install]: Server - RepositoryAdmin
 %XCOPY% "%MG_SERVER%\RepositoryAdmin" "%MG_OUTPUT_SERVER%\RepositoryAdmin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
 echo [install]: CsMap Dictionaries
-%XCOPY% "%MG_OEM%\CsMap\Dictionaries" "%MG_OUTPUT_CSMAP%\Dictionaries" /EXCLUDE:svn_excludes.txt+csmap_excludes.txt+%TYPEBUILD%_excludes.txt
+%XCOPY% "%MG_OEM%\CSMap\CsMapDev\Dictionaries" "%MG_OUTPUT_CSMAP%\Dictionaries" /EXCLUDE:svn_excludes.txt+csmap_excludes.txt+%TYPEBUILD%_excludes.txt
 if "%TYPECOMPONENT%"=="server" goto quit
 if "%TYPECOMPONENT%"=="web" goto quit
 

Modified: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/build_oem.sh	2018-11-17 14:36:33 UTC (rev 9412)
@@ -618,7 +618,7 @@
 
 build_csmap()
 {
-    pushd CsMap
+    pushd CsMap/CsMapDev
     mkdir -p .libs
     pushd Source
     if [ $BUILD_CPU -eq 64 ]; then
@@ -642,7 +642,7 @@
 
 clean_csmap()
 {
-    pushd CsMap/Source
+    pushd CsMap/CsMapDev/Source
     if [ $BUILD_CPU -eq 64 ]; then
         make clean -fLibrary.mak PROCESSOR=x64
     else

Modified: trunk/MgDev/build_sdk.bat
===================================================================
--- trunk/MgDev/build_sdk.bat	2018-11-17 14:35:52 UTC (rev 9411)
+++ trunk/MgDev/build_sdk.bat	2018-11-17 14:36:33 UTC (rev 9412)
@@ -201,7 +201,7 @@
 echo [clean]: Clean Oem
 %MSBUILD_CLEAN% %MG_OEM%\Oem.sln
 echo [clean]: Clean Oem - CS-Map
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
+%MSBUILD_CLEAN% %MG_OEM%\CSMap\CsMapDev\VC90\OpenSource.sln
 if not "%TYPECOMPONENT%"=="all" goto quit
 
 :clean_common
@@ -237,7 +237,7 @@
 if "%errorlevel%"=="1" goto error
 rem CsMap is not in Oem.sln, so we need to build that separately
 echo [build]: Building Oem - CSMap
-%MSBUILD% %MG_OEM%\CsMap\VC90\OpenSource.sln
+%MSBUILD% %MG_OEM%\CSMap\CsMapDev\VC90\OpenSource.sln
 if "%errorlevel%"=="1" goto error
 
 :build_common

More information about the mapguide-commits mailing list