Skip to content

Commit

Permalink
Updated GetNuTool submodule to use in our manager. It should resolve …
Browse files Browse the repository at this point in the history 
…problems with possible incorrect CRC & Compressed size info - #38

3F/GetNuTool#3
#38 (comment)
  • Loading branch information
@3F
3F committed Aug 19, 2017
1 parent 485e78b commit d1db744
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .vssbe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"Mode": {
"$type": "net.r_eg.vsSBE.Events.ModeScript, vsSolutionBuildEvent",
"Type": "Script",
"Command": "#[($(Configuration) == \"PublicRelease\") {\n #[$(cfgname = 'Release')]\n}\nelse{\n #[$(cfgname = $(Configuration))]\n}]\n\n#[$(dbin = \"bin/$(cfgname)/\")]\n\n$(revDeltaBase = \"2016/10/12\")\n$(revDeltaMin = $([System.Math]::Pow(10, 3)))\n$$(revDeltaMax = $([System.Math]::Pow(10, 5)))\n$(revDeltaMax = 65534) #[\" limit of AssemblyVersion - 65534 max allowed ! that is 65536 (0-65535) is not a correct range, (2^16 - 2) \"]\n\n$(pDllExport = \"RGiesecke.DllExport\")\n$(pMeta = \"Metadata\")\n$(pNSBin = \"NSBin\")\n$(pConf = \"Configurator\")\n$(pWizard = \"Wizard\")\n$(pGetNuTool = \"GetNuTool\")\n$(pMSBuild = \"RGiesecke.DllExport.MSBuild\")\n$(odir = \"$(dbin)raw/\")\n\n#[IO delete.directory(\"$(dbin)\", true)]\n#[IO copy.directory(\"\", \"$(dbin)\", true)]",
"Command": "#[($(Configuration) == \"PublicRelease\") {\n #[$(cfgname = 'Release')]\n}\nelse{\n #[$(cfgname = $(Configuration))]\n}]\n\n#[$(dbin = \"bin/$(cfgname)/\")]\n\n$(revDeltaBase = \"2016/10/12\")\n$(revDeltaMin = $([System.Math]::Pow(10, 3)))\n$$(revDeltaMax = $([System.Math]::Pow(10, 5)))\n$(revDeltaMax = 65534) #[\" limit of AssemblyVersion (2^16 - 2) - i.e. 65534 max allowed \"]\n\n$(pDllExport = \"RGiesecke.DllExport\")\n$(pMeta = \"Metadata\")\n$(pNSBin = \"NSBin\")\n$(pConf = \"Configurator\")\n$(pWizard = \"Wizard\")\n$(pGetNuTool = \"GetNuTool\")\n$(pMSBuild = \"RGiesecke.DllExport.MSBuild\")\n$(odir = \"$(dbin)raw/\")\n\n#[IO delete.directory(\"$(dbin)\", true)]\n#[IO copy.directory(\"\", \"$(dbin)\", true)]",
"Command__": [
"#[($(Configuration) == \"PublicRelease\") {",
" #[$(cfgname = 'Release')]",
Expand All @@ -105,7 +105,7 @@
"$(revDeltaBase = \"2016/10/12\")",
"$(revDeltaMin = $([System.Math]::Pow(10, 3)))",
"$$(revDeltaMax = $([System.Math]::Pow(10, 5)))",
"$(revDeltaMax = 65534) #[\" limit of AssemblyVersion - 65534 max allowed ! that is 65536 (0-65535) is not a correct range, (2^16 - 2) \"]",
"$(revDeltaMax = 65534) #[\" limit of AssemblyVersion (2^16 - 2) - i.e. 65534 max allowed \"]",
"",
"$(pDllExport = \"RGiesecke.DllExport\")",
"$(pMeta = \"Metadata\")",
Expand Down Expand Up @@ -240,7 +240,7 @@
"Mode": {
"$type": "net.r_eg.vsSBE.Events.ModeScript, vsSolutionBuildEvent",
"Type": "Script",
"Command": "#[var tpl = // This code was generated by a vsSolutionBuildEvent. \n// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.\nnamespace net.r_eg.DllExport.Configurator\n{\n using System;\n\n internal struct ConfVersion\n {\n public static readonly Version number = new Version(S_NUM_REV);\n\n public const string S_NUM = \"%S_NUM%\";\n public const string S_REV = \"%S_REV%\";\n public const string S_REL = \"%S_REL%\";\n\n public const string S_NUM_REV = S_NUM + \".\" + S_REV;\n\n public const string BRANCH_SHA1 = \"%B_SHA1%\";\n public const string BRANCH_NAME = \"%B_NAME%\";\n public const string BRANCH_REVC = \"%B_REVC%\";\n\n internal const string S_INFO = S_NUM_REV + \" \" + S_REL + \" [ \" + BRANCH_SHA1 + \" ]\";\n internal const string S_INFO_FULL = S_INFO + \" /'\" + BRANCH_NAME + \"':\" + BRANCH_REVC;\n }\n}]\n\n\n#[\" \n Calculate revision\n\"]\n#[var tBase = $([System.DateTime]::Parse('$(revDeltaBase)').ToBinary())]\n#[var tNow = $([System.DateTime]::UtcNow.Ticks)]\n#[var revBuild = #[$(\n [System.TimeSpan]::FromTicks('$(\n [MSBuild]::Subtract($(tNow), $(tBase))\n )')\n .TotalMinutes.ToString('0'))]]\n \n#[var revBuild = #[$(\n [MSBuild]::Add(\n $(revDeltaMin), \n $([MSBuild]::Modulo(\n $(revBuild), \n $([MSBuild]::Subtract(\n $(revDeltaMax), $(revDeltaMin)\n ))\n ))\n )\n )]\n]\n\n#[$(dxpPrintVersion = \"v$(pVer).$(revBuild)\")]\n\n#[\" \n Remove placeholders\n\"]\n#[var tpl = $(tpl.Replace(\"%S_NUM%\", \"$(pVer)\").Replace(\"%S_REV%\", \"$(revBuild)\").Replace(\"%S_REL%\", \"$(pReleaseVersion)\"))]\n\n#[\" \n Checking of the git folder +tool & define sha1, branch name, etc.\n\"]\n#[( #[IO exists.directory(\".git\")] && #[IO exists.file(\"git.exe\", true)] )\n{\n #[var bSha1 = #[IO sout(\"git\", \"rev-parse --short HEAD\")]]\n #[var bName = #[IO sout(\"git\", \"rev-parse --abbrev-ref HEAD\")]]\n #[var bRevc = #[IO sout(\"git\", \"rev-list HEAD --count\")]]\n \n #[($(bName) == \"HEAD\") {\n #[var bName = $(APPVEYOR_REPO_BRANCH)]\n }]\n \n #[$(dxpPrintVersion = \"$(dxpPrintVersion) [ $(bSha1) ]\")]\n}\nelse {\n #[$(bSha1 = '-')] #[$(bName = '-')] #[$(bRevc = '-')]\n}]\n\n#[var tpl = #[$(tpl.Replace(\"%B_SHA1%\", \"#[var bSha1]\")\n .Replace(\"%B_NAME%\", \"#[var bName]\")\n .Replace(\"%B_REVC%\", \"#[var bRevc]\") )]]\n\n#[\" \n Save result\n\"]\n#[File write(\"$(pConf)/ConfVersion.cs\"):#[var tpl]]",
"Command": "#[var tpl = // This code was generated by a vsSolutionBuildEvent. \n// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.\nnamespace net.r_eg.DllExport.Configurator\n{\n using System;\n\n internal struct ConfVersion\n {\n public static readonly Version number = new Version(S_NUM_REV);\n\n public const string S_NUM = \"%S_NUM%\";\n public const string S_REV = \"%S_REV%\";\n public const string S_REL = \"%S_REL%\";\n\n public const string S_NUM_REV = S_NUM + \".\" + S_REV;\n\n public const string BRANCH_SHA1 = \"%B_SHA1%\";\n public const string BRANCH_NAME = \"%B_NAME%\";\n public const string BRANCH_REVC = \"%B_REVC%\";\n\n internal const string S_INFO = S_NUM_REV + \" \" + S_REL + \" [ \" + BRANCH_SHA1 + \" ]\";\n internal const string S_INFO_FULL = S_INFO + \" /'\" + BRANCH_NAME + \"':\" + BRANCH_REVC;\n }\n}]\n\n\n#[\" \n Calculate revision\n\"]\n#[var tBase = $([System.DateTime]::Parse('$(revDeltaBase)').ToBinary())]\n#[var tNow = $([System.DateTime]::UtcNow.Ticks)]\n#[var revBuild = #[$(\n [System.TimeSpan]::FromTicks('$(\n [MSBuild]::Subtract($(tNow), $(tBase))\n )')\n .TotalMinutes.ToString('0'))]]\n \n#[var revBuild = #[$(\n [MSBuild]::Add(\n $(revDeltaMin), \n $([MSBuild]::Modulo(\n $(revBuild), \n $([MSBuild]::Subtract(\n $(revDeltaMax), $(revDeltaMin)\n ))\n ))\n )\n )]\n]\n\n#[$(dxpPrintVersion = \"v$(pVer).$(revBuild)\")]\n\n#[\" \n Remove placeholders\n\"]\n#[var tpl = $(tpl.Replace(\"%S_NUM%\", \"$(pVer)\").Replace(\"%S_REV%\", \"$(revBuild)\").Replace(\"%S_REL%\", \"$(pReleaseVersion)\"))]\n\n#[\" \n Checking of the git folder +tool & define sha1, branch name, etc.\n\"]\n#[var isGit = #[IO cmd(\"git rev-parse 2>&1\")]]\n#[( $(isGit) == \"\" )\n{\n #[var bSha1 = #[IO sout(\"git\", \"rev-parse --short HEAD\")]]\n #[var bName = #[IO sout(\"git\", \"rev-parse --abbrev-ref HEAD\")]]\n #[var bRevc = #[IO sout(\"git\", \"rev-list HEAD --count\")]]\n \n #[($(bName) == \"HEAD\") {\n #[var bName = $(APPVEYOR_REPO_BRANCH)]\n }]\n \n #[$(dxpPrintVersion = \"$(dxpPrintVersion) [ $(bSha1) ]\")]\n}\nelse {\n #[$(bSha1 = '-')] #[$(bName = '-')] #[$(bRevc = '-')]\n}]\n\n#[var tpl = #[$(tpl.Replace(\"%B_SHA1%\", \"#[var bSha1]\")\n .Replace(\"%B_NAME%\", \"#[var bName]\")\n .Replace(\"%B_REVC%\", \"#[var bRevc]\") )]]\n\n#[\" \n Save result\n\"]\n#[File write(\"$(pConf)/ConfVersion.cs\"):#[var tpl]]",
"Command__": [
"#[var tpl = // This code was generated by a vsSolutionBuildEvent. ",
"// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.",
Expand Down Expand Up @@ -527,10 +527,10 @@
"Mode": {
"$type": "net.r_eg.vsSBE.Events.ModeScript, vsSolutionBuildEvent",
"Type": "Script",
"Command": "#[IO writeLine(STDOUT): Build GetNuTool ...]\n#[IO writeLine(STDOUT): #[IO cmd(\"cd GetNuTool & call build\", 400)]]\n\n#[var frontend = $(pWizard)\\\\installer.bat]\n#[var gntECore = \"$(pGetNuTool)\\\\bin\\\\Release\\\\raw\\\\versions\\\\01. executable\\\\gnt.bat\"]\n#[var dxpWZ = $(dbin.Replace('/', '\\\\'))DllExport.bat]\n\n#[try\n{\n #[IO writeLine(STDOUT):\n #[IO cmd(\"copy /Y/B $(frontend)+$(gntECore) $(dxpWZ)\")]\n ]\n}\ncatch(err, msg)\n{\n #[IO write(STDOUT):\n Trying with another method... ]\n \n #[IO cmd(\"type $(frontend)>$(dxpWZ)\")]\n #[IO cmd(\"type $(gntECore)>>$(dxpWZ)\")]\n \n #[IO writeLine(STDOUT): ok]\n\n}]\n\n\n#[\" \n finalization\n\"]\n#[IO replace.Regex(\"$(dxpWZ)\", \"(@echo off) & echo.*?exit /B \\d+\", \"$1\")]\n\n\n#[\" \n update version\n\"]\n#[IO replace(\"$(dxpWZ)\", \"$-version-$\", \"$(dxpPrintVersion)\")]\n#[IO replace(\"$(dxpWZ)\", \"$-pkg-version-$\", \"$(pVerRel)\")]\n\n#[\" \n .compressor\n\"]\n#[IO writeLine(STDOUT): Generate minified version of Wizard installer ...]\n#[IO writeLine(STDOUT): #[IO cmd(\"$(SolutionDir)tools\\hMSBuild $(SolutionDir)$(pWizard)/.compressor /p:core=\\\"$(SolutionDir)$(dxpWZ)\\\" /p:output=\\\"$(SolutionDir)$(dxpWZ)_minified.bat\\\" /nologo /v:m /m:4 \", 400)]]\n\n#[IO copy.file(\"$(dxpWZ)\", \"$(dxpWZ)_full.bat\", true)]\n#[IO copy.file(\"$(dxpWZ)_minified.bat\", \"$(dxpWZ)\", true)]\n#[IO delete.files({\"$(dxpWZ)_minified.bat\"})]\n\n#[IO copy.file(\"$(dxpWZ)\", \"$(odir)/\", true)]\n",
"Command": "#[IO writeLine(STDOUT): Build GetNuTool ...]\n#[IO writeLine(STDOUT): #[IO cmd(\"cd GetNuTool & call build PublicRelease\", 400)]]\n\n#[var frontend = $(pWizard)\\\\installer.bat]\n#[var gntECore = \"$(pGetNuTool)\\\\bin\\\\Release\\\\raw\\\\versions\\\\01. executable\\\\gnt.bat\"]\n#[var dxpWZ = $(dbin.Replace('/', '\\\\'))DllExport.bat]\n\n#[try\n{\n #[IO writeLine(STDOUT):\n #[IO cmd(\"copy /Y/B $(frontend)+$(gntECore) $(dxpWZ)\")]\n ]\n}\ncatch(err, msg)\n{\n #[IO write(STDOUT):\n Trying with another method... ]\n \n #[IO cmd(\"type $(frontend)>$(dxpWZ)\")]\n #[IO cmd(\"type $(gntECore)>>$(dxpWZ)\")]\n \n #[IO writeLine(STDOUT): ok]\n\n}]\n\n\n#[\" \n finalization\n\"]\n#[IO replace.Regex(\"$(dxpWZ)\", \"(@echo off) & echo.*?exit /B \\d+\", \"$1\")]\n\n\n#[\" \n update version\n\"]\n#[IO replace(\"$(dxpWZ)\", \"$-version-$\", \"$(dxpPrintVersion)\")]\n#[IO replace(\"$(dxpWZ)\", \"$-pkg-version-$\", \"$(pVerRel)\")]\n\n#[\" \n .compressor\n\"]\n#[IO writeLine(STDOUT): Generate minified version of Wizard installer ...]\n#[IO writeLine(STDOUT): #[IO cmd(\"$(SolutionDir)tools\\hMSBuild $(SolutionDir)$(pWizard)/.compressor /p:core=\\\"$(SolutionDir)$(dxpWZ)\\\" /p:output=\\\"$(SolutionDir)$(dxpWZ)_minified.bat\\\" /nologo /v:m /m:4 \", 400)]]\n\n#[IO copy.file(\"$(dxpWZ)\", \"$(dxpWZ)_full.bat\", true)]\n#[IO copy.file(\"$(dxpWZ)_minified.bat\", \"$(dxpWZ)\", true)]\n#[IO delete.files({\"$(dxpWZ)_minified.bat\"})]\n\n#[IO copy.file(\"$(dxpWZ)\", \"$(odir)/\", true)]\n",
"Command__": [
"#[IO writeLine(STDOUT): Build GetNuTool ...]",
"#[IO writeLine(STDOUT): #[IO cmd(\"cd GetNuTool & call build\", 400)]]",
"#[IO writeLine(STDOUT): #[IO cmd(\"cd GetNuTool & call build PublicRelease\", 400)]]",
"",
"#[var frontend = $(pWizard)\\\\installer.bat]",
"#[var gntECore = \"$(pGetNuTool)\\\\bin\\\\Release\\\\raw\\\\versions\\\\01. executable\\\\gnt.bat\"]",
Expand Down
1 change: 0 additions & 1 deletion DllExport.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{44F550ED
tools\DllExport.nuspec = tools\DllExport.nuspec
tools\gnt.bat = tools\gnt.bat
tools\hMSBuild.bat = tools\hMSBuild.bat
tools\init.ps1 = tools\init.ps1
tools\net.r_eg.DllExport.targets = tools\net.r_eg.DllExport.targets
EndProjectSection
EndProject
Expand Down
2 changes: 1 addition & 1 deletion GetNuTool
Submodule GetNuTool updated 9 files
+1 −0 .version
+77 −9 .vssbe
+1 −1 README.md
+6 −1 build.bat
+13 −1 changelog.txt
+0 −12 compress.bat
+5 −4 embedded/sha1.cmd
+27 −24 logic.targets
+0 −15 packing.bat
2 changes: 1 addition & 1 deletion tools/DllExport.nuspec
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>DllExport</id>
Expand Down
Empty file removed tools/init.ps1
View file
Empty file.

0 comments on commit d1db744

Please sign in to comment.