diff --git a/scripts/conf2cf.cmd b/scripts/conf2cf.cmd index 8875aad..aa97493 100644 --- a/scripts/conf2cf.cmd +++ b/scripts/conf2cf.cmd @@ -14,7 +14,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C configuration to 1C configuration file ^(*.cf^) set ERROR_CODE=0 @@ -52,6 +52,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "%V8_CONVERT_TOOL%" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set XML_PATH=%LOCAL_TEMP%\tmp_xml @@ -76,7 +78,7 @@ IF not defined V8_DST_PATH ( ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to 1C configuration source ^(infobase, 1C:Designer XML files or 1C:EDT project^) echo %%2 - path to 1C configuration file ^(*.cf^) diff --git a/scripts/conf2edt.cmd b/scripts/conf2edt.cmd index bbbe765..3053fb5 100644 --- a/scripts/conf2edt.cmd +++ b/scripts/conf2edt.cmd @@ -14,7 +14,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C configuration to 1C:EDT project set ERROR_CODE=0 @@ -51,6 +51,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "%V8_CONVERT_TOOL%" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set XML_PATH=%LOCAL_TEMP%\tmp_xml @@ -72,7 +74,7 @@ IF not defined V8_DST_PATH ( set ERROR_CODE=1 ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to 1C configuration source ^(1C configuration file ^(*.cf^), infobase or 1C:Designer XML files^) echo %%2 - path to folder to save configuration files in 1C:EDT project format diff --git a/scripts/conf2xml.cmd b/scripts/conf2xml.cmd index 116e6ce..f9c3cc6 100644 --- a/scripts/conf2xml.cmd +++ b/scripts/conf2xml.cmd @@ -14,7 +14,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C configuration to 1C:Designer XML format set ERROR_CODE=0 @@ -51,6 +51,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "%V8_CONVERT_TOOL%" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set WS_PATH=%LOCAL_TEMP%\edt_ws @@ -71,7 +73,7 @@ IF not defined V8_DST_PATH ( set ERROR_CODE=1 ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to 1C configuration source ^(1C configuration file ^(*.cf^), infobase or 1C:EDT project^) echo %%2 - path to folder to save configuration files in 1C:Designer XML format diff --git a/scripts/dp2edt.cmd b/scripts/dp2edt.cmd index 73a3ecf..5694707 100644 --- a/scripts/dp2edt.cmd +++ b/scripts/dp2edt.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C external data processors ^& reports to 1C:EDT project set ERROR_CODE=0 @@ -45,6 +45,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "designer" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set XML_PATH=%LOCAL_TEMP%\tmp_xml @@ -85,7 +87,7 @@ IF defined V8_BASE_CONFIG ( set V8_BASE_CONFIG= ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to folder containing data processors ^(*.epf^) ^& reports ^(*.erf^) in binary or XML format echo or path to binary data processor ^(*.epf^) or report ^(*.erf^) diff --git a/scripts/dp2epf.cmd b/scripts/dp2epf.cmd index 68b0e19..62fd4bc 100644 --- a/scripts/dp2epf.cmd +++ b/scripts/dp2epf.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C external data processors ^& reports to binary format ^(*.epf, *.erf^) set ERROR_CODE=0 @@ -45,6 +45,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "designer" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set XML_PATH=%LOCAL_TEMP%\tmp_xml @@ -85,7 +87,7 @@ IF defined V8_BASE_CONFIG ( set V8_BASE_CONFIG= ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to folder contains 1C data processors ^& reports in 1C:Designer XML format or EDT format echo or path to main xml-file of data processor or report diff --git a/scripts/dp2xml.cmd b/scripts/dp2xml.cmd index 9fbd6a1..8e0e574 100644 --- a/scripts/dp2xml.cmd +++ b/scripts/dp2xml.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C external data processors ^& reports to 1C:Designer XML format set ERROR_CODE=0 @@ -45,6 +45,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "designer" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set WS_PATH=%LOCAL_TEMP%\edt_ws @@ -84,7 +86,7 @@ IF defined V8_BASE_CONFIG ( set V8_BASE_CONFIG= ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to folder containing data processors ^(*.epf^) ^& reports ^(*.erf^) in binary or EDT project echo or path to binary data processor ^(*.epf^) or report ^(*.erf^) diff --git a/scripts/edt-validate.cmd b/scripts/edt-validate.cmd index 1b41bd3..dab81d6 100644 --- a/scripts/edt-validate.cmd +++ b/scripts/edt-validate.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Validate 1C configuration, extension, external data processors ^& reports using 1C:EDT ^(using ring tool^) set ERROR_CODE=0 @@ -66,7 +66,7 @@ IF not defined REPORT_FILE ( set ERROR_CODE=1 ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to 1C configuration, extension, data processors or reports ^(binary ^(*.cf, *.cfe, *.epf, *.erf^), 1C:Designer XML format or 1C:EDT project^) echo %%2 - path to validation report file diff --git a/scripts/ext2cfe.cmd b/scripts/ext2cfe.cmd index 1b3a59c..ef78775 100644 --- a/scripts/ext2cfe.cmd +++ b/scripts/ext2cfe.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C configuration extension to binary format ^(*.cfe^) set ERROR_CODE=0 @@ -51,6 +51,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "%V8_CONVERT_TOOL%" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set XML_PATH=%LOCAL_TEMP%\tmp_xml @@ -98,7 +100,7 @@ IF defined V8_BASE_CONFIG ( set V8_BASE_CONFIG= ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to folder contains 1C extension in 1C:Designer XML format or EDT project echo %%2 - path to 1C configuration extension file ^(*.cfe^) diff --git a/scripts/ext2edt.cmd b/scripts/ext2edt.cmd index 73fd67c..418cb71 100644 --- a/scripts/ext2edt.cmd +++ b/scripts/ext2edt.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C configuration extension to 1C:EDT project set ERROR_CODE=0 @@ -51,6 +51,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "%V8_CONVERT_TOOL%" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set XML_PATH=%LOCAL_TEMP%\tmp_xml @@ -96,7 +98,7 @@ IF defined V8_BASE_CONFIG ( set V8_BASE_CONFIG= ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to folder contains 1C extension binary file ^(*.cfe^) or in 1C:Designer XML format echo %%2 - path to folder to save configuration extension in 1C:EDT project format diff --git a/scripts/ext2xml.cmd b/scripts/ext2xml.cmd index 846ef90..833447b 100644 --- a/scripts/ext2xml.cmd +++ b/scripts/ext2xml.cmd @@ -14,7 +14,7 @@ SETLOCAL set CONVERT_VERSION=UNKNOWN IF exist "%~dp0..\VERSION" FOR /F "usebackq tokens=* delims=" %%i IN ("%~dp0..\VERSION") DO set CONVERT_VERSION=%%i echo 1C files converter v.%CONVERT_VERSION% -echo === +echo ====== echo Convert 1C configuration extension to 1C:Designer XML format set ERROR_CODE=0 @@ -51,6 +51,8 @@ IF not defined V8_RING_TOOL ( set ERROR_CODE=1 ) +echo [INFO] Start conversion using "%V8_CONVERT_TOOL%" + set LOCAL_TEMP=%V8_TEMP%\%~n0 set IB_PATH=%LOCAL_TEMP%\tmp_db set WS_PATH=%LOCAL_TEMP%\edt_ws @@ -95,7 +97,7 @@ IF defined V8_BASE_CONFIG ( set V8_BASE_CONFIG= ) IF %ERROR_CODE% neq 0 ( - echo === + echo ====== echo [ERROR] Input parameters error. Expected: echo %%1 - path to folder contains 1C extension binary file ^(*.cfe^) or EDT project echo %%2 - path to folder to save configuration extension files in 1C:Designer XML format diff --git a/tests/tests/421_edt-validate-dp.cmd b/tests/tests/421_edt-validate-dp.cmd index a3b0275..2d58f5f 100644 --- a/tests/tests/421_edt-validate-dp.cmd +++ b/tests/tests/421_edt-validate-dp.cmd @@ -1,6 +1,6 @@ @ECHO OFF -set TEST_NAME="Validate data processors & reports" +set TEST_NAME="Validate data processors & reports (EDT)" set TEST_OUT_PATH=%OUT_PATH%\%~n0\report.txt set TEST_OUT_PATH=%TEST_OUT_PATH: =_% set TEST_CHECK_PATH=%TEST_OUT_PATH% diff --git a/tests/tests/431_edt-validate-ext.cmd b/tests/tests/431_edt-validate-ext.cmd index 9351b80..0ee84ac 100644 --- a/tests/tests/431_edt-validate-ext.cmd +++ b/tests/tests/431_edt-validate-ext.cmd @@ -1,6 +1,6 @@ @ECHO OFF -set TEST_NAME="Validate configuration extension" +set TEST_NAME="Validate configuration extension (EDT)" set TEST_EXT_NAME=Расширение1 set TEST_OUT_PATH=%OUT_PATH%\%~n0\report.txt set TEST_OUT_PATH=%TEST_OUT_PATH: =_% diff --git a/tests/tests/441_edt-validate-file-ib.cmd b/tests/tests/441_edt-validate-file-ib.cmd index c15858f..12122a9 100644 --- a/tests/tests/441_edt-validate-file-ib.cmd +++ b/tests/tests/441_edt-validate-file-ib.cmd @@ -1,6 +1,6 @@ @ECHO OFF -set TEST_NAME="Validate configuration extension" +set TEST_NAME="Validate configuration from file infobase" set TEST_EXT_NAME=Расширение1 set TEST_OUT_PATH=%OUT_PATH%\%~n0\report.txt set TEST_OUT_PATH=%TEST_OUT_PATH: =_% diff --git a/tests/tests/451_edt-validate-srv-ib.cmd b/tests/tests/451_edt-validate-srv-ib.cmd index 9c51314..99d8470 100644 --- a/tests/tests/451_edt-validate-srv-ib.cmd +++ b/tests/tests/451_edt-validate-srv-ib.cmd @@ -1,6 +1,6 @@ @ECHO OFF -set TEST_NAME="Validate configuration extension" +set TEST_NAME="Validate configuration from server infobase" set TEST_EXT_NAME=Расширение1 set TEST_OUT_PATH=%OUT_PATH%\%~n0\report.txt set TEST_OUT_PATH=%TEST_OUT_PATH: =_%