Skip to content

Commit

Permalink
refactor: Переименован компонент;
Browse files Browse the repository at this point in the history
Изменены GUID;
Изменен номер версии.
  • Loading branch information
arkuznetsov committed May 25, 2022
1 parent 8eb0154 commit a224a91
Show file tree
Hide file tree
Showing 12 changed files with 266 additions and 266 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ jobs:
dotnet restore ./src
dotnet msbuild ./src -property:Configuration=Release
mkdir ./build/bin/
cp -f ./src/oscript-component/bin/Release/net452/*.dll ./build/bin/
cp -f ./src/oscript-component/bin/Release/net452/*.xml ./build/bin/
cp -f ./src/oscript-deflate/bin/Release/net452/*.dll ./build/bin/
cp -f ./src/oscript-deflate/bin/Release/net452/*.xml ./build/bin/
rm -f ./build/bin/OneScript*.* ./build/bin/ScriptEngine*.*
# Генерация документации
- name: Генерация документации
run: |
chmod +x ./build/OneScriptDocumenter/OneScriptDocumenter.exe
./build/OneScriptDocumenter/OneScriptDocumenter.exe json ./build/bin/syntaxHelp.json ./src/oscript-component/bin/Release/net452/oscript-component.dll
./build/OneScriptDocumenter/OneScriptDocumenter.exe json ./build/bin/syntaxHelp.json ./src/oscript-deflate/bin/Release/net452/oscript-deflate.dll
# Сборка пакета OneScript
- name: Сборка пакета
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
\.vscode/
src/NUnitTests/bin/
src/NUnitTests/obj/
src/oscript-component/bin/
src/oscript-component/obj/
src/oscript-deflate/bin/
src/oscript-deflate/obj/
src/TestApp/bin/
src/TestApp/obj/
test/
Expand Down
6 changes: 3 additions & 3 deletions build/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ echo %~dp0

@rd /S /Q "%~dp0bin"
@mkdir "%~dp0bin"
@xcopy %~dp0..\src\oscript-component\bin\Release\net452\*.dll %~dp0bin\
@xcopy %~dp0..\src\oscript-component\bin\Release\net452\*.xml %~dp0bin\
@xcopy %~dp0..\src\oscript-deflate\bin\Release\net452\*.dll %~dp0bin\
@xcopy %~dp0..\src\oscript-deflate\bin\Release\net452\*.xml %~dp0bin\
@del /F /Q "%~dp0bin\OneScript*.*" "%~dp0bin\ScriptEngine*.*" "%~dp0bin\DotNetZip*.*" "%~dp0bin\Newtonsoft*.*"

@"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe" curl -o "%~dp0OneScriptDocumenter.zip" https://github.com/dmpas/OneScriptDocumenter/releases/download/1.0.14/documenter.zip
@"C:\Program Files\7-Zip\7z.exe" x -o%~dp0OneScriptDocumenter -y %~dp0OneScriptDocumenter.zip
@del /F /Q "%~dp0OneScriptDocumenter*.*"

@%~dp0OneScriptDocumenter\OneScriptDocumenter.exe json %~dp0bin\syntaxHelp.json %~dp0..\src\oscript-component\bin\Release\net452\oscript-component.dll
@%~dp0OneScriptDocumenter\OneScriptDocumenter.exe json %~dp0bin\syntaxHelp.json %~dp0..\src\oscript-deflate\bin\Release\net452\oscript-deflate.dll

@rd /S /Q "%~dp0OneScriptDocumenter"

Expand Down
2 changes: 1 addition & 1 deletion build/package-loader.os
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
СтандартнаяОбработка = Ложь;
Отказ = Ложь;

ПодключитьВнешнююКомпоненту(ОбъединитьПути(КаталогБиблиотеки, "bin", "oscript-component.dll"));
ПодключитьВнешнююКомпоненту(ОбъединитьПути(КаталогБиблиотеки, "bin", "oscript-deflate.dll"));

КонецПроцедуры

2 changes: 1 addition & 1 deletion build/packagedef
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Описание
.Имя("deflator")
.Версия("0.2.0")
.Версия("0.2.1")
.Автор("Artem Kuznetsov")
.АдресАвтора("[email protected]")
.Описание("Упаковщик deflate для oscript")
Expand Down
6 changes: 3 additions & 3 deletions src/NUnitTests/NUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\oscript-component\oscript-component.csproj">
<Project>{EA173D06-CCD2-45D5-A263-DC866289517A}</Project>
<Name>oscript-component</Name>
<ProjectReference Include="..\oscript-deflate\oscript-deflate.csproj">
<Project>{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}</Project>
<Name>oscript-deflate</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/NUnitTests/Tests/external.os
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

Процедура ПередЗапускомТестов()

ПутьККомпоненте = ОбъединитьПути(ТекущийСценарий().Каталог, "src", "oscript-component", "bin");
ПутьККомпоненте = ОбъединитьПути(ПутьККомпоненте, "Debug", "net452", "oscript-component.dll");
ПутьККомпоненте = ОбъединитьПути(ТекущийСценарий().Каталог, "src", "oscript-deflate", "bin");
ПутьККомпоненте = ОбъединитьПути(ПутьККомпоненте, "Debug", "net452", "oscript-deflate.dll");

Попытка
ПодключитьВнешнююКомпоненту(ПутьККомпоненте);
Expand Down
6 changes: 3 additions & 3 deletions src/TestApp/TestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\oscript-component\oscript-component.csproj">
<Project>{EA173D06-CCD2-45D5-A263-DC866289517A}</Project>
<Name>oscript-component</Name>
<ProjectReference Include="..\oscript-deflate\oscript-deflate.csproj">
<Project>{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}</Project>
<Name>oscript-deflate</Name>
</ProjectReference>
</ItemGroup>
</Project>
29 changes: 0 additions & 29 deletions src/oscript-component.sln

This file was deleted.

29 changes: 29 additions & 0 deletions src/oscript-deflate.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{C9E6B10A-8892-47AD-B5BF-40C0581F559A}") = "oscript-deflate", "oscript-deflate\oscript-deflate.csproj", "{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}"
EndProject
Project("{C9E6B10A-8892-47AD-B5BF-40C0581F559A}") = "TestApp", "TestApp\TestApp.csproj", "{CD178D0F-A42A-4E50-9627-FD7915806C36}"
EndProject
Project("{C9E6B10A-8892-47AD-B5BF-40C0581F559A}") = "NUnitTests", "NUnitTests\NUnitTests.csproj", "{D0F802A1-49BA-4045-B632-4230A4E6FFB6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C4E3728-D8A7-4944-BD4A-F0B259F6712B}.Release|Any CPU.Build.0 = Release|Any CPU
{CD178D0F-A42A-4E50-9627-FD7915806C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD178D0F-A42A-4E50-9627-FD7915806C36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD178D0F-A42A-4E50-9627-FD7915806C36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD178D0F-A42A-4E50-9627-FD7915806C36}.Release|Any CPU.Build.0 = Release|Any CPU
{D0F802A1-49BA-4045-B632-4230A4E6FFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0F802A1-49BA-4045-B632-4230A4E6FFB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0F802A1-49BA-4045-B632-4230A4E6FFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0F802A1-49BA-4045-B632-4230A4E6FFB6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Loading

0 comments on commit a224a91

Please sign in to comment.