refactor(design): ♻️ optimize nuget build script

#101
csm-ivanovo-ru · May 6, 2023 · 13614b1 · 13614b1
1 parent f8ad06d
commit 13614b1
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 13 deletions.
diff --git a/src/common.build.shared.ps1 b/src/common.build.shared.ps1
@@ -47,7 +47,7 @@ if ( -not ( Test-Path variable:RepoRootPath ) -or ( [System.String]::IsNullOrEmp
 [System.String] $ToolsPath = ( Join-Path -Path $RepoRootPath -ChildPath 'tools' -Resolve );
 
 [System.String] $NuGetToolsPath = ( Join-Path -Path $ToolsPath -ChildPath 'nuget' -Resolve );
-. $NuGetToolsPath/.build.ps1;
+. $NuGetToolsPath/nuget.build.inc.ps1;
 
 [System.String] $BuildToolsPath = ( Join-Path -Path $ToolsPath -ChildPath 'build' -Resolve );
 [System.String] $UpdateFileLastWriteTimePath = ( Join-Path -Path $BuildToolsPath -ChildPath 'Update-FileLastWriteTime.ps1' -Resolve );

diff --git a/tools/nuget/.build.ps1 b/tools/nuget/.build.ps1
@@ -3,23 +3,36 @@
 #Requires -Version 5.0
 #Requires -Modules InvokeBuild
 
+param(
+	[Parameter( Position = 0 )]
+	[System.String[]]
+	$Tasks
+)
+
 Set-StrictMode -Version Latest;
+$ErrorActionPreference = [System.Management.Automation.ActionPreference]::Stop;
 
-[System.String] $NuGetVersion = 'latest';
+$parameters = $PSBoundParameters;
 
-[System.String] $NuGetPath = ( Join-Path -Path $PSScriptRoot -ChildPath 'nuget.exe' );
-if ( Get-Command 'nuget.exe' -ErrorAction 'SilentlyContinue' )
+if ( [System.IO.Path]::GetFileName( $MyInvocation.ScriptName ) -ne 'Invoke-Build.ps1' )
 {
-	$NuGetPath = 'nuget.exe';
+	Invoke-Build -Task $Tasks -File $MyInvocation.MyCommand.Path @parameters;
+	return;
 };
 
 
-task nuget `
-	-If { -not ( Get-Command $NuGetPath -ErrorAction 'SilentlyContinue' ) } `
-	-Jobs {
-	$NuGetURI = "https://dist.nuget.org/win-x86-commandline/$NuGetVersion/nuget.exe";
-	Invoke-WebRequest $NuGetURI -OutFile $NuGetPath `
-		-Verbose:( $VerbosePreference -ne [System.Management.Automation.ActionPreference]::SilentlyContinue ) `
-		-Debug:( $DebugPreference -ne [System.Management.Automation.ActionPreference]::SilentlyContinue );
-	. $NuGetPath sources add -Name 'nuget.org' -Source 'https://api.nuget.org/v3/index.json';
+. $PSScriptRoot/nuget.build.inc.ps1;
+
+task clean {};
+
+task distclean clean, {
+	Remove-BuildItem $NuGetLocalPath;
 };
+
+task maintainer-clean distclean;
+
+task pre-build nuget;
+
+task all pre-build;
+
+task . all;
diff --git a/tools/nuget/nuget.build.inc.ps1 b/tools/nuget/nuget.build.inc.ps1
@@ -0,0 +1,32 @@
+# Copyright © 2020 Sergei S. Betke
+
+#Requires -Version 5.0
+#Requires -Modules InvokeBuild
+
+Set-StrictMode -Version Latest;
+
+[System.String] $NuGetVersion = 'latest';
+
+[System.String] $NuGetLocalPath = ( Join-Path -Path $PSScriptRoot -ChildPath 'nuget.exe' );
+[System.String] $NuGetPath = ( Join-Path -Path $PSScriptRoot -ChildPath 'nuget.exe' );
+
+if ( Get-Command 'nuget.exe' -ErrorAction 'SilentlyContinue' )
+{
+	$NuGetPath = 'nuget.exe';
+}
+else
+{
+	$NuGetPath = $NuGetLocalPath;
+};
+
+
+task nuget `
+	-If { -not ( Get-Command $NuGetPath -ErrorAction 'SilentlyContinue' ) } `
+	-Jobs {
+	$NuGetURI = "https://dist.nuget.org/win-x86-commandline/$NuGetVersion/nuget.exe";
+	Invoke-WebRequest $NuGetURI -OutFile $NuGetLocalPath `
+		-Verbose:( $VerbosePreference -ne [System.Management.Automation.ActionPreference]::SilentlyContinue ) `
+		-Debug:( $DebugPreference -ne [System.Management.Automation.ActionPreference]::SilentlyContinue );
+	$NuGetPath = $NuGetLocalPath;
+	. $NuGetPath sources add -Name 'nuget.org' -Source 'https://api.nuget.org/v3/index.json';
+};