Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Pickup release archive verification tool changes from upstream. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
2451d95590cd6ff025875f650fb6b4a0 |
User & Date: | mistachkin 2017-10-08 04:57:41.543 |
Context
2017-10-08
| ||
21:55 | Pickup release archive verification tool changes from upstream. Add NuGet packages in the master release archive manifest. check-in: 68b09a1bbd user: mistachkin tags: trunk | |
04:57 | Pickup release archive verification tool changes from upstream. check-in: 2451d95590 user: mistachkin tags: trunk | |
2017-10-04
| ||
19:52 | Stop using ToString calls within the parameter binding subsystem that do not take into account the configured culture information. check-in: fb6160ee72 user: mistachkin tags: trunk | |
Changes
Changes to Setup/verify.eagle.
︙ | ︙ | |||
183 184 185 186 187 188 189 | usage "no repository hashes are available" } } set hashPrefix [expr {$failHashes ? "ERROR" : "WARNING"}] set archiveFileNames [list] | | | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | usage "no repository hashes are available" } } set hashPrefix [expr {$failHashes ? "ERROR" : "WARNING"}] set archiveFileNames [list] foreach extension [list exe nupkg rar zip] { eval lappend archiveFileNames [findFilesRecursive \ [file join $directory [appendArgs *. $extension]]] } foreach archiveFileName $archiveFileNames { set manifest [file tail $archiveFileName] |
︙ | ︙ | |||
208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 | # # HACK: Attempt to match and remove sub-strings from the # manifest file name that look like the name of a # build configuration (e.g. "debug" or "release"). # regsub -- {-debug-|-release-} $manifest {-} manifest # # HACK: Attempt to match and remove sub-strings from the # manifest file name that look like a version number # in the format "<major>.<minor>.<build>.<revision>" # and/or a date/time string matching the format # "YYYY-MM-DD-NN" (where the NN portion is a generic # incrementing sequence number). # regsub -- {\d+\.\d+\.\d+\.\d+} $manifest {} manifest regsub -- {\d{4}-\d{2}-\d{2}-\d{2}} $manifest {} manifest if {![info exists manifests($manifest)]} then { puts stdout [appendArgs \ "WARNING: Cannot find master manifest \"" \ $manifest "\" for archive \"" $archiveFileName \ "\", skipped."] | > > > > > > > > > > > > > > > > > > > > > > | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 | # # HACK: Attempt to match and remove sub-strings from the # manifest file name that look like the name of a # build configuration (e.g. "debug" or "release"). # regsub -- {-debug-|-release-} $manifest {-} manifest # # HACK: Special hack to allow "CLRvX" to appear in the # manifest file names, part 1, the vanishing. # set manifest [string map \ [list CLRv2 CLRvTWO CLRv4 CLRvFOUR] $manifest] # # HACK: Attempt to match and remove sub-strings from the # manifest file name that look like a version number # in the format "<major>.<minor>.<build>.<revision>" # and/or a date/time string matching the format # "YYYY-MM-DD-NN" (where the NN portion is a generic # incrementing sequence number). # regsub -- {\d+\.\d+\.\d+\.\d+} $manifest {} manifest regsub -- {\d{4}-\d{2}-\d{2}-\d{2}} $manifest {} manifest # # HACK: Special hack to allow "CLRvX" to appear in the # manifest file names, part 2, the return. # set manifest [string map \ [list CLRvTWO CLRv2 CLRvFOUR CLRv4] $manifest] # # HACK: Fixup manifest file names that correspond to the # NuGet packages for SymbolSource. # if {[regexp -- {[/\\]SymbolSource[/\\]} $archiveFileName]} then { set manifest [string map [list .. .Source..] $manifest] } if {![info exists manifests($manifest)]} then { puts stdout [appendArgs \ "WARNING: Cannot find master manifest \"" \ $manifest "\" for archive \"" $archiveFileName \ "\", skipped."] |
︙ | ︙ | |||
250 251 252 253 254 255 256 | set listCommand [list] lappend listCommand exec -success Success -nocarriagereturns -- set extractCommand [list] lappend extractCommand exec -success Success -nocarriagereturns -- | | | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | set listCommand [list] lappend listCommand exec -success Success -nocarriagereturns -- set extractCommand [list] lappend extractCommand exec -success Success -nocarriagereturns -- if {[file extension $archiveFileName] in [list .nupkg .zip]} then { if {![file exists $zip]} then { usage [appendArgs "tool \"" $zip "\" is missing"] } lappend listCommand $zip -Z -1 $archiveFileName lappend extractCommand $zip -j -o $archiveFileName \ |
︙ | ︙ | |||
285 286 287 288 289 290 291 | } if {[catch {eval $listCommand} result] == 0} then { # # HACK: The Inno Setup unpacking tool requires some extra # parsing logic to handle the output. # | < | > | | > > > > > > > > > > > > | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | } if {[catch {eval $listCommand} result] == 0} then { # # HACK: The Inno Setup unpacking tool requires some extra # parsing logic to handle the output. # set containedFileNames [list] if {[string first [file tail $innounp] $listCommand] != -1} then { foreach {dummy matchFileName} [regexp -line -all -inline -- \ {^[ 0-9]{10} \d{4}\.\d{2}\.\d{2} \d{2}:\d{2} (.*)$} $result] { # # NOTE: Add the file name extracted from the output # line to the list of file names contained in # this archive. # lappend containedFileNames $matchFileName } } else { foreach matchFileName [split [string map [list \\ /] [string \ trim $result]] \n] { # # NOTE: Replace the dynamically calculated MD5 hash # for the special NuGet package file name, if # needed. # if {[file extension $matchFileName] eq ".psmdcp"} then { regsub -- {/[0-9a-f]{32}\.} $matchFileName {/${md5}.} \ matchFileName } lappend containedFileNames $matchFileName } } foreach manifestFileName $manifestFileNames { # # TODO: Should we use -nocase here because Windows # is the primary release platform? # |
︙ | ︙ |