Skip to content

Commit

Permalink
Updated GetNuTool 1.8 and changed build scripts:
Browse files Browse the repository at this point in the history
https://github.com/3F/GetNuTool/releases/tag/1.8

This also updates build scripts because of modern vsSolutionBuildEvent 1.14 (used from GetNuTool 1.8)
+known problem: 3F/vsSolutionBuildEvent#61

And as I promised, an compiled.full version now will be distributed together with official hMSBuild releases (zip package):
#11 (comment)
  • Loading branch information
3F committed Jan 17, 2020
1 parent 0cc319c commit dc81373
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 64 deletions.
17 changes: 11 additions & 6 deletions .vssbe
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"}",
"",
"#[var frontend = frontend.bat]",
"#[var gntECore = \"GetNuTool\\\\bin\\\\Release\\\\raw\\\\versions\\\\01. executable\\\\gnt.bat\"]",
"#[var gntECore = \"GetNuTool\\\\bin\\\\Release\\\\raw\\\\executables\\\\batch\\\\gnt.bat\"]",
"#[var hMSBuild = $(odir)hMSBuild.bat]",
"",
"#[try",
Expand Down Expand Up @@ -182,15 +182,20 @@
" \"Readme.md\",",
" \"changelog.txt\",",
" \"License.txt\",",
" \".gitattributes\",",
" \".version\"",
" },",
" \"$(odir)\", true)]",
" ",
"#[var zipdir = $(dbin.Replace(\"\\\\\", \"/\"))]",
"",
"#[7z pack.directory(\"$(zipdir)raw\", \"$(zipdir)hMSBuild_#[$(hMSBuildVersion",
" .Replace(' ', '')",
" .Replace('[', '_').Replace(']', ''))].zip\")]"
"#[IO copy.file(\"$(dbin)hMSBuild.full.bat\", \"$(dbin)raw/compiled.full/hMSBuild.bat\", true)]",
"#[IO delete.files({\"$(dbin)hMSBuild.full.bat\"})]",
"",
"#[var zipdir = $(dbin.Replace(\"\\\\\", \"/\"))]",
"#[7z pack.directory",
"(",
" \"$(zipdir)raw\", ",
" \"$(zipdir)hMSBuild.$(hMSBuildVersion).zip\" ",
")]"
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion GetNuTool
3 changes: 0 additions & 3 deletions bin/Readme.md

This file was deleted.

9 changes: 4 additions & 5 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
@echo off

set cimdll=GetNuTool\packages\vsSBE.CI.MSBuild\bin\CI.MSBuild.dll
set netmsb=GetNuTool\netmsb

call submodules "GetNuTool/gnt.sln" || goto err
if not exist GetNuTool/gnt.sln (
git submodule update --init --recursive GetNuTool || goto err
)

setlocal
cd GetNuTool
call build PublicRelease || goto err
endlocal

call %netmsb% "hMSBuild.sln" /l:"%cimdll%" /v:m /m:4 || goto err
call GetNuTool\packages\vsSolutionBuildEvent\cim.cmd "hMSBuild.sln" /v:m /m:4 || goto err

:: call tests || goto err

Expand Down
2 changes: 1 addition & 1 deletion frontend.bat
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ goto commands
:usage

echo.
@echo hMSBuild - $-version-$
@echo hMSBuild $-version-$
@echo Copyright (c) 2017-2020 Denis Kuzmin [ x-3F@outlook.com ] GitHub/3F
@echo Copyright (c) hMSBuild contributors
echo.
Expand Down
13 changes: 9 additions & 4 deletions hMSBuild.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hMSBuild", "hMSBuild", "{D221D332-2A57-44F9-B866-F7C00C29032D}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hMSBuild", "hMSBuild", "{D2
frontend.bat = frontend.bat
License.txt = License.txt
Readme.md = Readme.md
submodules.bat = submodules.bat
tests.bat = tests.bat
EndProjectSection
EndProject
Expand All @@ -34,6 +33,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "light", "light", "{6C22B481
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
Expand All @@ -42,4 +44,7 @@ Global
{9309746A-7318-4784-95B9-3C78C437BA39} = {D221D332-2A57-44F9-B866-F7C00C29032D}
{6C22B481-EB28-4AF3-8C81-8AB931A8D569} = {D221D332-2A57-44F9-B866-F7C00C29032D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {33DC928C-0601-4A0D-82B9-122956C3725E}
EndGlobalSection
EndGlobal
44 changes: 0 additions & 44 deletions submodules.bat

This file was deleted.

0 comments on commit dc81373

Please sign in to comment.