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

fix: Убрано сообщение об ошибке поиска утилиты ring для случаев когда в ней нет необходимости.

Browse Source
This commit is contained in:
Artem Kuznetsov 2023-10-03 19:19:10 +03:00
parent 1f07ff6101
commit 84dfd2575d
11 changed files with 108 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/conf2cf.cmd
View File

@ -45,15 +45,6 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -145,6 +136,15 @@ 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 (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
:export_xml

19
scripts/conf2edt.cmd
View File

@ -44,15 +44,7 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
echo Could not find ibcmd tool with path %IBCMD_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -173,6 +165,15 @@ IF "%V8_CONVERT_TOOL%" equ "designer" (
md "%WS_PATH%"
echo [INFO] Export configuration from "%XML_PATH%" to 1C:EDT format "%V8_DST_PATH%"...
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
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%"
echo [INFO] Clear temporary files...

19
scripts/conf2ib.cmd
View File

@ -44,15 +44,7 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
echo Could not find ibcmd tool with path %IBCMD_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -171,6 +163,15 @@ 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 (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
:export_xml

19
scripts/conf2xml.cmd
View File

@ -44,15 +44,7 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
echo Could not find ibcmd tool with path %IBCMD_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -171,6 +163,15 @@ echo [INFO] Export "%V8_SRC_PATH%" to 1C:Designer XML format "%V8_DST_PATH%"...
md "%WS_PATH%"
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%"
:end

19
scripts/dp2edt.cmd
View File

@ -38,15 +38,7 @@ IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% (
echo Could not find 1C:Designer with path %V8_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -204,6 +196,15 @@ 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 (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
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%"
echo [INFO] Clear temporary files...

19
scripts/dp2epf.cmd
View File

@ -38,15 +38,7 @@ IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% (
echo Could not find 1C:Designer with path %V8_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -190,6 +182,15 @@ 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 (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
:export_xml

19
scripts/dp2xml.cmd
View File

@ -38,15 +38,7 @@ IF "%V8_CONVERT_TOOL%" equ "designer" IF not exist %V8_TOOL% (
echo Could not find 1C:Designer with path %V8_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -200,6 +192,15 @@ echo [INFO] Export dataprocessors ^& reports from 1C:EDT project "%V8_SRC_PATH%"
md "%WS_PATH%"
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%"
:end

18
scripts/edt-validate.cmd
View File

@ -33,15 +33,6 @@ 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%"
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -135,6 +126,15 @@ echo [INFO] Run validation in "%VALIDATE_PATH%"...
md "%WS_PATH%"
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace validate --project-list "%VALIDATE_PATH%" --workspace-location "%WS_PATH%" --file "%REPORT_FILE%"
echo [INFO] Clear temporary files...

19
scripts/ext2cfe.cmd
View File

@ -44,15 +44,7 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
echo Could not find ibcmd tool with path %IBCMD_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -195,6 +187,15 @@ exit /b 1
: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 (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
:export_xml

19
scripts/ext2edt.cmd
View File

@ -44,15 +44,7 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
echo Could not find ibcmd tool with path %IBCMD_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -219,6 +211,15 @@ echo [INFO] Export configuration extension from 1C:Designer XML format "%XML_PAT
md %WS_PATH%
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
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%"
echo [INFO] Clear temporary files...

19
scripts/ext2xml.cmd
View File

@ -44,15 +44,7 @@ IF "%V8_CONVERT_TOOL%" equ "ibcmd" IF not exist %IBCMD_TOOL% (
echo Could not find ibcmd tool with path %IBCMD_TOOL%
exit /b 1
)
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
set ERROR_CODE=1
)
IF defined V8_EDT_VERSION (
set V8_EDT_VERSION=@%V8_EDT_VERSION:@=%
)
@ -218,6 +210,15 @@ echo [INFO] Export configuration extension from 1C:EDT format "%V8_SRC_PATH%" to
md "%WS_PATH%"
IF not defined V8_RING_TOOL (
FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
set V8_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
exit /b 0
)
call %V8_RING_TOOL% edt%V8_EDT_VERSION% workspace export --project "%V8_SRC_PATH%" --configuration-files "%V8_DST_PATH%" --workspace-location "%WS_PATH%"
:end