2 Commits

Author	SHA1	Message	Date
Alexander Neumann	624f1b4eca	[jemalloc|vcpkg_configure_make] update and some script fixes (#25009) ... * WIP commit * more jemalloc wip * v db * add license * v db * apply format diff * fix script * WIP commit * fix ARFLAGS for the wrapper * CR stuff * v db * use separate_arguments to add -Wl, to linker flags * say "-Xlinker" three times and it will come. * make assembler compile only. * disable _FOR_BUILD if crosscompiling. use function instead of macro. Remove AS settings * ignore settings for osx until somebody knows how to fix it. * CR z_vcpkg_make_set_env * CI retrigger * make conflicting options an error * remove DEFINED since the options are always defined	2022-08-19 15:13:23 -07:00
Billy O'Neal	b295670e4b	Bulk convert control files. (#19986) ... ``` function Convert-Control { Param($full) .\vcpkg.exe format-manifest $full $root = $full.Substring(0, $full.Length - 7) # CONTROL $new = $root + 'vcpkg.json' $content = Get-Content -Raw $new $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100 $oldVersion = $asJson['port-version'] if ($null -eq $oldVersion) { $oldVersionFull = $asJson['version-string'] Write-Host "Got version $oldVersionFull" $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$') if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) { $newFullVersion = [string]$match.Groups[1].Value $oldVersion = [int]$match.Groups[2].Value Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion" $newVersion = $oldVersion + 1 $asJson['version-string'] = $newFullVersion Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion" } else { Write-Host "No previous version for $full -- setting 1" $newVersion = 1 } } else { $newVersion = [int]$oldVersion + 1 Write-Host "New version for $full : $newVersion" } $asJson['port-version'] = $newVersion $content = ConvertTo-Json $asJson -Depth 100 Set-Content -Path $new -Value $content .\vcpkg.exe format-manifest $new } Get-ChildItem ports\CONTROL -Recurse | Foreach-Object { Convert-Control $_.FullName } git commit -am "this message" .\vcpkg.exe x-add-version -all git commit -a --amend ```	2021-09-09 01:24:04 -07:00