From 37577584a8047002af020676eb12be9019765a32 Mon Sep 17 00:00:00 2001
From: Thomas <devnull@localhost>
Date: Thu, 12 Nov 2020 13:55:50 +0100
Subject: [PATCH] Use YML2 directly with pip

---
 build-windows/generate_code.cmd | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/build-windows/generate_code.cmd b/build-windows/generate_code.cmd
index 19f57d3d..7e33d2cd 100644
--- a/build-windows/generate_code.cmd
+++ b/build-windows/generate_code.cmd
@@ -12,34 +12,39 @@ SET yml2_directory=%engine_directory:~0,-11%\yml2
 :: Generate code in ...\pEpEngine\sync
 PUSHD %engine_directory%\sync
 
+:: Make sure YML2 is installed
+PY -m pip install wheel
+PY -m pip install yml2
+
+:: Generate the code
 IF NOT EXIST generated MKDIR generated
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_actions.ysl2 sync.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_actions.ysl2 sync.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_codec.ysl2 distribution.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_codec.ysl2 distribution.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_codec.ysl2 distribution.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_codec.ysl2 distribution.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_codec.ysl2 sync.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_codec.ysl2 sync.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_messages.ysl2 sync.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_messages.ysl2 sync.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_messages.ysl2 distribution.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_messages.ysl2 distribution.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_messages.ysl2 distribution.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_messages.ysl2 distribution.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_message_func.ysl2 sync.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_message_func.ysl2 sync.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-ECHO py "%yml2_directory%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm
-py "%yml2_directory%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm
+ECHO PY -m yml2.yml2proc -E utf-8 -y gen_statemachine.ysl2 sync.fsm
+PY -m yml2.yml2proc -E utf-8 -y gen_statemachine.ysl2 sync.fsm
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
 XCOPY /y generated\*.asn1 ..\asn.1\