From 0097ba075c142d392c4b54804cfd274e734732a0 Mon Sep 17 00:00:00 2001 From: Maximov Valery Date: Tue, 19 May 2020 09:22:53 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BC=D1=83=D1=81=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- updateFixtures.bat | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 updateFixtures.bat diff --git a/updateFixtures.bat b/updateFixtures.bat deleted file mode 100644 index 30ff1c6..0000000 --- a/updateFixtures.bat +++ /dev/null @@ -1,7 +0,0 @@ -IF EXIST tests\common-fixtures ( -cd tests\common-fixtures -git pull origin -cd ..\.. -) ELSE ( -git clone --branch develop --single-branch git@gitlab.dellin.ru:orais/tools/fixtures.git tests\common-fixtures -) From a48e65d50962d4c7bb17f207c3dd84d781c4946b Mon Sep 17 00:00:00 2001 From: theshadowco Date: Mon, 29 Mar 2021 10:52:05 +0300 Subject: [PATCH 2/2] fix --- installlocalhost.bat | 0 installlocalhost.sh | 12 ++++++++++++ packagedef | 4 ++-- ...0\276\320\264\321\203\320\272\321\202\320\260.os" | 2 +- tests/common-fixtures | 1 - 5 files changed, 15 insertions(+), 4 deletions(-) mode change 100644 => 100755 installlocalhost.bat create mode 100755 installlocalhost.sh delete mode 160000 tests/common-fixtures diff --git a/installlocalhost.bat b/installlocalhost.bat old mode 100644 new mode 100755 diff --git a/installlocalhost.sh b/installlocalhost.sh new file mode 100755 index 0000000..80cb5d1 --- /dev/null +++ b/installlocalhost.sh @@ -0,0 +1,12 @@ +#!/bin/bash +rm "*.ospx" + +result=$(oscript -version) + +if [[ $result = "1.0.19.105" ]]; then + opm build . -mf ./packagedef -out . +else + opm build -m ./packagedef -o . +fi + +opm install -f *.ospx diff --git a/packagedef b/packagedef index 83f25d6..65e6d70 100644 --- a/packagedef +++ b/packagedef @@ -6,8 +6,8 @@ Описание.Имя(ИмяПродукта) .ВерсияСреды("1.0.21") .Версия(ПараметрыСистемы_ЛокальнаяВерсия.ВерсияПродукта()) - .ЗависитОт("logos", "1.2.1") - .ЗависитОт("fs", "1.0.0") + .ЗависитОт("logos", "1.3.0") + .ЗависитОт("fs", "1.1.0") .ВключитьФайл("src") .ВключитьФайл("readme.md") .ВключитьФайл("package-loader.os") diff --git "a/src/\320\234\320\276\320\264\321\203\320\273\320\270/\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213\320\237\321\200\320\276\320\264\321\203\320\272\321\202\320\260.os" "b/src/\320\234\320\276\320\264\321\203\320\273\320\270/\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213\320\237\321\200\320\276\320\264\321\203\320\272\321\202\320\260.os" index e4f84a7..a7081c7 100644 --- "a/src/\320\234\320\276\320\264\321\203\320\273\320\270/\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213\320\237\321\200\320\276\320\264\321\203\320\272\321\202\320\260.os" +++ "b/src/\320\234\320\276\320\264\321\203\320\273\320\270/\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213\320\237\321\200\320\276\320\264\321\203\320\272\321\202\320\260.os" @@ -33,7 +33,7 @@ // Функция ВерсияПродукта() Экспорт - Возврат "1.2"; + Возврат "1.3"; КонецФункции diff --git a/tests/common-fixtures b/tests/common-fixtures deleted file mode 160000 index 423f5dd..0000000 --- a/tests/common-fixtures +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 423f5ddb263eeff936a1e2aa82daba3e2a29c29e