Merged in default - still have lots of failing tests, but can't fix that until Volker specifies whatever it was he was supposed to specify here, the thread has definitely been lost. Again.
commit
4429fa0292
@ -1,78 +1,83 @@
|
||||
@ECHO OFF
|
||||
PUSHD .
|
||||
SET pwd=%cd%
|
||||
CD %pwd%\sync
|
||||
|
||||
:: The script is located in ...\pEpForWindowsAdapterSolution\pEpEngine\build-windows\
|
||||
SET current_directory=%~dp0
|
||||
|
||||
:: Engine directory is ...\pEpForWindowsAdapterSolution\pEpEngine\
|
||||
SET engine_directory=%current_directory:~0,-14%
|
||||
|
||||
:: YML2 directory is ...\pEpForWindowsAdapterSolution\yml2\
|
||||
SET yml2_directory=%engine_directory:~0,-11%\yml2
|
||||
|
||||
:: Create the system.db
|
||||
PUSHD %engine_directory%\db
|
||||
CALL make_systemdb
|
||||
IF NOT EXIST "%ProgramData%\pEp" "MKDIR %ProgramData%\pEp"
|
||||
DEL "%ProgramData%\pEp\system.db"
|
||||
MOVE system.db "%ProgramData%\pEp\system.db"
|
||||
|
||||
:: Generate code in ...\pEpEngine\sync
|
||||
CD ..\sync
|
||||
|
||||
:: Make sure YML2 is installed
|
||||
PY -m pip install wheel
|
||||
PY -m pip install yml2
|
||||
|
||||
:: Generate the Sync code
|
||||
IF NOT EXIST generated MKDIR generated
|
||||
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 distribution.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 distribution.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 distribution.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 distribution.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
ECHO py "%YML_PATH%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm
|
||||
py "%YML_PATH%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
|
||||
xcopy /y generated\*.asn1 ..\asn.1\
|
||||
xcopy /y generated\*.c ..\src\
|
||||
xcopy /y generated\*.h ..\src\
|
||||
|
||||
CD %pwd%\asn.1
|
||||
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 -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 -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 -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 -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 -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 -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\
|
||||
XCOPY /y generated\*.c ..\src\
|
||||
XCOPY /y generated\*.h ..\src\
|
||||
|
||||
CD %engine_directory%\asn.1
|
||||
|
||||
DEL *.h
|
||||
DEL *.c
|
||||
|
||||
..\..\Tools\asn1c\bin\asn1c -S ../../Tools/asn1c/share/asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keysync.asn1 sync.asn1
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO end
|
||||
|
||||
..\..\Tools\asn1c\bin\asn1c -S ../../Tools/asn1c/share/asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keyreset.asn1 distribution.asn1
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
POPD
|
||||
EXIT /B 1
|
||||
)
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO end
|
||||
|
||||
DEL *-sample.c
|
||||
|
||||
CD %pwd%\..
|
||||
CD %engine_directory%\..
|
||||
RD /S/Q pEp
|
||||
MKDIR pEp
|
||||
XCOPY pEpEngine\src\*.h pEp\ /Y/F/I
|
||||
|
||||
|
||||
:end
|
||||
|
||||
POPD
|
||||
EXIT /B %ERRORLEVEL%
|
File diff suppressed because it is too large
Load Diff