[mapguide-commits] r10119 - in branches/4.0/MgDev: . Bindings Bindings/src/Test/Java

[svn_mapguide at osgeo.org]

Author: jng
Date: 2025-02-07 07:58:08 -0800 (Fri, 07 Feb 2025)
New Revision: 10119

Modified:
   branches/4.0/MgDev/Bindings/TODO.txt
   branches/4.0/MgDev/Bindings/src/Test/Java/build.xml
   branches/4.0/MgDev/build.bat
Log:
Fix up the java test runner build and deploy it to test staging area as part of install for build.bat

Modified: branches/4.0/MgDev/Bindings/TODO.txt
===================================================================
--- branches/4.0/MgDev/Bindings/TODO.txt	2025-02-06 02:59:26 UTC (rev 10118)
+++ branches/4.0/MgDev/Bindings/TODO.txt	2025-02-07 15:58:08 UTC (rev 10119)
@@ -126,14 +126,20 @@
    - [ ] Implement a static umbrella landing site that is the gateway to the language-specific generated outputs
  - mg-desktop
    - [x] Rename to MgPortable/mg-portable
-   - [ ] Add SWIG glue library that layers on top of the existing Foundation/Geometry/PlatformBase glue projects
-   - [ ] Add new OSGeo.MapGuide.Portable .net project for the .net portion of the SWIG glue
+   - [x] Add SWIG glue library that layers on top of the existing Foundation/Geometry/PlatformBase glue projects
+   - [x] Add new OSGeo.MapGuide.Portable .net project for the .net portion of the SWIG glue
    - [ ] Implement a sample asp.net core application that confirms the feasibility of using mg-portable for web applications in addition to desktop applications
    - Either: 
      - ( ) Migrate the viewer winforms library to target .net 6.0
      - ( ) Or maintain 2 versions of this library, a new .net 6.0 version of the library and a legacy full framework version
    - [ ] Port over Java binding
- - [ ] Fix up run_tests.bat/run_tests.sh to work with new layout
+ - Prepare deployable test pack that can be run against an existing MG installation
+   - [x] Deploy .net test runner
+   - [ ] Deploy Java test runner
+     - [ ] Allow key configuration parameters to be passed in either from the commandline or read through environment variables
+   - [ ] Deploy PHP test runner
+   - [ ] Deploy MgTestAdmin tool into this staging area
+   - [ ] Fix up run_tests.bat/run_tests.sh to work with new layout
  - Old code cleanup/consolidation
    - [x] Remove old IMake
    - [x] Remove old binding projects from WebTier

Modified: branches/4.0/MgDev/Bindings/src/Test/Java/build.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/Java/build.xml	2025-02-06 02:59:26 UTC (rev 10118)
+++ branches/4.0/MgDev/Bindings/src/Test/Java/build.xml	2025-02-07 15:58:08 UTC (rev 10119)
@@ -22,7 +22,7 @@
   <property name="build.target" location="64" />
   <property name="binsrc.common" location="../../../../Common/bin/Release64" />
   <property name="binsrc.web" location="../../../../Web/bin/Release64" />
-  <property name="jarsrc.web" location="../../../packages/Java/Release/x64" />
+  <property name="jarsrc.web" location="../../../../packages/Java/Release/x64" />
   <property name="mapguide.res.src" location="../../../../Common/MapGuideCommon/Resources/mapguide_en.res" />
   <property name="mapguide.config.src" location="../../../../Web/src/webconfig.ini" />
   <property name="mapguide.res" location="${dist}/Resources/mapguide_en.res" />

Modified: branches/4.0/MgDev/build.bat
===================================================================
--- branches/4.0/MgDev/build.bat	2025-02-06 02:59:26 UTC (rev 10118)
+++ branches/4.0/MgDev/build.bat	2025-02-07 15:58:08 UTC (rev 10119)
@@ -464,6 +464,14 @@
 pushd Bindings\src\Test\DotNet\src\TestRunner
 dotnet publish -c Release -f net6.0 -r win-x64 --self-contained true -o "%MG_OUTPUT_TEST%\UnitTest\DotNet"
 popd
+pushd Bindings\src\Test\Java
+call %ANT% -Ddist="%MG_OUTPUT_TEST%\UnitTest\Java" -f build.xml
+popd
+rem HACK-ish but the default build targets include a prepared webconfig.ini and resource files. We don't need this
+pushd "%MG_OUTPUT_TEST%\UnitTest\Java"
+rd /S /Q Resources
+del /F webconfig.ini
+popd
 rem copy /Y test_readme.txt "%MG_OUTPUT_TEST%"
 rem copy /Y run_tests.bat "%MG_OUTPUT_TEST%"
 rem copy /Y run_tests.sh "%MG_OUTPUT_TEST%"