[mapguide-commits] r9365 - in trunk/MgDev/Desktop/DesktopUnmanagedApi: DotNet JavaApiEx

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-06 07:20:45 -0800 (Tue, 06 Mar 2018)
New Revision: 9365

Modified:
   trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
   trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
Log:
mg-desktop build fixes in light of recent CMake sandbox merge

Modified: trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj	2018-03-06 14:55:17 UTC (rev 9364)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj	2018-03-06 15:20:45 UTC (rev 9365)
@@ -78,9 +78,9 @@
     <PreBuildEvent>
       <Command>del /Q DesktopCustom\*prop
 IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
 ..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
@@ -107,9 +107,9 @@
     <PreBuildEvent>
       <Command>del /Q DesktopCustom\*prop
 IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
 ..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
@@ -143,9 +143,9 @@
     <PreBuildEvent>
       <Command>del /Q DesktopCustom\*prop
 IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
 ..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
@@ -175,9 +175,9 @@
     <PreBuildEvent>
       <Command>del /Q DesktopCustom\*prop
 IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
 ..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>

Modified: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj	2018-03-06 14:55:17 UTC (rev 9364)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj	2018-03-06 15:20:45 UTC (rev 9365)
@@ -93,9 +93,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
 copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
 ..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
 move /Y *.java org\osgeo\mapguide
 del org\osgeo\mapguide\*.class
@@ -133,9 +133,9 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
 copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
 ..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
 move /Y *.java org\osgeo\mapguide
 del org\osgeo\mapguide\*.class
@@ -173,9 +173,9 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
 copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
 ..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
 move /Y *.java org\osgeo\mapguide
 del org\osgeo\mapguide\*.class
@@ -214,9 +214,9 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
 copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
 ..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
 move /Y *.java org\osgeo\mapguide
 del org\osgeo\mapguide\*.class