1
0
mirror of https://github.com/arkuznetsov/1CFilesConverter.git synced 2024-11-24 08:33:30 +02:00

fix: Поправлена проверка, что каталог содержит проект EDT

This commit is contained in:
Artem Kuznetsov 2023-07-21 13:38:54 +03:00
parent 1f9f4e1a53
commit 1493d712bd
7 changed files with 10 additions and 11 deletions

View File

@ -46,7 +46,7 @@ IF "%BASE_CONFIG%" equ "" (
%V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
) else (
set BASE_CONFIG_DESCRIPTION=configuration from "%BASE_CONFIG%"
IF exist "%BASE_CONFIG%\src\Configuration\Configuration.mdo" (
IF exist "%BASE_CONFIG%\DT-INF\" (
set CLEAN_AFTER_EXPORT=1
call %~dp0edt2ib.cmd "%BASE_CONFIG%" "%IB_PATH%"
) else (

View File

@ -41,7 +41,7 @@ IF "%BASE_CONFIG%" equ "" (
%V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
) else (
set BASE_CONFIG_DESCRIPTION=configuration from "%BASE_CONFIG%"
IF exist "%BASE_CONFIG%\src\Configuration\Configuration.mdo" (
IF exist "%BASE_CONFIG%\DT-INF\" (
set CLEAN_AFTER_EXPORT=1
call %~dp0edt2ib.cmd "%BASE_CONFIG%" "%IB_PATH%"
) else (

View File

@ -46,7 +46,7 @@ IF "%BASE_CONFIG%" equ "" (
%V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
) else (
set BASE_CONFIG_DESCRIPTION=configuration from "%BASE_CONFIG%"
IF exist "%BASE_CONFIG%\src\Configuration\Configuration.mdo" (
IF exist "%BASE_CONFIG%\DT-INF\" (
set CLEAN_AFTER_EXPORT=1
call %~dp0edt2ib.cmd "%BASE_CONFIG%" "%IB_PATH%"
) else (

View File

@ -42,7 +42,7 @@ IF "%BASE_CONFIG%" equ "" (
%V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
) else (
set BASE_CONFIG_DESCRIPTION=configuration from "%BASE_CONFIG%"
IF exist "%BASE_CONFIG%\src\Configuration\Configuration.mdo" (
IF exist "%BASE_CONFIG%\DT-INF\" (
set CLEAN_AFTER_EXPORT=1
call %~dp0edt2ib.cmd "%BASE_CONFIG%" "%IB_PATH%"
) else (

View File

@ -41,7 +41,7 @@ IF "%BASE_CONFIG%" equ "" (
%V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
) else (
set BASE_CONFIG_DESCRIPTION=configuration from "%BASE_CONFIG%"
IF exist "%BASE_CONFIG%\src\Configuration\Configuration.mdo" (
IF exist "%BASE_CONFIG%\DT-INF\" (
set CLEAN_AFTER_EXPORT=1
call %~dp0edt2ib.cmd "%BASE_CONFIG%" "%IB_PATH%"
) else (

View File

@ -41,7 +41,7 @@ IF "%BASE_CONFIG%" equ "" (
%V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
) else (
set BASE_CONFIG_DESCRIPTION=configuration from "%BASE_CONFIG%"
IF exist "%BASE_CONFIG%\src\Configuration\Configuration.mdo" (
IF exist "%BASE_CONFIG%\DT-INF\" (
set CLEAN_AFTER_EXPORT=1
call %~dp0edt2ib.cmd "%BASE_CONFIG%" "%IB_PATH%"
) else (

View File

@ -19,7 +19,7 @@ set CLEAN_AFTER_VALIDATION=0
set CONFIG_PATH=%1
if defined CONFIG_PATH set CONFIG_PATH=%CONFIG_PATH:"=%
set REPORT_FILE=%2
if defined CONFIG_FILE (
if defined REPORT_FILE (
set REPORT_FILE=%REPORT_FILE:"=%
set REPORT_FILE_PATH=%~dp2
)
@ -37,18 +37,17 @@ echo Clear temporary files...
if exist "%WS_PATH%" (
rd /S /Q "%WS_PATH%"
)
del %REPORT_FILE%
del "%REPORT_FILE%"
md "%REPORT_FILE_PATH%"
echo Prepare project for validation...
IF exist "%CONFIG_PATH%\src\Configuration\Configuration.mdo" (
IF exist "%CONFIG_PATH%\DT-INF\" (
set VALIDATE_PATH=%CONFIG_PATH%
) else (
IF exist "%CONFIG_PATH%\Configuration.xml" (
set CLEAN_AFTER_VALIDATION=1
IF exist "%CONFIG_PATH%\Configuration.xml" (
call %~dp0xml2edt.cmd "%CONFIG_PATH%" "%VALIDATE_PATH%"
) else (
set CLEAN_AFTER_VALIDATION=1
call %~dp0cf2edt.cmd "%CONFIG_PATH%" "%VALIDATE_PATH%"
)
)