From f7849e2bed6157ce849da897d2eb6a75c381e262 Mon Sep 17 00:00:00 2001 From: Anton Titovets Date: Wed, 19 Feb 2025 14:33:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B4=D0=B2?= =?UTF-8?q?=D0=B8=D0=B6=D0=BA=D0=B0=20=D0=B8=D0=B7=20=D1=80=D0=B5=D0=BF?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/os/releasemaker.os | 4 +++- service/iss/en.iss | 3 ++- service/iss/ru.iss | 3 ++- service/project.json | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/os/releasemaker.os b/ci/os/releasemaker.os index 6aa782b0196..fc3f4deb3c1 100644 --- a/ci/os/releasemaker.os +++ b/ci/os/releasemaker.os @@ -7,6 +7,7 @@ Перем ПутьВыгрузки; Перем Кугвин; Перем Оскрипт; +Перем ПутьДвижка; Процедура НачалоРаботы() @@ -20,6 +21,7 @@ Сервер = "AIONIOTISCORE:1742"; Кугвин = "C:\cygwin64\bin\"; ОСкрипт = "C:\Program Files\OneScript\"; + ПутьДвижка = "/cygdrive/c/engine/linux/"; ПутьКРепозиторию = "C:\ProgramData\Jenkins\.jenkins\workspace\Release"; //ПутьКРепозиторию = "C:\Repos\OPI"; @@ -240,7 +242,7 @@ + " --url ""https://openintegrations.dev/""" + " --maintainer ""Anton Titovets """ + " --verbose" - + " ../ci/installer_set/=/usr ../service/engine/linux/=/usr/share/oint/bin"; + + " ../ci/installer_set/=/usr " + ПутьДвижка + "=/usr/share/oint/bin"; СоответствиеПакетов = Новый Соответствие(); СоответствиеПакетов.Вставить("deb", "oint_" + Версия + "_all_" + Данные["Префикс"] + ".deb"); diff --git a/service/iss/en.iss b/service/iss/en.iss index 31cc8d6d3ac..d5e2eda2e32 100644 --- a/service/iss/en.iss +++ b/service/iss/en.iss @@ -4,6 +4,7 @@ #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.bat" #define Repo "C:\ProgramData\Jenkins\.jenkins\workspace\Release" +#define Engine "C:\engine" [Setup] DisableWelcomePage = no @@ -28,7 +29,7 @@ OutputBaseFilename = oint_{#MyAppVersion}_installer_en [Files] Source: "{#Repo}\ci\installer_set\*"; DestDir: "{app}"; Flags: recursesubdirs -Source: "{#Repo}\service\engine\windows\*"; DestDir: "{app}\share\oint\bin"; Flags: recursesubdirs +Source: "{#Engine}\windows\*"; DestDir: "{app}\share\oint\bin"; Flags: recursesubdirs Source: "{#Repo}\src\ru\cli\start.bat"; DestDir: "{app}" Source: "{#Repo}\Media\logo.bmp"; Flags: dontcopy Source: "{#Repo}\Media\icons\ex.ico"; DestDir: "{app}\share\oint\icons" diff --git a/service/iss/ru.iss b/service/iss/ru.iss index 442b29b0f2b..d52df02fa23 100644 --- a/service/iss/ru.iss +++ b/service/iss/ru.iss @@ -4,6 +4,7 @@ #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.bat" #define Repo "C:\ProgramData\Jenkins\.jenkins\workspace\Release" +#define Engine "C:\engine" [Setup] DisableWelcomePage = no @@ -31,7 +32,7 @@ Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" [Files] Source: "{#Repo}\ci\installer_set\*"; DestDir: "{app}"; Flags: recursesubdirs -Source: "{#Repo}\service\engine\windows\*"; DestDir: "{app}\share\oint\bin"; Flags: recursesubdirs +Source: "{#Engine}\windows\*"; DestDir: "{app}\share\oint\bin"; Flags: recursesubdirs Source: "{#Repo}\src\ru\cli\start.bat"; DestDir: "{app}" Source: "{#Repo}\Media\logo.bmp"; Flags: dontcopy Source: "{#Repo}\Media\icons\ex.ico"; DestDir: "{app}\share\oint\icons" diff --git a/service/project.json b/service/project.json index 007fef35101..e50a77586ca 100644 --- a/service/project.json +++ b/service/project.json @@ -13,6 +13,8 @@ "testValuesSrc": "./docs/ru/data/", "testsModule": "./src/ru/OInt/tests/Modules/internal/OPI_Тесты.os", "testsCheckFile": "./service/tests_set.json", +"engineLinux": "C:/engine/linux", +"engineWindows": "C:/engine/windows", "additionalLangs": [ "en" ]