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

refactor: Путь к каталогу программ определяется через переменную среды %PROGRAMW6432%.

Browse Source
This commit is contained in:
ArKuznetsov 2024-10-08 10:44:48 +03:00
parent a1cdfd3bac
commit 492d3cdc3d
19 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/apply_ib.cmd
View File

@ -61,13 +61,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
IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
IF not defined V8_TOOL set V8_TOOL="%PROGRAMW6432%\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
)
IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe"
IF not defined IBCMD_TOOL set IBCMD_TOOL="%PROGRAMW6432%\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

4
examples/create_ib.cmd
View File

@ -40,14 +40,14 @@ IF /i "%V8_SRC_TYPE%" equ "edt" (
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"
IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
IF not defined V8_TOOL set V8_TOOL="%PROGRAMW6432%\1cv8\%V8_VERSION%\bin\1cv8.exe"
echo START: %date% %time%
ECHO "Create database %V8_IB_NAME% "
sqlcmd -S %V8_DB_SRV_ADDR% -U %V8_DB_SRV_USR% -P %V8_DB_SRV_PWD% -d master -Q %QUERY%
timeout 10
timeout /t 10 /nobreak
ECHO "[INFO] CREATE INFOBASE ON %V8_SRV_ADDR%:%V8_SRV_CLUSTER_PORT% WITH NAME %V8_IB_NAME%"
%V8_TOOL% CREATEINFOBASE Srvr="%V8_SRV_ADDR%:%V8_SRV_CLUSTER_PORT%";Ref="%V8_IB_NAME%";DBMS="mssqlserver";DBSrvr="%V8_DB_SRV_ADDR%";DB="%V8_IB_NAME%";DBUID="%V8_DB_SRV_USR%";DBPwd="%V8_DB_SRV_PWD%";LicDstr="Y";CrSQLDB="N";SchJobDn="Y";

2
examples/readme.md
View File

@ -353,7 +353,7 @@ commit.cmd "Username" "user@example.com" "2023-11-23 12:00:00" "Сообщени
Переменные среды:
- `SONAR_SCANNER` - путь к утилите `sonar-scanner` (по умолчанию ищется в переменной среды `PATH` и по пути `C:\Program Files\sonar-scanner\bin\sonar-scanner.bat`)
- `SONAR_SCANNER` - путь к утилите `sonar-scanner` (по умолчанию ищется в переменной среды `PATH` и по пути `%PROGRAMW6432%\sonar-scanner\bin\sonar-scanner.bat`)
- `SONAR_SCANNER_DATE` - дата выполнения проверки
- `SONAR_HOST_URL` - адрес сервера SonarQube
- `SONAR_TOKEN` - токен доступа к серверу SonarQube

4
examples/src2ib.cmd
View File

@ -133,13 +133,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
IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
IF not defined V8_TOOL set V8_TOOL="%PROGRAMW6432%\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
)
IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe"
IF not defined IBCMD_TOOL set IBCMD_TOOL="%PROGRAMW6432%\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

4
examples/upd_ib.cmd
View File

@ -80,13 +80,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
IF not defined V8_TOOL set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
IF not defined V8_TOOL set V8_TOOL="%PROGRAMW6432%\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
)
IF not defined IBCMD_TOOL set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe"
IF not defined IBCMD_TOOL set IBCMD_TOOL="%PROGRAMW6432%\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

4
tests/after/01_test_srv_ib_delete.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Delete test server infobase..."
set TEST_OUT_PATH=%TEST_IB%
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
echo ===
@ -81,4 +81,4 @@ for /f "tokens=2 delims==:" %%i in (' "%tasks_ragent%" ') do (
if "!cur_ragent_pid_isnew!" equ "1" taskkill /PID !cur_ragent_pid! /T /F
)
timeout /T 10
timeout /t 10 /nobreak

6
tests/before/08_test_srv_ib.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Prepare test server infobase..."
set TEST_OUT_PATH=%TEST_IB%
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set IBCMD_TOOL="%V8_PATH%\ibcmd.exe"
set RAC_TOOL="%V8_PATH%\rac.exe"
@ -26,6 +26,8 @@ set pids_ragent=%pids_ragent: =%
start /D "%V8_PATH%" ragent.exe -agent -regport %V8_SRV_REG_PORT% -port %V8_SRV_AGENT_PORT% -range %V8_SRV_PORT_RANGE% -d "%V8_TEMP%\srvinfo%V8_SRV_REG_PORT%"
timeout /t 10 /nobreak
echo [INFO] Starting RAS service
set "tasks_ras=tasklist /fi "imagename eq ras.exe" /fo "list" | findstr "PID""
@ -40,6 +42,8 @@ set pids_ras=%pids_ras: =%
start /D "%V8_PATH%" ras.exe cluster --port=%V8_RAS_PORT% %V8_SRV_ADDR%:%V8_SRV_AGENT_PORT%
timeout /t 10 /nobreak
echo [INFO] Looking for 1C cluster
set "command_rac=%RAC_TOOL% localhost:%V8_RAS_PORT% cluster list"

