Skip to content

Commit df5e924

Browse files
author
pepc84
committed
rebuild-jar.py: handle versioned java-X.Y.Z.jar in addition to java.jar
1 parent ee28639 commit df5e924

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

mode/CppMode.jar

2 Bytes
Binary file not shown.

scripts/rebuild-jar.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import subprocess
1919
import sys
2020
import os
21+
import glob
2122

2223
SKETCHBOOK_JAR_DEST = os.path.expanduser("~/sketchbook/modes/CppMode/mode/CppMode.jar")
2324
TMP_DIR = "/tmp/_cpp"
@@ -47,7 +48,13 @@ def get_processing4_dir():
4748
def main():
4849
processing4_dir = get_processing4_dir()
4950
cppbuild_java = os.path.join(processing4_dir, "java/src/processing/mode/cpp/CppBuild.java")
50-
java_jar = os.path.join(processing4_dir, "java/build/libs/java.jar")
51+
libs_dir = os.path.join(processing4_dir, "java/build/libs")
52+
# Handle both "java.jar" (older builds) and versioned "java-X.Y.Z.jar" (newer)
53+
_candidates = (
54+
glob.glob(os.path.join(libs_dir, "java.jar")) +
55+
glob.glob(os.path.join(libs_dir, "java-*.jar"))
56+
)
57+
java_jar = _candidates[0] if _candidates else os.path.join(libs_dir, "java.jar")
5158
gradlew = os.path.join(processing4_dir, "gradlew")
5259

5360
if not os.path.exists(cppbuild_java):

0 commit comments

Comments
 (0)