[mapguide-commits] r9379 - in trunk/MgDev: . Oem/ACE/ACE_wrappers/ace Oem/CppUnit-1.9.14/src/cppunit Oem/LinuxApt Oem/gd/lpng/projects/vs

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-04-01 08:53:23 -0700 (Sun, 01 Apr 2018)
New Revision: 9379

Modified:
   trunk/MgDev/
   trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj
   trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/
   trunk/MgDev/Oem/LinuxApt/
   trunk/MgDev/Oem/gd/lpng/projects/vs/
Log:
Merged revision(s) 9377-9378 from branches/3.1/MgDev:
Fix up ACE.vcxproj so that it can open in Visual Studio 2017 15.6 IDE (note: We still build with 2015 toolset)

Fixes #2776
........
Some svn:ignore updates
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2018-04-01 15:50:40 UTC (rev 9378)
+++ trunk/MgDev	2018-04-01 15:53:23 UTC (rev 9379)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
 /branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
 /branches/3.0/MgDev:8658,8705,8710
-/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329
+/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329,9377-9378
 /sandbox/VC140:8684-8759
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj	2018-04-01 15:50:40 UTC (rev 9378)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj	2018-04-01 15:53:23 UTC (rev 9379)
@@ -2234,7 +2234,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ACE.inl" />
-    <None Include="ace_wchar.inl" />
     <None Include="Activation_Queue.inl" />
     <None Include="Active_Map_Manager.inl" />
     <None Include="Active_Map_Manager_T.inl" />
@@ -2519,13 +2518,6 @@
     <None Include="XTI_ATM_Mcast.inl" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\VERSION">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuild>
     <CustomBuild Include="README">
       <FileType>Document</FileType>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

Index: trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit
===================================================================
--- trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit	2018-04-01 15:50:40 UTC (rev 9378)
+++ trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit	2018-04-01 15:53:23 UTC (rev 9379)

Property changes on: trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
 Release
 Release64
 *.user
+Debug64
Index: trunk/MgDev/Oem/LinuxApt
===================================================================
--- trunk/MgDev/Oem/LinuxApt	2018-04-01 15:50:40 UTC (rev 9378)
+++ trunk/MgDev/Oem/LinuxApt	2018-04-01 15:53:23 UTC (rev 9379)

Property changes on: trunk/MgDev/Oem/LinuxApt
___________________________________________________________________
Modified: svn:ignore
## -1,8 +1,3 ##
-httpd-2.4.9
-php-5.5.11
 *.tar
-php-5.5.17
-httpd-2.4.10
-httpd-2.4.18
-php-5.5.33
-php-5.6.23
+httpd-2.4.29
+php-5.6.33
Index: trunk/MgDev/Oem/gd/lpng/projects/vs
===================================================================
--- trunk/MgDev/Oem/gd/lpng/projects/vs	2018-04-01 15:50:40 UTC (rev 9378)
+++ trunk/MgDev/Oem/gd/lpng/projects/vs	2018-04-01 15:53:23 UTC (rev 9379)

Property changes on: trunk/MgDev/Oem/gd/lpng/projects/vs
___________________________________________________________________
Modified: svn:ignore
## -4,3 +4,4 ##
 Release64
 Debug
 *.user
+Debug64