[mapguide-commits] r9811 - sandbox/jng/vanilla_swig/Bindings

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-11-28 04:52:20 -0800 (Sat, 28 Nov 2020)
New Revision: 9811

Modified:
   sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd
Log:
Our nuget packages were bloating up due to the .so symlinks being followed in the nuget package creation step resulting in effectively duplicate linux binaries being bundled. Upon further analysis, these .so symlinks are not necessary (phew!) as the glue library links against the version-suffixed .so files anyways, so tweak the linux native lib setup script to not copy symlinks into the required staging areas.

Modified: sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd	2020-11-28 12:10:11 UTC (rev 9810)
+++ sandbox/jng/vanilla_swig/Bindings/setup_linux_native_libs.cmd	2020-11-28 12:52:20 UTC (rev 9811)
@@ -1,23 +1,25 @@
 SET TARBALL=%1
+SET SOVER=4.0.0
 7z x %TARBALL% -so | 7z x -aoa -si -ttar -o"linux-x64"
 rem Foundation setup
-copy /Y /L linux-x64\lib64\libFoundation* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgFoundation* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgMdfModel* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libACE* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libxerces* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libFoundationUnmanagedApi.so src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgFoundation-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgMdfModel-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libACE.so.6.2.6 src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libxerces-c-3.1.so src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
 rem Geometry setup
-copy /Y /L linux-x64\lib64\libGeometry* src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgGeometry* src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libGeometryUnmanagedApi.so src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgGeometry-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native
 rem PlatformBase setup
-copy /Y /L linux-x64\lib64\libPlatformBase* src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgPlatformBase* src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgMdfParser* src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libPlatformBaseUnmanagedApi.so src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgPlatformBase-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgMdfParser-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native
 rem MapGuideCommon setup
-copy /Y /L linux-x64\lib64\libMapGuideCommon* src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgMapGuideCommon* src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMapGuideCommonUnmanagedApi.so src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgMapGuideCommon-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native
 rem Web setup
-copy /Y /L linux-x64\lib64\libWeb* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgWeb* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\libMgHttpHandler* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
-copy /Y /L linux-x64\lib64\liblib_json* src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
\ No newline at end of file
+copy /Y /L linux-x64\lib64\libWebUnmanagedApi.so src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgWebApp-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgWebSupport-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\libMgHttpHandler-%SOVER%.so src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
+copy /Y /L linux-x64\lib64\liblib_json.so src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native
\ No newline at end of file