Merge pull request #630 from hx2A/fixbuild

Fix build

Author: hx2A

generate_py5.py

@@ -22,6 +22,7 @@
 import os
 import re
 import shutil
+import tempfile
 from pathlib import Path
 
 import matplotlib as mpl
@@ -90,7 +91,7 @@ def find_jar(jar_name):
             logger.critical(msg)
             raise RuntimeError(msg)
 
-    core_jar_path = find_jar("library/core")
+    core_jar_path = find_jar("library/core*")
     svg_jar_path = find_jar("svg")
     dxf_jar_path = find_jar("dxf")
     pdf_jar_path = find_jar("pdf")
@@ -301,24 +302,36 @@ def build_signatures(v):
         )
 
     # add the jars
-    def copy_jars(jar_dir, dest):
+    def copy_jars(jar_dir, dest, *, match_regex=None):
+        regex = re.compile(match_regex) if match_regex else None
+        version_regex = re.compile(r"-\d\.\d\.\d")
         dest.mkdir(parents=True, exist_ok=True)
         for jar in jar_dir.glob("*.jar"):
-            shutil.copy(jar, dest)
+            if regex and not regex.match(jar.name):
+                continue
+            shutil.copy(jar, dest / version_regex.sub("", jar.name))
 
-    copy_jars(core_jar_path.parent, build_dir / "py5" / "jars")
+    copy_jars(
+        core_jar_path.parent,
+        build_dir / "py5" / "jars",
+        match_regex=f"(core|gluegen|jogl)(?!.*natives).*$",
+    )
     copy_jars(svg_jar_path.parent, build_dir / "py5" / "jars" / "svg")
     copy_jars(dxf_jar_path.parent, build_dir / "py5" / "jars" / "dxf")
     copy_jars(pdf_jar_path.parent, build_dir / "py5" / "jars" / "pdf")
     shutil.copy(py5_jar_path, build_dir / "py5" / "jars")
 
     # add the native libraries
+    temp_dir = tempfile.TemporaryDirectory()
+    native_lib_temp_dir = Path(temp_dir.name)
+    native_lib_temp_dir.mkdir(parents=True, exist_ok=True)
+    for jar in core_jar_path.parent.glob("*natives*.jar"):
+        os.system(f"cd {native_lib_temp_dir} && jar xf {jar.absolute()}")
     shutil.copytree(
-        core_jar_path.parent,
+        native_lib_temp_dir / "natives",
         build_dir / "py5" / "natives",
-        ignore=lambda _, names: [n for n in names if Path(n).suffix == ".jar"],
-        dirs_exist_ok=True,
     )
+    temp_dir.cleanup()
 
     build_dir.touch()
 

py5_docs/Reference/api_en/Py5Shape_get_vertex_count.txt

@@ -8,10 +8,16 @@ processing_name = getVertexCount
 
 @@ signatures
 get_vertex_count() -> int
+get_vertex_count(include_children: bool, /) -> int
+
+@@ variables
+include_children: bool - include vertices in the shape's children
 
 @@ description
 The `get_vertex_count()` method returns the number of vertices that make up a `Py5Shape`. In the example, the value 4 is returned by the `get_vertex_count()` method because 4 vertices are defined in `setup()`.
 
+Use the `include_children` parameter to include the shape's children if the shape happens to be a `GROUP` shape. By default, a shape's children will not be included in the count.
+
 @@ example
 def setup():
     global s

py5_jar/build.xml

@@ -18,7 +18,7 @@
         <mkdir dir="${project.bin}"/>
         <javac release="17" debug="true" includeantruntime="false" srcdir="${project.src}" destdir="${project.bin}">
             <classpath>
-                <fileset dir="${processing_dir}/core/library/">
+                <fileset dir="${processing_dir}/lib/app/resources">
                         <include name="**/*.jar"/>
                 </fileset>
             </classpath>