[mapguide-commits] r9807 - in sandbox/jng/vanilla_swig/Bindings: . src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64 src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/native src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64 src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/native src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64 src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/native src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64 src/Managed/DotNet/OSGeo.MapGuide.Pla tformBase/runtimes/linux-x64/native src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64 src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/native src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Nov 27 09:03:25 PST 2020
Author: jng
Date: 2020-11-27 09:03:25 -0800 (Fri, 27 Nov 2020)
New Revision: 9807
Added:
sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/native/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/native/readme-linux-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/readme-win-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/native/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/native/readme-linux-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/readme-win-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/native/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/native/readme-linux-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/readme-win-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64/native/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64/native/readme-linux-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/readme-win-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/native/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/native/readme-linux-x64.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/readme-win-x64.txt
Removed:
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/README.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/README.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/README.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/README.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/README.txt
Modified:
sandbox/jng/vanilla_swig/Bindings/
sandbox/jng/vanilla_swig/Bindings/TODO.txt
Log:
Add setup script to help deploy MapGuide linux libraries to the right place for nuget packaging
Index: sandbox/jng/vanilla_swig/Bindings
===================================================================
--- sandbox/jng/vanilla_swig/Bindings 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings 2020-11-27 17:03:25 UTC (rev 9807)
Property changes on: sandbox/jng/vanilla_swig/Bindings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
+linux-x64
packages
Modified: sandbox/jng/vanilla_swig/Bindings/TODO.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/TODO.txt 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings/TODO.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -19,7 +19,7 @@
- Install same compilers/tools as the same docker image used to produce the common libs tarball
- Generate and build the .net/Java SWIG glue libraries
- Copy the compiled libs out of the docker container and into the same native library staging area for Java/.net
- - ( ) OR: Update our common libs dockerfile in (https://github.com/jumpinjackie/mapguide-fdo-docker-build) to perform the above tasks
+ - (x) OR: Update our common libs dockerfile in (https://github.com/jumpinjackie/mapguide-fdo-docker-build) to perform the above tasks
- [x] Refactor current .net test suite to reference these nuget packages
- [x] Verify test suite still passes (Windows)
- [x] Verify test suite still passes (Windows, legacy .net Framework)
Added: sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1,23 @@
+SET TARBALL=%1
+7z x %TARBALL% -so | 7z x -aoa -si -ttar -o"linux-x64"
+rem Foundation setup
+copy /Y linux-x64\lib64\libFoundation* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgFoundation* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgMdfModel* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libACE* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libxerces* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+rem Geometry setup
+copy /Y linux-x64\lib64\libGeometry* src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgGeometry* src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native
+rem PlatformBase setup
+copy /Y linux-x64\lib64\libPlatformBase* src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgPlatformBase* src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgMdfParser* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+rem MapGuideCommon setup
+copy /Y linux-x64\lib64\libMapGuideCommon* src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgMapGuideCommon* src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native
+rem Web setup
+copy /Y linux-x64\lib64\libWeb* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgWeb* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\libMgHttpHandler* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y linux-x64\lib64\liblib_json* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/native/readme-linux-x64.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/native/readme-linux-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/linux-x64/native/readme-linux-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All unmanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Deleted: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/README.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/README.txt 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/README.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -1 +0,0 @@
-All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Copied: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/readme-win-x64.txt (from rev 9806, sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/README.txt)
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/readme-win-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/runtimes/win-x64/native/readme-win-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All unmanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/native/readme-linux-x64.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/native/readme-linux-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/linux-x64/native/readme-linux-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All unmanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Deleted: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/README.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/README.txt 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/README.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -1 +0,0 @@
-All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Copied: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/readme-win-x64.txt (from rev 9806, sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/README.txt)
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/readme-win-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/runtimes/win-x64/native/readme-win-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/native/readme-linux-x64.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/native/readme-linux-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/linux-x64/native/readme-linux-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All unmanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Deleted: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/README.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/README.txt 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/README.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -1 +0,0 @@
-All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Copied: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/readme-win-x64.txt (from rev 9806, sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/README.txt)
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/readme-win-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/runtimes/win-x64/native/readme-win-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64/native/readme-linux-x64.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64/native/readme-linux-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/linux-x64/native/readme-linux-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All unmanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Deleted: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/README.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/README.txt 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/README.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -1 +0,0 @@
-All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/readme-win-x64.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/readme-win-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/runtimes/win-x64/native/readme-win-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/native/readme-linux-x64.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/native/readme-linux-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/linux-x64/native/readme-linux-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All unmanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Deleted: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/README.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/README.txt 2020-11-27 16:57:14 UTC (rev 9806)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/README.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -1 +0,0 @@
-All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
Copied: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/readme-win-x64.txt (from rev 9806, sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/README.txt)
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/readme-win-x64.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/runtimes/win-x64/native/readme-win-x64.txt 2020-11-27 17:03:25 UTC (rev 9807)
@@ -0,0 +1 @@
+All ummanaged libraries being P/Invoked (including their dependencies) go here
\ No newline at end of file
More information about the mapguide-commits
mailing list