[mapguide-commits] r9791 - in sandbox/jng/vanilla_swig/Bindings/src/Bindings: . DotNet Java Php
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 19 02:14:38 PST 2020
Author: jng
Date: 2020-11-19 02:14:38 -0800 (Thu, 19 Nov 2020)
New Revision: 9791
Added:
sandbox/jng/vanilla_swig/Bindings/src/Bindings/SwigCommon/
Removed:
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Common/
Modified:
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/java.i
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/php.i
Log:
Rename Common to SwigCommon for better clarity (this houses common and language-specific SWIG typemaps/modules)
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i 2020-11-19 09:55:54 UTC (rev 9790)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i 2020-11-19 10:14:38 UTC (rev 9791)
@@ -16,10 +16,10 @@
//
%include <wchar.i>
%include "MapGuideApi_Properties.i"
-%include "../Common/DotNet/string.i"
-%include "../Common/DotNet/coreclr_compat.i"
-%include "../Common/DotNet/sugar.i"
-%include "../Common/DotNet/custom.i"
+%include "../SwigCommon/DotNet/string.i"
+%include "../SwigCommon/DotNet/coreclr_compat.i"
+%include "../SwigCommon/DotNet/sugar.i"
+%include "../SwigCommon/DotNet/custom.i"
// Add default namespaces for all generated proxies
%typemap(csimports) SWIGTYPE %{
@@ -42,7 +42,7 @@
%ignore MgObject::GetClassId;
%ignore MgObject::GetClassName;
-%include "../Common/refcount.i"
+%include "../SwigCommon/refcount.i"
// Have these collections implement the .net collection interfaces
IMPLEMENT_LIST(MgClassDefinitionCollection, MgClassDefinition)
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i 2020-11-19 09:55:54 UTC (rev 9790)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i 2020-11-19 10:14:38 UTC (rev 9791)
@@ -15,10 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
%include <wchar.i>
-%include "../../Common/DotNet/string.i"
-%include "../../Common/DotNet/coreclr_compat.i"
-%include "../../Common/DotNet/sugar.i"
-%include "../../Common/DotNet/custom.i"
+%include "../../SwigCommon/DotNet/string.i"
+%include "../../SwigCommon/DotNet/coreclr_compat.i"
+%include "../../SwigCommon/DotNet/sugar.i"
+%include "../../SwigCommon/DotNet/custom.i"
// Add default namespaces for all generated proxies
%typemap(csimports) SWIGTYPE %{
@@ -41,7 +41,7 @@
%ignore MgObject::GetClassId;
%ignore MgObject::GetClassName;
-%include "../../Common/refcount.i"
+%include "../../SwigCommon/refcount.i"
// Have these collections implement the .net collection interfaces
IMPLEMENT_LIST(MgClassDefinitionCollection, MgClassDefinition)
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj 2020-11-19 09:55:54 UTC (rev 9790)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj 2020-11-19 10:14:38 UTC (rev 9791)
@@ -55,9 +55,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
+ <Command>"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
copy .\java.i .\language.i
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
+"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
"..\..\Tools\swig\install\swig.exe" -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
move /Y "$(ProjectDir)*.java" "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide"
if exist "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class" del "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class"</Command>
@@ -100,9 +100,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
+ <Command>"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
copy .\java.i .\language.i
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
+"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
"..\..\Tools\swig\install\swig.exe" -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
move /Y *.java "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide"
if exist "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class" del "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class"</Command>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/java.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/java.i 2020-11-19 09:55:54 UTC (rev 9790)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/java.i 2020-11-19 10:14:38 UTC (rev 9791)
@@ -15,9 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-%include "../Common/Java/exception.i"
-%include "../Common/Java/monkey_patch.i"
-%include "../Common/Java/extensions.i"
+%include "../SwigCommon/Java/exception.i"
+%include "../SwigCommon/Java/monkey_patch.i"
+%include "../SwigCommon/Java/extensions.i"
//Required JNI bootstrap
%pragma(java) jniclasscode=%{
@@ -40,7 +40,7 @@
// These methods have to be invoked C-style
%ignore MgObject::GetClassName;
-%include "../Common/refcount.i"
+%include "../SwigCommon/refcount.i"
%typemap(jni) STRINGPARAM "jstring"
%typemap(jtype) STRINGPARAM "String"
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/php.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/php.i 2020-11-19 09:55:54 UTC (rev 9790)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/php.i 2020-11-19 10:14:38 UTC (rev 9791)
@@ -26,9 +26,9 @@
#include "MapGuideCommon.h"
%}
-%include "../Common/Php/pointer.i"
-%include "../Common/Php/exception.i"
-%include "../Common/Php/monkey_patch.i"
+%include "../SwigCommon/Php/pointer.i"
+%include "../SwigCommon/Php/exception.i"
+%include "../SwigCommon/Php/monkey_patch.i"
%runtime %{
#if defined(_MSC_VER)
@@ -38,7 +38,7 @@
#include "PhpClassMap.cpp"
%}
-%include "../Common/refcount.i"
+%include "../SwigCommon/refcount.i"
// These methods have to be invoked C-style
%ignore MgObject::GetClassId;
More information about the mapguide-commits
mailing list