From 47801e1123d7477108b060edddbc201ce490b8c5 Mon Sep 17 00:00:00 2001 From: Artem Kuznetsov Date: Tue, 5 Mar 2024 17:05:47 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=83=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=201=D0=A1:=D0=9F?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=BF=D1=80=D0=B8=D1=8F=D1=82=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B8=20ibcmd=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BE=D0=BA?= =?UTF-8?q?=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20V8=5FTOOL=20=D0=B8?= =?UTF-8?q?=20IBCMD=5FTOOL=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/create_ib.cmd | 2 +- examples/upd_ib.cmd | 4 ++-- examples/xml2ib.cmd | 4 ++-- scripts/conf2cf.cmd | 14 +++++++------- scripts/conf2edt.cmd | 14 +++++++------- scripts/conf2ib.cmd | 14 +++++++------- scripts/conf2xml.cmd | 14 +++++++------- scripts/dp2edt.cmd | 12 ++++++------ scripts/dp2epf.cmd | 12 ++++++------ scripts/dp2xml.cmd | 12 ++++++------ scripts/edt-validate.cmd | 10 +++++----- scripts/ext2cfe.cmd | 14 +++++++------- scripts/ext2edt.cmd | 14 +++++++------- scripts/ext2ib.cmd | 14 +++++++------- scripts/ext2xml.cmd | 14 +++++++------- 15 files changed, 84 insertions(+), 84 deletions(-) diff --git a/examples/create_ib.cmd b/examples/create_ib.cmd index a52daf0..dd7e12c 100644 --- a/examples/create_ib.cmd +++ b/examples/create_ib.cmd @@ -35,7 +35,7 @@ IF exist "%REPO_PATH%\.env" ( SET QUERY="RESTORE DATABASE [%V8_IB_NAME%] FROM DISK = N'D:\SQL.Template\%V8_IB_TEMPLATE%.bak' WITH FILE = 1, MOVE N'Temlate_ERP_2_5_12' TO N'D:\SQL.Data\%V8_IB_NAME%.mdf', MOVE N'Temlate_ERP_2_5_12_log' TO N'D:\SQL.Log\%V8_IB_NAME%_log.ldf', NOUNLOAD, REPLACE, STATS = 5" -SET V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" echo START: %date% %time% diff --git a/examples/upd_ib.cmd b/examples/upd_ib.cmd index d4f3092..26ab48c 100644 --- a/examples/upd_ib.cmd +++ b/examples/upd_ib.cmd @@ -71,13 +71,13 @@ set V8_CONNECTION_STRING="/S%V8_DB_SRV_ADDR%\%V8_IB_NAME%" IF /i "%V8_CONVERT_TOOL%" equ "designer" set V8_CONNECTION_STRING="/S%V8_SRV_ADDR%\%V8_IB_NAME%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo [ERROR] Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo [ERROR] Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 diff --git a/examples/xml2ib.cmd b/examples/xml2ib.cmd index 41047c5..1cca072 100644 --- a/examples/xml2ib.cmd +++ b/examples/xml2ib.cmd @@ -75,13 +75,13 @@ set V8_CONNECTION_STRING="/S%V8_DB_SRV_ADDR%\%V8_IB_NAME%" IF /i "%V8_CONVERT_TOOL%" equ "designer" set V8_CONNECTION_STRING="/S%V8_SRV_ADDR%\%V8_IB_NAME%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo [ERROR] Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo [ERROR] Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 diff --git a/scripts/conf2cf.cmd b/scripts/conf2cf.cmd index ce32c23..0f83c92 100644 --- a/scripts/conf2cf.cmd +++ b/scripts/conf2cf.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -143,17 +143,17 @@ IF not exist "%XML_PATH%" md "%XML_PATH%" md "%WS_PATH%" echo [INFO] Export "%V8_SRC_PATH%" to 1C:Designer XML format "%XML_PATH%"... -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" IF not ERRORLEVEL 0 ( set ERROR_CODE=%ERRORLEVEL% goto finally diff --git a/scripts/conf2edt.cmd b/scripts/conf2edt.cmd index 4112d94..b53b5ee 100644 --- a/scripts/conf2edt.cmd +++ b/scripts/conf2edt.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -187,17 +187,17 @@ IF not ERRORLEVEL 0 ( md "%WS_PATH%" echo [INFO] Export configuration from "%XML_PATH%" to 1C:EDT format "%V8_DST_PATH%"... -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace import --project "%V8_DST_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace import --project "%V8_DST_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%" set ERROR_CODE=%ERRORLEVEL% :finally diff --git a/scripts/conf2ib.cmd b/scripts/conf2ib.cmd index 804a3d9..f792832 100644 --- a/scripts/conf2ib.cmd +++ b/scripts/conf2ib.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -171,17 +171,17 @@ echo [INFO] Export "%V8_SRC_PATH%" to 1C:Designer XML format "%XML_PATH%"... md "%XML_PATH%" md "%WS_PATH%" -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" IF not ERRORLEVEL 0 ( set ERROR_CODE=%ERRORLEVEL% goto finally diff --git a/scripts/conf2xml.cmd b/scripts/conf2xml.cmd index c66479b..79185f6 100644 --- a/scripts/conf2xml.cmd +++ b/scripts/conf2xml.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -179,17 +179,17 @@ echo [INFO] Export "%V8_SRC_PATH%" to 1C:Designer XML format "%V8_DST_PATH%"... md "%WS_PATH%" -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%" set ERROR_CODE=%ERRORLEVEL% :finally diff --git a/scripts/dp2edt.cmd b/scripts/dp2edt.cmd index 5707732..1e3e12b 100644 --- a/scripts/dp2edt.cmd +++ b/scripts/dp2edt.cmd @@ -36,7 +36,7 @@ IF not defined V8_TEMP set V8_TEMP=%TEMP%\1c echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 @@ -212,17 +212,17 @@ FOR /F "delims=" %%f IN ('dir /b /a-d %V8_SRC_MASK%') DO ( md "%WS_PATH%" echo [INFO] Export dataprocessors ^& reports from 1C:Designer XML format "%XML_PATH%" to 1C:EDT format "%V8_DST_PATH%"... -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace import --project "%V8_DST_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace import --project "%V8_DST_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%" set ERROR_CODE=%ERRORLEVEL% :finally diff --git a/scripts/dp2epf.cmd b/scripts/dp2epf.cmd index 9784d90..951d43d 100644 --- a/scripts/dp2epf.cmd +++ b/scripts/dp2epf.cmd @@ -36,7 +36,7 @@ IF not defined V8_TEMP set V8_TEMP=%TEMP%\1c echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 @@ -192,17 +192,17 @@ echo [INFO] Export external data processors ^& reports from 1C:EDT format "%V8_S md "%XML_PATH%" md "%WS_PATH%" -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" IF not ERRORLEVEL 0 ( set ERROR_CODE=%ERRORLEVEL% goto finally diff --git a/scripts/dp2xml.cmd b/scripts/dp2xml.cmd index d45dc79..ceedd19 100644 --- a/scripts/dp2xml.cmd +++ b/scripts/dp2xml.cmd @@ -36,7 +36,7 @@ IF not defined V8_TEMP set V8_TEMP=%TEMP%\1c echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 @@ -206,17 +206,17 @@ echo [INFO] Export dataprocessors ^& reports from 1C:EDT project "%V8_SRC_PATH%" md "%WS_PATH%" -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%" IF not ERRORLEVEL 0 ( set ERROR_CODE=%ERRORLEVEL% ) diff --git a/scripts/edt-validate.cmd b/scripts/edt-validate.cmd index 701d516..3a22aa5 100644 --- a/scripts/edt-validate.cmd +++ b/scripts/edt-validate.cmd @@ -130,17 +130,17 @@ echo [INFO] Run validation in "%VALIDATE_PATH%"... md "%WS_PATH%" -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace validate --project-list "%VALIDATE_PATH%" --workspace-location "%WS_PATH%" --file "%REPORT_FILE%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace validate --project-list "%VALIDATE_PATH%" --workspace-location "%WS_PATH%" --file "%REPORT_FILE%" set ERROR_CODE=%ERRORLEVEL% :finally diff --git a/scripts/ext2cfe.cmd b/scripts/ext2cfe.cmd index 45402b7..74d5054 100644 --- a/scripts/ext2cfe.cmd +++ b/scripts/ext2cfe.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -224,17 +224,17 @@ if "%V8_SRC_TYPE%" equ "edt" ( :export_edt echo [INFO] Export configuration extension from 1C:EDT format "%V8_SRC_PATH%" to 1C:Designer XML format "%XML_PATH%"... -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" IF not ERRORLEVEL 0 ( set ERROR_CODE=%ERRORLEVEL% goto finally diff --git a/scripts/ext2edt.cmd b/scripts/ext2edt.cmd index c440a4d..5b3aa7e 100644 --- a/scripts/ext2edt.cmd +++ b/scripts/ext2edt.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -262,17 +262,17 @@ echo [INFO] Export configuration extension from 1C:Designer XML format "%XML_PAT md %WS_PATH% -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace import --project "%V8_DST_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace import --project "%V8_DST_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%" set ERROR_CODE=%ERRORLEVEL% :finally diff --git a/scripts/ext2ib.cmd b/scripts/ext2ib.cmd index e5812db..fa4e69b 100644 --- a/scripts/ext2ib.cmd +++ b/scripts/ext2ib.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -172,17 +172,17 @@ goto finally :export_edt echo [INFO] Export configuration extension from 1C:EDT format "%V8_SRC_PATH%" to 1C:Designer XML format "%XML_PATH%"... -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" IF not ERRORLEVEL 0 ( set ERROR_CODE=%ERRORLEVEL% goto finally diff --git a/scripts/ext2xml.cmd b/scripts/ext2xml.cmd index e3e4607..4d8eae8 100644 --- a/scripts/ext2xml.cmd +++ b/scripts/ext2xml.cmd @@ -37,13 +37,13 @@ echo [INFO] Using 1C:Enterprise, version %V8_VERSION% echo [INFO] Using temporary folder "%V8_TEMP%" IF not "%V8_CONVERT_TOOL%" equ "designer" IF not "%V8_CONVERT_TOOL%" equ "ibcmd" set V8_CONVERT_TOOL=designer -set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" +IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe" IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% ( echo Could not find 1C:Designer with path %V8_TOOL% set ERROR_CODE=1 goto finally ) -set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" +IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe" IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% ( echo Could not find ibcmd tool with path %IBCMD_TOOL% set ERROR_CODE=1 @@ -258,17 +258,17 @@ echo [INFO] Export configuration extension from 1C:EDT format "%V8_SRC_PATH%" to md "%WS_PATH%" -IF not defined V8_RING_TOOL ( +IF not defined RING_TOOL ( FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO ( - set V8_RING_TOOL="%%i" + set RING_TOOL="%%i" ) ) -IF not defined V8_RING_TOOL ( - echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "V8_RING_TOOL" variable with full specified path +IF not defined RING_TOOL ( + echo [ERROR] Can't find "ring" tool. Add path to "ring.bat" to "PATH" environment variable, or set "RING_TOOL" variable with full specified path set ERROR_CODE=1 goto finally ) -call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%" +call %RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%" set ERROR_CODE=%ERRORLEVEL% :finally