Merge pull request #241 from bgilbert/drop-java

Drop OpenSlide Java

Author: bgilbert

.github/workflows/build.yml

@@ -25,14 +25,6 @@ on:
         description: Override OpenSlide with this openslide_repo ref
         required: false
         type: string
-      openslide_java_repo:
-        description: Override OpenSlide Java with this repo
-        required: false
-        type: string
-      openslide_java_ref:
-        description: Override OpenSlide Java with this openslide_java_repo ref
-        required: false
-        type: string
       openslide_bin_repo:
         description: Use openslide-bin from this repo
         required: false
@@ -93,21 +85,11 @@ jobs:
           fetch-depth: 0
           path: override/openslide
           persist-credentials: false
-      - name: Check out OpenSlide Java
-        if: inputs.openslide_java_repo != ''
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ inputs.openslide_java_repo }}
-          ref: ${{ inputs.openslide_java_ref }}
-          # make sure "git describe" works
-          fetch-depth: 0
-          path: override/openslide-java
-          persist-credentials: false
       - name: Collect overrides
-        if: inputs.openslide_repo != '' || inputs.openslide_java_repo != ''
+        if: inputs.openslide_repo != ''
         run: tar cf overrides.tar override
       - name: Upload overrides
-        if: inputs.openslide_repo != '' || inputs.openslide_java_repo != ''
+        if: inputs.openslide_repo != ''
         uses: actions/upload-artifact@v4
         with:
           name: build-overrides
@@ -196,12 +178,12 @@ jobs:
           rm -r "${{ needs.sdist.outputs.archive_base }}" \
               "${{ needs.sdist.outputs.archive }}"
       - name: Download overrides
-        if: inputs.openslide_repo != '' || inputs.openslide_java_repo != ''
+        if: inputs.openslide_repo != ''
         uses: actions/download-artifact@v4
         with:
           name: build-overrides
       - name: Unpack overrides
-        if: inputs.openslide_repo != '' || inputs.openslide_java_repo != ''
+        if: inputs.openslide_repo != ''
         run: tar xf overrides.tar && rm overrides.tar
       - name: Build
         id: build

artifacts/meson.build

@@ -42,7 +42,6 @@ artifacts = [
     env : env,
   ),
   openslide.get_variable('openslide_headers'),
-  openslide_java.get_variable('openslide_jar'),
   meson.project_source_root() / 'CHANGELOG.md',
 ]
 
@@ -72,7 +71,6 @@ postprocess = find_program('postprocess-binary.py')
 foreach bin : [
   libopenslide,
   openslide.get_variable('slidetool'),
-  openslide_java.get_variable('openslide_jni'),
 ]
   name = fs.name(bin.full_path())
   artifacts += custom_target(

artifacts/postprocess-binary.py

@@ -116,7 +116,7 @@ class Args(TypedArgs):
         # filter out acceptable symbols
         sym
         for sym in syms
-        if not sym.startswith('openslide_') and sym != 'JNI_OnLoad'
+        if not sym.startswith('openslide_')
     ]
     if syms:
         raise Exception(f'Unexpected exports in {args.file}: {syms}')
@@ -141,16 +141,12 @@ class Args(TypedArgs):
                 break
     else:
         raise Exception("Couldn't read LC_RPATH")
-    if args.file.name.endswith('.jnilib'):
-        new_rpath = '@loader_path'
-    else:
-        new_rpath = '@loader_path/../lib'
     subprocess.check_call(
         [
             os.environ['INSTALL_NAME_TOOL'],
             '-rpath',
             old_rpath,
-            new_rpath,
+            '@loader_path/../lib',
             args.output,
         ]
     )

artifacts/write-bdist.py

@@ -66,17 +66,10 @@ class Args(TypedArgs):
 with arc:
     for path in args.artifacts:
         name = path.name
-        if re.search(
-            '\\.(lib|(dylib|jnilib)(\\.dSYM)?|so[.0-9]*(\\.debug)?)$', name
-        ):
+        if re.search('\\.(lib|dylib(\\.dSYM)?|so[.0-9]*(\\.debug)?)$', name):
             arcdir = arc.base / 'lib'
         elif name.endswith('.h'):
             arcdir = arc.base / 'include' / 'openslide'
-        elif name.endswith('.jar'):
-            if meson_host() == 'windows':
-                arcdir = arc.base / 'bin'
-            else:
-                arcdir = arc.base / 'lib'
         elif name in (
             'CHANGELOG.md',
             'VERSIONS.md',

bintool

@@ -147,11 +147,11 @@ class BuildParams:
             return False
 
         with self.lock():
-            if has_api('winbuild', [1, 2]):
+            if has_api('winbuild', [1, 2, 3]):
                 plat: Platform = MesonPlatform(
                     self, 'windows', 'x64', cross=True
                 )
-            elif has_api('linux', [1]):
+            elif has_api('linux', [1, 2]):
                 plat = MesonPlatform(self, 'linux', 'x86_64', cross=False)
             elif sys.platform == 'darwin':
                 # no container image to check for
@@ -474,7 +474,6 @@ class SmokeTester(ABC):
 class BDistSmokeTester(SmokeTester):
     def _parse(self) -> str:
         self._name = BDistName(Path(self._fh.name).name)
-        self._java_libdir = 'bin' if self._name.system == 'windows' else 'lib'
         return self._name.system
 
     def _unpack(self, dir: Path) -> None:
@@ -497,22 +496,6 @@ class BDistSmokeTester(SmokeTester):
             stdout=subprocess.DEVNULL,
         )
 
