File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1818import subprocess
1919import sys
2020import os
21+ import glob
2122
2223SKETCHBOOK_JAR_DEST = os .path .expanduser ("~/sketchbook/modes/CppMode/mode/CppMode.jar" )
2324TMP_DIR = "/tmp/_cpp"
@@ -47,7 +48,13 @@ def get_processing4_dir():
4748def 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 ):
You can’t perform that action at this time.
0 commit comments