From 9422308d3e51410734e82245d05b36db5c612730 Mon Sep 17 00:00:00 2001 From: "FAREAST\\chunyu" Date: Wed, 15 Mar 2023 10:48:20 +0800 Subject: [PATCH] rename --- ...enerate.ps1 => TypeSpec-Project-Generate.ps1} | 16 ++++++++-------- ...roject-Sync.ps1 => TypeSpec-Project-Sync.ps1} | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) rename eng/common/scripts/{Typespec-Project-Generate.ps1 => TypeSpec-Project-Generate.ps1} (86%) rename eng/common/scripts/{Typespec-Project-Sync.ps1 => TypeSpec-Project-Sync.ps1} (93%) diff --git a/eng/common/scripts/Typespec-Project-Generate.ps1 b/eng/common/scripts/TypeSpec-Project-Generate.ps1 similarity index 86% rename from eng/common/scripts/Typespec-Project-Generate.ps1 rename to eng/common/scripts/TypeSpec-Project-Generate.ps1 index 3dc9a6ec1b05..d1e728895abc 100644 --- a/eng/common/scripts/Typespec-Project-Generate.ps1 +++ b/eng/common/scripts/TypeSpec-Project-Generate.ps1 @@ -1,4 +1,4 @@ -# For details see https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/Typespec-Project-Scripts.md +# For details see https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/TypeSpec-Project-Scripts.md [CmdletBinding()] param ( @@ -6,7 +6,7 @@ param ( [ValidateNotNullOrEmpty()] [string] $ProjectDirectory, [Parameter(Position=1)] - [string] $TypespecAdditionalOptions ## addtional typespec emitter options, separated by semicolon if more than one, e.g. option1=value1;option2=value2 + [string] $typespecAdditionalOptions ## addtional typespec emitter options, separated by semicolon if more than one, e.g. option1=value1;option2=value2 ) $ErrorActionPreference = "Stop" @@ -55,7 +55,7 @@ function NpmInstallForProject([string]$workingDirectory) { $resolvedProjectDirectory = Resolve-Path $ProjectDirectory $emitterName = &$GetEmitterNameFn -$typespecConfigurationFile = Resolve-Path "$ProjectDirectory/typespec-location.yaml" +$typespecConfigurationFile = Resolve-Path "$ProjectDirectory/tsp-location.yaml" Write-Host "Reading configuration from $typespecConfigurationFile" $configuration = Get-Content -Path $typespecConfigurationFile -Raw | ConvertFrom-Yaml @@ -63,9 +63,9 @@ $configuration = Get-Content -Path $typespecConfigurationFile -Raw | ConvertFrom $specSubDirectory = $configuration["directory"] $innerFolder = Split-Path $specSubDirectory -Leaf -$tempFolder = "$ProjectDirectory/TempTypespecFiles" +$tempFolder = "$ProjectDirectory/TempTypeSpecFiles" $npmWorkingDir = Resolve-Path $tempFolder/$innerFolder -$mainTypespecFile = If (Test-Path "$npmWorkingDir/client.*") { Resolve-Path "$npmWorkingDir/client.*" } Else { Resolve-Path "$npmWorkingDir/main.*"} +$mainTypeSpecFile = If (Test-Path "$npmWorkingDir/client.*") { Resolve-Path "$npmWorkingDir/client.*" } Else { Resolve-Path "$npmWorkingDir/main.*"} try { Push-Location $npmWorkingDir @@ -79,9 +79,9 @@ try { $emitterAdditionalOptions = " $emitterAdditionalOptions" } } - $typespecCompileCommand = "npx tsp compile $mainTypespecFile --emit $emitterName$emitterAdditionalOptions" - if ($TypespecAdditionalOptions) { - $options = $TypespecAdditionalOptions.Split(";"); + $typespecCompileCommand = "npx tsp compile $mainTypeSpecFile --emit $emitterName$emitterAdditionalOptions" + if ($typespecAdditionalOptions) { + $options = $typespecAdditionalOptions.Split(";"); foreach ($option in $options) { $typespecCompileCommand += " --option $emitterName.$option" } diff --git a/eng/common/scripts/Typespec-Project-Sync.ps1 b/eng/common/scripts/TypeSpec-Project-Sync.ps1 similarity index 93% rename from eng/common/scripts/Typespec-Project-Sync.ps1 rename to eng/common/scripts/TypeSpec-Project-Sync.ps1 index 24f68a8c54fe..f8656bc1d608 100644 --- a/eng/common/scripts/Typespec-Project-Sync.ps1 +++ b/eng/common/scripts/TypeSpec-Project-Sync.ps1 @@ -1,4 +1,4 @@ -# For details see https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/Typespec-Project-Scripts.md +# For details see https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/TypeSpec-Project-Scripts.md [CmdletBinding()] param ( @@ -86,7 +86,7 @@ function GetSpecCloneDir([string]$projectName) { return $createResult } -$typespecConfigurationFile = Resolve-Path "$ProjectDirectory/typespec-location.yaml" +$typespecConfigurationFile = Resolve-Path "$ProjectDirectory/tsp-location.yaml" Write-Host "Reading configuration from $typespecConfigurationFile" $configuration = Get-Content -Path $typespecConfigurationFile -Raw | ConvertFrom-Yaml @@ -118,10 +118,10 @@ if ( $configuration["repo"] -and $configuration["commit"]) { } -$tempTypespecDir = "$ProjectDirectory/TempTypespecFiles" -New-Item $tempTypespecDir -Type Directory -Force | Out-Null +$tempTypeSpecDir = "$ProjectDirectory/TempTypeSpecFiles" +New-Item $tempTypeSpecDir -Type Directory -Force | Out-Null CopySpecToProjectIfNeeded ` -specCloneRoot $specCloneDir ` -mainSpecDir $specSubDirectory ` - -dest $tempTypespecDir ` + -dest $tempTypeSpecDir ` -specAdditionalSubDirectories $configuration["additionalDirectories"]