Download python-ply inside of premake

This way clients don't have to configure a virtual environment and install it.

Diffs=
31bf5a44f Download python-ply inside of premake (#8285)

Co-authored-by: Chris Dalton <[email protected]>

.rive_head

@@ -1 +1 @@
-5d5d418b7316aa555edb7f8ada7f20714430bdfe
+31bf5a44f282bd4c233a6fb9e44e73b0378bf449

renderer/README.md

@@ -19,12 +19,6 @@ pushd ../skia/dependencies
 popd
 ```
 
-## Install Python PLY
-
-```
-python3 -m pip install ply
-```
-
 ## Add build_rive.sh to $PATH
 
 ```

renderer/premake5_pls_renderer.lua

@@ -1,6 +1,7 @@
 dofile('rive_build_config.lua')
 
 RIVE_RUNTIME_DIR = path.getabsolute('..')
+local dependency = require('dependency')
 
 newoption({
     trigger = 'with_vulkan',
@@ -9,7 +10,6 @@ newoption({
 -- Guard this in an "if" (instead of filter()) so we don't download these repos when not building
 -- for Vulkan.
 if _OPTIONS['with_vulkan'] then
-    local dependency = require('dependency')
     -- Standardize on the same set of Vulkan headers on all platforms.
     vulkan_headers = dependency.github('KhronosGroup/Vulkan-Headers', 'vulkan-sdk-1.3.283')
     vulkan_memory_allocator = dependency.github(
@@ -90,12 +90,21 @@ else
     nproc = handle:read('*a')
     handle:close()
 end
-nproc = nproc:gsub("%s+", "") -- remove whitespace
+nproc = nproc:gsub('%s+', '') -- remove whitespace
+local python_ply = dependency.github('dabeaz/ply', '5c4dc94d4c6d059ec127ee1493c735963a5d2645')
 local pls_generated_headers = RIVE_BUILD_OUT .. '/include'
 local pls_shaders_absolute_dir = path.getabsolute(pls_generated_headers .. '/generated/shaders')
-local makecommand = 'make -C '
+local makecommand
+if os.host() == 'windows' then
+    makecommand = '"set PYTHONPATH=' .. python_ply .. '/src" && '
+else
+    makecommand = 'PYTHONPATH="' .. python_ply .. '/src" '
+end
+makecommand = makecommand
+    .. 'make -C '
     .. path.getabsolute('src/shaders')
-    .. ' -j' .. nproc
+    .. ' -j'
+    .. nproc
     .. ' OUT='
     .. pls_shaders_absolute_dir
 

renderer/src/shaders/minify.py

@@ -84,9 +84,9 @@ def t_DEFINE(tok):
     return tok
 
 def t_IFDEF(tok):
-    r"\#[ \t]*(?P<tag>ifn?def)[ \t]+(?P<id>[\@\$]?[A-Za-z_][A-Za-z0-9_]*)"
+    r"\#[ \t]*(?P<tag>ifn?def)[ \t]+(?P<ifdef_id>[\@\$]?[A-Za-z_][A-Za-z0-9_]*)"
     tok.ifdef_tag = re.match(t_IFDEF.__doc__, tok.value)['tag']
-    tok.ifdef_id = re.match(t_IFDEF.__doc__, tok.value)['id']
+    tok.ifdef_id = re.match(t_IFDEF.__doc__, tok.value)['ifdef_id']
     if tok.ifdef_id[0] == '@':
         exported_switches.add(tok.ifdef_id)
     parse_id(tok.ifdef_id, tok.lexer.exports, is_reference=True)