Merge pull request #17 from IT-Service/hotfix/1.0.3

Hotfix/1.0.3
+ добавлен расчёт контрольных сумм внешних файлов при сборке (#16)
+ добавлена проверка контрольных сумм для загружаемых файлов при установке (#16)

ITG.MakeUtils/appveyor.mk

@@ -7,7 +7,7 @@ include $(ITG_MAKEUTILS_DIR)/nuget.mk
 
 ifeq ($(APPVEYOR),True)
 
-APPVEYORTOOL := appveyor
+APPVEYORTOOL ?= appveyor
 
 # $(call pushDeploymentArtifactFile, DeploymentName, Path)
 pushDeploymentArtifactFile = for file in $2; do $(APPVEYORTOOL) PushArtifact $$file -DeploymentName '$(1)'; done

ITG.MakeUtils/chocolatey.mk

@@ -7,6 +7,43 @@ include $(realpath $(ITG_MAKEUTILS_DIR)/tests.mk)
 
 CHOCO              ?= choco
 NUGET              ?= nuget
+FILEHASHALGORITHM  ?= md5
+
+# $(call getExternalFileId,externalFileXml)
+getExternalFileId = $(patsubst %.externalfile.xml,%,$(notdir $1))
+
+# $(call getChocoPackageWebFileChecksumTarget,externalFileXml,bitsPrefix)
+getChocoPackageWebFileChecksumTarget = $(call getExternalFileId,$1)_CHECKSUM$(2)
+
+# $(call getChocoPackageWebFileChecksumAuxFile,externalFileXml,bitsPrefix)
+getChocoPackageWebFileChecksumAuxFile = $(call getExternalFileId,$1)_AUXFILE$(2)
+
+# $(call getChocoPackageWebFileChecksumFile,externalFileXml,bitsPrefix)
+getChocoPackageWebFileChecksumFile = $(dir $1)$(call getExternalFileId,$1)$(if $(2),($2)).$(FILEHASHALGORITHM).checksum.txt
+
+%.externalfile.tmp: %.externalfile.xml
+	$(MAKETARGETDIR)
+	$(call psExecuteCommand, \
+    Invoke-WebRequest \
+      -Uri ( ( Select-Xml -LiteralPath '$<' -XPath '/package/files/file[@fileid=\"$(call getExternalFileId,$*)\"]/@url').Node.Value ) \
+      -OutFile '$@' \
+      -Verbose \
+    ; \
+  )
+	@touch $@
+
+clean::
+	shopt -s globstar; rm -rf **/*.externalfile.tmp
+
+%.$(FILEHASHALGORITHM).checksum.txt: %.externalfile.tmp %.externalfile.xml
+	$(MAKETARGETDIR)
+	$(call psExecuteCommand, \
+    ( Get-FileHash -LiteralPath '$<' -Algorithm $(FILEHASHALGORITHM) -Verbose ).Hash \
+    | Out-File -LiteralPath '$@' -Encoding utf8 -Force \
+    ; \
+  )
+
+#	checksum -t=$(FILEHASHALGORITHM) -f="$<" >> "$@"
 
 # $(call calcChocoPackageFileName, packageId, packageVersion)
 calcChocoPackageFileName = $1.$2.nupkg
@@ -21,7 +58,12 @@ $(1)TOOLS       ?= $(wildcard $(SOURCESDIR)/$2/chocolatey*.ps1)
 $(1)VERSION     ?= $4
 $(1)VERSIONSUFFIX ?= $5
 
-$$($(1)TARGETS): $$($(1)NUSPEC) $$($(1)TOOLS) $6
+$$($(1)TARGETS): \
+    $$($(1)NUSPEC) \
+    $$($(1)TOOLS) \
+    $(wildcard $(SOURCESDIR)/$2/*.ignore) \
+    $(patsubst %.externalfile.xml,%.$(FILEHASHALGORITHM).checksum.txt,$(wildcard $(SOURCESDIR)/$2/*.externalfile.xml)) \
+    $6
 	$$(info Generate chocolatey package file "$$@"...)
 	$$(MAKETARGETDIR)
 	cd $$(@D) && $$(CHOCO) \
@@ -48,7 +90,7 @@ packChocoWebPackage = $(call packChocoPackageAux,$1,$2,,$3,$4,$5)
 define defineInstallTestForChocoPackage
 
 $(call defineTest,install,$1,\
-  $(CHOCO) install $2 --force --confirm -pre --source "$$(<D)", \
+  $(CHOCO) install $2 --force --confirm -pre --version $$($(1)VERSION) --source "$$(<D)", \
   $$($(1)TARGETS) \
 )
 

ITG.MakeUtils/common.mk

@@ -75,7 +75,9 @@ psExecuteCommand = \
     -NonInteractive \
     -NoProfile \
     -ExecutionPolicy unrestricted \
-    -Command "& { $(1) }"
+    -Command "\
+      Set-Variable -Name ErrorActionPreference -Value Stop; \
+      & { $(1) }"
 
 #
 # subprojects

ITG.MakeUtils/gitversion.mk

@@ -4,7 +4,7 @@ ITG_MAKEUTILS_DIR ?= $(MAKE_GITVERSION_DIR)
 
 include $(realpath $(ITG_MAKEUTILS_DIR)/common.mk)
 
-GITVERSION ?= gitversion.bat
+GITVERSION ?= gitversion
 
 export GITVERSIONMAKEFILE ?= $(abspath $(AUXDIR)/version.mk)
 

appveyor.yml

@@ -1,19 +1,20 @@
 image: WMF 5
 version: 1.0.0 (Build {build})
 
-branches:
-  except:
-    - /^modules\/.*$/
-
 environment: 
   CODE_SIGNING_CERTIFICATE_PASSWORD:
     secure: +Dn/WhvBx1rVgenyg7x+Bg==
 
+branches:
+  except:
+    - /^modules\/.*$/
+
 install:
   - cmd: GitVersion /output buildserver
   - ps: .\install.ps1 -ErrorAction Stop -InformationAction Continue -Verbose
 
 build_script:
+  - cmd: set PATH=%PATH%;%ProgramFiles%/AppVeyor/BuildAgent
   - cmd: make
 
 before_test: 

chocolatey/signcode.install/.gitignore

@@ -1 +1,2 @@
-/*.ignore
+*.ignore
+*.tmp

chocolatey/signcode.install/Makefile

@@ -11,7 +11,6 @@ CHOCO_PACKAGE_NAME = signcode.install
 $(eval $(call packChocoWebPackage,package,$(CHOCO_PACKAGE_NAME),\
   $(MajorMinorPatch),\
   $(PreReleaseLabel),\
-  $(wildcard $(SOURCESDIR)/$(CHOCO_PACKAGE_NAME)/*.ignore)\
   $(SOURCESDIR)/$(CHOCO_PACKAGE_NAME)/signcodepwd.cmd \
 ))
 

chocolatey/signcode.install/sources/signcode.install/chocolateyInstall.ps1

@@ -1,21 +1,34 @@
 $ErrorActionPreference = 'Stop';
+$fileHashAlgorithm = 'md5';
 
 $packageName = 'signcode.install';
 $toolsDir = $(Split-Path -parent $MyInvocation.MyCommand.Definition);
 
 $DSigUrl = 'http://download.microsoft.com/download/4/7/e/47e8e7fb-9441-4887-988f-e259a443052d/Dsig.EXE';
 $signcodePwdUrl = 'http://www.stephan-brenner.com/downloads/signcode-pwd/signcode-pwd_1_02.zip';
 
+$dsigMetadata = ( Select-Xml `
+    -LiteralPath ( Join-Path -Path $toolsDir -ChildPath 'dsig.externalfile.xml' ) `
+    -XPath '/package/files/file[@fileid="dsig"]'
+).Node;
 Install-ChocolateyPackage `
     -packageName 'DSig' `
-    -url $DSigUrl `
+    -url ( $dsigMetadata.url ) `
     -silentArgs "/Q /T:`"$toolsDir`"" `
+    -checksum ( Get-Content -LiteralPath ( Join-Path -Path $toolsDir -ChildPath "dsig.$fileHashAlgorithm.checksum.txt" ) ) `
+    -checksumType $fileHashAlgorithm `
 ;
 
+$signcodepwdMetadata = ( Select-Xml `
+    -LiteralPath ( Join-Path -Path $toolsDir -ChildPath 'signcodepwd.externalfile.xml' ) `
+    -XPath '/package/files/file[@fileid="signcodepwd"]'
+).Node;
 Install-ChocolateyZipPackage `
     -packageName 'signcode-pwd' `
     -unzipLocation $toolsDir `
-    -url $signcodePwdUrl `
+    -url ( $signcodepwdMetadata.url ) `
+    -checksum ( Get-Content -LiteralPath ( Join-Path -Path $toolsDir -ChildPath "signcodepwd.$fileHashAlgorithm.checksum.txt" ) ) `
+    -checksumType $fileHashAlgorithm `
 ;
 
 $exitCode = Start-ChocolateyProcessAsAdmin `

chocolatey/signcode.install/sources/signcode.install/dsig.externalfile.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <files>
+    <file fileid="dsig" filename="dsig.exe" target="tools" url="http://download.microsoft.com/download/4/7/e/47e8e7fb-9441-4887-988f-e259a443052d/Dsig.EXE"/>
+  </files>  
+</package>

chocolatey/signcode.install/sources/signcode.install/dsig.md5.checksum.txt

@@ -0,0 +1 @@
+95A604E5E716FDC32AF38E936E42C06D

chocolatey/signcode.install/sources/signcode.install/package.nuspec

@@ -25,6 +25,9 @@ All release notes can be found on the GitHub site - https://github.com/IT-Servic
   </metadata>
   <files>
     <file src="chocolatey*.ps1" target="tools"/>
-    <file src="*.*" target="tools"/>
+    <file src="*.ignore" target="tools"/>
+    <file src="*.externalfile.xml" target="tools"/>
+    <file src="*.checksum.txt" target="tools"/>
+    <file src="signcodepwd.cmd" target="tools"/>
   </files>  
 </package>

chocolatey/signcode.install/sources/signcode.install/signcodepwd.externalfile.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <files>
+    <file fileid="signcodepwd" filename="signcode-pwd.zip" target="tools" url="http://www.stephan-brenner.com/downloads/signcode-pwd/signcode-pwd_1_02.zip"/>
+  </files>  
+</package>

chocolatey/signcode.install/sources/signcode.install/signcodepwd.md5.checksum.txt

@@ -0,0 +1 @@
+C9C25444500C732AB58ACC7855D39CF7

install.ps1

@@ -70,38 +70,37 @@ $ToPath = @();
 
 Import-Module -Name PackageManagement;
 
+$null = Install-PackageProvider -Name NuGet -Force;
+$null = Import-PackageProvider -Name NuGet -Force;
+$null = (
+    Get-PackageSource -ProviderName NuGet `
+    | Set-PackageSource -Trusted `
+);
 $null = Install-PackageProvider -Name Chocolatey -Force;
 $null = Import-PackageProvider -Name Chocolatey -Force;
 $null = (
     Get-PackageSource -ProviderName Chocolatey `
     | Set-PackageSource -Trusted `
 );
+$null = Install-Package -Name chocolatey -MinimumVersion 0.9.10.3 -ProviderName Chocolatey;
+$null = Import-PackageProvider -Name Chocolatey -Force;
 $null = (
-    Get-PackageSource -ProviderName NuGet `
+    Get-PackageSource -ProviderName Chocolatey `
     | Set-PackageSource -Trusted `
 );
-$ToPath += "$env:ChocolateyPath\bin";
-
-$null = Install-Package -Name 'GitVersion.Portable' -ProviderName Chocolatey;
-$env:GitVersion = "$env:ChocolateyPath\lib\GitVersion.Portable.$(( Get-Package -Name GitVersion.Portable -ProviderName Chocolatey ).Version)\tools\GitVersion.exe";
-Write-Verbose "GitVersion path: $env:GitVersion";
-if ($PSCmdLet.ShouldProcess('GitVersion', 'Установить переменную окружения')) {
-    [System.Environment]::SetEnvironmentVariable( 'GitVersion', $env:GitVersion, [System.EnvironmentVariableTarget]::User );
-};
 
-$null = Install-Package -Name 'GitReleaseNotes.Portable' -ProviderName Chocolatey;
+& choco install GitVersion.Portable --confirm --failonstderr | Out-String -Stream | Write-Verbose;
+& choco install GitReleaseNotes.Portable --confirm --failonstderr | Out-String -Stream | Write-Verbose;
 
 if ( -not ( $env:APPVEYOR -eq 'True' ) ) {
 
-    $null = Install-Package -Name chocolatey -ProviderName Chocolatey;
-
-    if ( ( Get-Package -Name Git -ErrorAction SilentlyContinue ).count -eq 0 ) {
-        $null = Install-Package -Name 'git' -MinimumVersion '2.8' -ProviderName Chocolatey;
-    };
+    & choco install git --confirm --failonstderr | Out-String -Stream | Write-Verbose;
 
 };
 
-$null = Install-Package -Name 'cygwin' -ProviderName Chocolatey;
+& choco install checksum --confirm --failonstderr | Out-String -Stream | Write-Verbose;
+
+& choco install cygwin --confirm --failonstderr | Out-String -Stream | Write-Verbose;
 $env:CygWin = Get-ItemPropertyValue `
     -Path HKLM:\SOFTWARE\Cygwin\setup `
     -Name rootdir `