-        log(f'Checking {desc} Java TestCLI')
-        subprocess.check_call(
-            cmd_prefix
-            + [
-                'java',
-                '-cp',
-                'openslide.jar',
-                '-Djava.library.path=.',
-                'org.openslide.TestCLI',
-                '',
-            ],
-            cwd=dir / self._name.base / self._java_libdir,
-            env={**os.environ, 'OPENSLIDE_DEBUG': 'synthetic'},
-            stdout=subprocess.DEVNULL,
-        )
-
 
 class WheelSmokeTester(SmokeTester):
     def _parse(self) -> str:
@@ -582,8 +565,7 @@ def do_sdist(args: Args) -> None:
 
 def do_bdist(args: Args) -> None:
     params = BuildParams(args.suffix)
-    for proj in 'openslide', 'openslide-java':
-        params.args.append(f'-D{proj}:werror={str(args.werror).lower()}')
+    params.args.append(f'-Dopenslide:werror={str(args.werror).lower()}')
     with params.platform(overrides=True) as platform:
         result = platform.bdist()
         if platform.system == 'windows':
@@ -707,7 +689,7 @@ def main() -> None:
         '-w',
         '--werror',
         action='store_true',
-        help='Treat OpenSlide and OpenSlide Java build warnings as errors.',
+        help='Treat OpenSlide build warnings as errors.',
         parser=bdist,
     )
     sdist.set_defaults(func=do_sdist)

common/software.py

@@ -272,17 +272,6 @@ def _sqlite3_license(proj: Project) -> tuple[str, str]:
         update_url='https://github.com/openslide/openslide/tags',
         update_regex=re.compile('archive/refs/tags/v([0-9.]+)\\.tar'),
     ),
-    Project(
-        id='openslide-java',
-        display='OpenSlide Java',
-        primary=True,
-        licenses=['COPYING.LESSER'],
-        update_url='https://github.com/openslide/openslide-java/tags',
-        # Exclude old v1.0.0 tag
-        update_regex=re.compile(
-            'archive/refs/tags/v1\\.0\\.0\\.tar.*|.*archive/refs/tags/v([0-9.]+)\\.tar'  # noqa: E501
-        ),
-    ),
     Project(
         id='pcre2',
         display='PCRE2',

deps/meson.build

@@ -143,12 +143,5 @@ openslide = subproject(
     # We don't run tests, but we still check that they build
     'default_library=shared',
     'doc=disabled',
-    '_filter_external_symbols=true',
-  ],
-)
-openslide_java = subproject(
-  'openslide-java',
-  default_options : [
-    'embed_jni_path=disabled',
   ],
 )

machines/cross-macos-arm64.ini

@@ -1,11 +1,11 @@
 [built-in options]
 prefix = '/'
 c_args = ['-O2', '-g', '-fstack-protector-strong', '--target=aarch64-apple-macosx11']
-c_link_args = ['--target=aarch64-apple-macosx11']
+c_link_args = ['--target=aarch64-apple-macosx11', '-Wl,-exported_symbol,_openslide_*']
 cpp_args = ['-O2', '-g', '-fstack-protector-strong', '--target=aarch64-apple-macosx11']
-cpp_link_args = ['--target=aarch64-apple-macosx11']
+cpp_link_args = ['--target=aarch64-apple-macosx11', '-Wl,-exported_symbol,_openslide_*']
 objc_args = ['-O2', '-g', '-fstack-protector-strong', '--target=aarch64-apple-macosx11']
-objc_link_args = ['--target=aarch64-apple-macosx11']
+objc_link_args = ['--target=aarch64-apple-macosx11', '-Wl,-exported_symbol,_openslide_*']
 pkg_config_path = ''
 
 [properties]

machines/cross-macos-x86_64.ini

@@ -1,11 +1,11 @@
 [built-in options]
 prefix = '/'
 c_args = ['-O2', '-g', '-fstack-protector-strong', '--target=x86_64-apple-macosx11']
-c_link_args = ['--target=x86_64-apple-macosx11']
+c_link_args = ['--target=x86_64-apple-macosx11', '-Wl,-exported_symbol,_openslide_*']
 cpp_args = ['-O2', '-g', '-fstack-protector-strong', '--target=x86_64-apple-macosx11']
-cpp_link_args = ['--target=x86_64-apple-macosx11']
+cpp_link_args = ['--target=x86_64-apple-macosx11', '-Wl,-exported_symbol,_openslide_*']
 objc_args = ['-O2', '-g', '-fstack-protector-strong', '--target=x86_64-apple-macosx11']
-objc_link_args = ['--target=x86_64-apple-macosx11']
+objc_link_args = ['--target=x86_64-apple-macosx11', '-Wl,-exported_symbol,_openslide_*']
 pkg_config_path = ''
 
 [properties]

meson.options

@@ -1,7 +1,6 @@
 # useful subproject options:
 # -Dopenslide:version_suffix=foo - append foo to OpenSlide version string
 # -Dopenslide:werror=true        - fail OpenSlide build on warnings
-# -Dopenslide-java:werror=true   - fail OpenSlide Java build on warnings
 
 option(
   'all_systems',