2
tests/tests/115_conf2ib_srv_bin2ib_load_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf CF -> load to server infobase (ibcmd)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\Catalogs\Контрагенты.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=ibcmd

2
tests/tests/116_conf2ib_srv_bin2ib_load_d.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf CF -> load to server infobase (designer)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\Catalogs\Контрагенты.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=designer

2
tests/tests/125_conf2ib_srv_xml2ib_load_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf XML -> load to server infobase (ibcmd)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\Catalogs\Контрагенты.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=ibcmd

2
tests/tests/126_conf2ib_srv_xml2ib_load_d.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf XML -> load to server infobase (designer)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\Catalogs\Контрагенты.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=designer

4
tests/tests/127_conf2ib_designer_running_xml2ib_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf XML -> load to server infobase (ibcmd) with designer running
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\Catalogs\Контрагенты.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=ibcmd
@ -79,7 +79,7 @@ for /f "tokens=2 delims==:" %%i in (' "%tasks_1c%" ') do (
set pids_1c=%pids_1c: =%
start /D "%V8_PATH%" 1cv8.exe DESIGNER /IBConnectionString Srvr="%V8_SRV_ADDR%";Ref="%TMP_IB_NAME%"; /DisableStartupDialogs
timeout /T 5
timeout /t 5 /nobreak
call %SCRIPTS_PATH%\conf2ib.cmd "%TEST_XML_CF%" "/S%V8_DB_SRV_ADDR%\%TMP_IB_NAME%"

4
tests/tests/147_conf2cf_designer_running_ib2bin_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf server infobase -> CF (ibcmd) with designer running"
set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set V8_CONVERT_TOOL=ibcmd
echo ===
@ -24,7 +24,7 @@ for /f "tokens=2 delims==:" %%i in (' "%tasks_1c%" ') do (
set pids_1c=%pids_1c: =%
start /D "%V8_PATH%" 1cv8.exe DESIGNER /IBConnectionString Srvr="%V8_SRV_ADDR%";Ref="%V8_IB_NAME%"; /DisableStartupDialogs
timeout /T 5
timeout /t 5 /nobreak
call %SCRIPTS_PATH%\conf2cf.cmd "/S%V8_DB_SRV_ADDR%\%V8_IB_NAME%" "%TEST_OUT_PATH%"

4
tests/tests/148_conf2xml_designer_running_ib2xml_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Conf srerver infobase -> XML (ibcmd) with designer running"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\Configuration.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set V8_CONVERT_TOOL=ibcmd
echo ===
@ -24,7 +24,7 @@ for /f "tokens=2 delims==:" %%i in (' "%tasks_1c%" ') do (
set pids_1c=%pids_1c: =%
start /D "%V8_PATH%" 1cv8.exe DESIGNER /IBConnectionString Srvr="%V8_SRV_ADDR%";Ref="%V8_IB_NAME%"; /DisableStartupDialogs
timeout /T 5
timeout /t 5 /nobreak
call %SCRIPTS_PATH%\conf2xml.cmd "/S%V8_DB_SRV_ADDR%\%V8_IB_NAME%" "%TEST_OUT_PATH%"

2
tests/tests/313_ext2ib_srv_bin2ib_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Ext CFE -> load to server infobase (ibcmd)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\DataProcessors\Расш1_Обработка1.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=ibcmd

2
tests/tests/314_exl2ib_srv_bin2ib_d.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Ext CFE -> load to server infobase (designer)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\DataProcessors\Расш1_Обработка1.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=designer

2
tests/tests/321_ext2ib_srv_xml2ib_i.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Ext XML -> load to server infobase (ibcmd)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\DataProcessors\Расш1_Обработка2.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=ibcmd

2
tests/tests/322_ext2ib_srv_xml2ib_d.cmd
View File

@ -4,7 +4,7 @@ set TEST_NAME="Ext XML -> load to server infobase (designer)"
set TEST_OUT_PATH=%OUT_PATH%\%~n0
set TEST_OUT_PATH=%TEST_OUT_PATH: =_%
set TEST_CHECK_PATH=%TEST_OUT_PATH%\DataProcessors\Расш1_Обработка2.xml
set V8_PATH=C:\Program Files\1cv8\%V8_VERSION%\bin
set V8_PATH=%PROGRAMW6432%\1cv8\%V8_VERSION%\bin
set RAC_TOOL="%V8_PATH%\rac.exe"
set V8_CONVERT_TOOL=designer

2
tests/tests/511_dp2xml_watchman.cmd
View File

@ -21,7 +21,7 @@ call %SCRIPTS_PATH%\..\wmscripts\settrigger.cmd "Test_dp2xml" "%TEST_OUT_PATH%"
copy /D /Y "%TEST_BINARY%\*.epf" /B "%TEST_OUT_PATH%\ext"
copy /D /Y "%TEST_BINARY%\*.erf" /B "%TEST_OUT_PATH%\ext"
timeout /T 10
timeout /t 10 /nobreak
watchman trigger-del "%TEST_OUT_PATH%" Test_dp2xml
watchman watch-del "%TEST_OUT_PATH%"