From dc813736844b9655c91ac00f069c709ec17ea8ce Mon Sep 17 00:00:00 2001 From: "Denis Kuzmin [ GitHub/3F ]" Date: Fri, 17 Jan 2020 20:06:20 +0300 Subject: [PATCH] Updated GetNuTool 1.8 and changed build scripts: 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: https://github.com/3F/vsSolutionBuildEvent/issues/61 And as I promised, an compiled.full version now will be distributed together with official hMSBuild releases (zip package): https://github.com/3F/hMSBuild/pull/11#issuecomment-496228768 --- .vssbe | 17 +++++++++++------ GetNuTool | 2 +- bin/Readme.md | 3 --- build.bat | 9 ++++----- frontend.bat | 2 +- hMSBuild.sln | 13 +++++++++---- submodules.bat | 44 -------------------------------------------- 7 files changed, 26 insertions(+), 64 deletions(-) delete mode 100644 bin/Readme.md delete mode 100644 submodules.bat diff --git a/.vssbe b/.vssbe index 4f666ff..b9c4eec 100644 --- a/.vssbe +++ b/.vssbe @@ -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", @@ -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\" ", + ")]" ] } } diff --git a/GetNuTool b/GetNuTool index 4bc1dfb..df76082 160000 --- a/GetNuTool +++ b/GetNuTool @@ -1 +1 @@ -Subproject commit 4bc1dfb52340fee58bd94d743211779d70f18465 +Subproject commit df760827f1564e8fe1aadd736feadf539f9a7281 diff --git a/bin/Readme.md b/bin/Readme.md deleted file mode 100644 index 37b675f..0000000 --- a/bin/Readme.md +++ /dev/null @@ -1,3 +0,0 @@ -All final binaries will be here... - -`> build` \ No newline at end of file diff --git a/build.bat b/build.bat index b6320af..755d33d 100644 --- a/build.bat +++ b/build.bat @@ -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 diff --git a/frontend.bat b/frontend.bat index 8744ecf..5417c56 100644 --- a/frontend.bat +++ b/frontend.bat @@ -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. diff --git a/hMSBuild.sln b/hMSBuild.sln index f5d539f..7e90f60 100644 --- a/hMSBuild.sln +++ b/hMSBuild.sln @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/submodules.bat b/submodules.bat deleted file mode 100644 index 3e9f286..0000000 --- a/submodules.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off - -echo Checking submodules ... - -set _dep=%1 - -if "%_dep%"=="" ( - echo Incorrect command. Please use `build.bat` instead of this. - exit /B 0 -) - - -if not exist "%_dep%" goto restore -exit /B 0 - -:restore - -echo. -echo. Whoops, you need to update git submodules. -echo. But we'll update this automatically. -echo. -echo. Please wait... -echo. - -git submodule update --init --recursive || goto gitNotFound - -exit /B 0 - -:gitNotFound - -if not exist ".git" ( - echo. 1>&2 - echo To restore submodules via Git scm you should have a `.git` folder, but we can't find this. 1>&2 - echo Unfortunately you should get this manually, or try to clone initially with recursive option: `git clone --recursive ...` 1>&2 - exit /B 3 -) - -echo. 1>&2 -echo. `git` was not found or something went wrong. Check your connection and env. variable `PATH`. Or get submodules manually: 1>&2 -echo. 1. Use command `git submodule update --init --recursive` 1>&2 -echo. 2. Or clone initially with recursive option: `git clone --recursive ...` 1>&2 -echo. 1>&2 - -exit /B 2 \ No newline at end of file