Try adding 1.8.7 support

Author: parttimenerd

bin/copy_java_sources.py

@@ -8,26 +8,33 @@
 import shutil
 import sys
 from pathlib import Path
+from typing import Tuple, Optional
 
 BASEDIR = Path(sys.argv[1])
 RELEASE = sys.argv[2]
 VERSION = RELEASE.split("-")[0]
-AP_SOURCE_DIR = BASEDIR / "ap-releases" / f"async-profiler-{VERSION}-code" / "src"
-AP_CONVERTER_SOURCE_DIR = AP_SOURCE_DIR / "converter"
-AP_RESOURCES_SOURCE_DIR = AP_SOURCE_DIR / "res"
-AP_API_SOURCE_DIR = AP_SOURCE_DIR / "api" / "one" / "profiler"
-TARGET_SOURCE_DIR = BASEDIR / "src" / "main" / "java"
+
+def either(*dirs: Path) -> Path:
+    for dir in dirs:
+        if dir.exists():
+            return dir
+    raise AssertionError(f"None of {', '.join(map(str, dirs))} exists")
+
+
+def either_or_none(*dirs: Path) -> Optional[Path]:
+    return ([dir for dir in dirs if dir.exists()] + [None]) [0]
+
+
+AP_SOURCE_DIR = either(BASEDIR / "ap-releases" / f"async-profiler-{VERSION}-code" / "src")
+AP_CONVERTER_SOURCE_DIR = either(AP_SOURCE_DIR / "converter")
+AP_RESOURCES_SOURCE_DIR = either_or_none(AP_SOURCE_DIR / "res", AP_SOURCE_DIR / "main" / "resources")
+AP_API_SOURCE_DIR = either(AP_SOURCE_DIR / "api" / "one" / "profiler")
+TARGET_SOURCE_DIR = either(BASEDIR / "src" / "main" / "java")
 TARGET_ONE_DIR = TARGET_SOURCE_DIR / "one"
-TARGET_ONE_PROFILER_DIR = TARGET_ONE_DIR / "profiler"
+TARGET_ONE_PROFILER_DIR = either(TARGET_ONE_DIR / "profiler")
 TARGET_CONVERTER_DIR = TARGET_ONE_DIR / "converter"
 TARGET_RESOURCES_DIR = BASEDIR / "src" / "main" / "resources"
 
-assert AP_SOURCE_DIR.exists(), f"Source directory {AP_SOURCE_DIR} does not exist"
-assert AP_CONVERTER_SOURCE_DIR.exists(), f"Source directory {AP_CONVERTER_SOURCE_DIR} does not exist"
-assert AP_API_SOURCE_DIR.exists()
-assert TARGET_SOURCE_DIR.exists()
-assert TARGET_ONE_PROFILER_DIR.exists()
-assert AP_RESOURCES_SOURCE_DIR.exists()
 
 PROJECT_FILES = ["AsyncProfilerLoader.java"]
 
@@ -71,13 +78,14 @@
     else:
         shutil.copy(f, target_file)
 
-print("Copy converter resource files")
-for f in AP_RESOURCES_SOURCE_DIR.glob("*"):
-    target_file = TARGET_RESOURCES_DIR / f.name
-    if DRY_RUN:
-        print(f"would copy {f} to {target_file}")
-    else:
-        shutil.copy(f, target_file)
+if AP_RESOURCES_SOURCE_DIR:
+    print("Copy converter resource files")
+    for f in AP_RESOURCES_SOURCE_DIR.glob("*"):
+        target_file = TARGET_RESOURCES_DIR / f.name
+        if DRY_RUN:
+            print(f"would copy {f} to {target_file}")
+        else:
+            shutil.copy(f, target_file)
 
 print("Copy converter directories")
 for directory in AP_CONVERTER_SOURCE_DIR.glob("one/*"):

src/main/java/one/profiler/AsyncProfilerLoader.java

@@ -140,11 +140,14 @@ public static Path getExtractionDirectory() throws IOException {
   private static String getLibrarySuffix() throws OSNotSupportedException {
     if (librarySuffix == null) {
       String version = getVersion();
+      boolean oldVersion = version.startsWith("1.");
       String os = System.getProperty("os.name").toLowerCase();
       String arch = System.getProperty("os.arch").toLowerCase();
       if (os.startsWith("linux")) {
         if (arch.equals("arm64") || arch.equals("aarch64")) {
           librarySuffix = version + "-linux-aarch64.so";
+        } else if (arch.equals("x86") && oldVersion) {
+          librarySuffix = version + "-linux-x86.so";
         } else if (arch.equals("x86_64") || arch.equals("x64") || arch.equals("amd64")) {
           if (isOnMusl()) {
             librarySuffix = version + "-linux-x64-musl.so";
@@ -155,7 +158,14 @@ private static String getLibrarySuffix() throws OSNotSupportedException {
           throw new OSNotSupportedException("Async-profiler does not work on Linux " + arch);
         }
       } else if (os.startsWith("macosx") || os.startsWith("mac os x")) {
-        librarySuffix = version + "-macos.so";
+        if (oldVersion) {
+          if (!arch.contains("x86")) {
+            throw new OSNotSupportedException("Async-profiler does not work on MacOS " + arch);
+          }
+          librarySuffix = version + "-macosx-x86.so";
+        } else {
+          librarySuffix = version + "-macos.so";
+        }
       } else {
         throw new OSNotSupportedException("Async-profiler does not work on " + os);
       }