Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Modify the 'mkvsix' tool itself to support the Visual Studio 2015 CTP. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | vsix2015 |
Files: | files | file ages | folders |
SHA1: |
e0b7a191f3c22d9eacf645c58be59e0f |
User & Date: | mistachkin 2015-04-19 23:39:05.488 |
Context
2015-04-19
| ||
23:40 | Merge updates from trunk. (check-in: 59d1a3bb60 user: mistachkin tags: vsix2015) | |
23:39 | Modify the 'mkvsix' tool itself to support the Visual Studio 2015 CTP. (check-in: e0b7a191f3 user: mistachkin tags: vsix2015) | |
21:43 | Fix harmless compiler warnings seen with MSVC 2015. (check-in: d05becd873 user: mistachkin tags: vsix2015) | |
Changes
Changes to tool/mkvsix.tcl.
︙ | ︙ | |||
170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | set file_id [open $fileName {WRONLY CREAT TRUNC}] fconfigure $file_id -encoding binary -translation binary puts -nonewline $file_id $data close $file_id return "" } proc getMinVsVersionXmlChunk { vsVersion } { switch -exact $vsVersion { 2012 { return [appendArgs \ "\r\n " {MinVSVersion="11.0"}] } 2013 { return [appendArgs \ "\r\n " {MinVSVersion="12.0"}] } default { return "" } } } proc getMaxPlatformVersionXmlChunk { packageFlavor vsVersion } { # | > > > > > > > > > > | > | > | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | set file_id [open $fileName {WRONLY CREAT TRUNC}] fconfigure $file_id -encoding binary -translation binary puts -nonewline $file_id $data close $file_id return "" } # # TODO: Modify this procedure when a new version of Visual Studio is released. # proc getMinVsVersionXmlChunk { vsVersion } { switch -exact $vsVersion { 2012 { return [appendArgs \ "\r\n " {MinVSVersion="11.0"}] } 2013 { return [appendArgs \ "\r\n " {MinVSVersion="12.0"}] } 2015 { return [appendArgs \ "\r\n " {MinVSVersion="14.0"}] } default { return "" } } } # # TODO: Modify this procedure when a new version of Visual Studio is released. # proc getMaxPlatformVersionXmlChunk { packageFlavor vsVersion } { # # NOTE: Only Visual Studio 2013 and later support this attribute within the # SDK manifest. # if {![string equal $vsVersion 2013] && \ ![string equal $vsVersion 2015]} then { return "" } switch -exact $packageFlavor { WinRT { return [appendArgs \ "\r\n " {MaxPlatformVersion="8.0"}] |
︙ | ︙ | |||
217 218 219 220 221 222 223 224 225 226 227 228 229 230 | } default { return "" } } } proc getExtraFileListXmlChunk { packageFlavor vsVersion } { # # NOTE: Windows Phone 8.0 does not require any extra attributes in its VSIX # package SDK manifests; however, it appears that Windows Phone 8.1 # does. # if {[string equal $packageFlavor WP80]} then { | > > > | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | } default { return "" } } } # # TODO: Modify this procedure when a new version of Visual Studio is released. # proc getExtraFileListXmlChunk { packageFlavor vsVersion } { # # NOTE: Windows Phone 8.0 does not require any extra attributes in its VSIX # package SDK manifests; however, it appears that Windows Phone 8.1 # does. # if {[string equal $packageFlavor WP80]} then { |
︙ | ︙ | |||
241 242 243 244 245 246 247 248 249 250 251 252 253 254 | "\r\n " {DependsOn="Microsoft.VCLibs, version=11.0"}] } 2013 { return [appendArgs \ "\r\n " AppliesTo=\" $appliesTo \" \ "\r\n " {DependsOn="Microsoft.VCLibs, version=12.0"}] } default { return "" } } } proc replaceFileNameTokens { fileName name buildName platformName } { | > > > > > > > > | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 | "\r\n " {DependsOn="Microsoft.VCLibs, version=11.0"}] } 2013 { return [appendArgs \ "\r\n " AppliesTo=\" $appliesTo \" \ "\r\n " {DependsOn="Microsoft.VCLibs, version=12.0"}] } 2015 { # # TODO: Is the ".AppLocal" suffix always needed here? # return [appendArgs \ "\r\n " AppliesTo=\" $appliesTo \" \ "\r\n " {DependsOn="Microsoft.VCLibs.AppLocal, version=14.0"}] } default { return "" } } } proc replaceFileNameTokens { fileName name buildName platformName } { |
︙ | ︙ | |||
350 351 352 353 354 355 356 | set vsVersion 2012 } if {[string length $vsVersion] == 0} then { fail "invalid Visual Studio version" } | | > | > > | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 | set vsVersion 2012 } if {[string length $vsVersion] == 0} then { fail "invalid Visual Studio version" } if {![string equal $vsVersion 2012] && ![string equal $vsVersion 2013] && \ ![string equal $vsVersion 2015]} then { fail [appendArgs \ "unsupported Visual Studio version, must be one of: " \ [list 2012 2013 2015]] } set shortNames(WinRT,2012) SQLite.WinRT set shortNames(WinRT,2013) SQLite.WinRT.2013 set shortNames(WinRT81,2013) SQLite.WinRT81 set shortNames(WP80,2012) SQLite.WP80 set shortNames(WP80,2013) SQLite.WP80.2013 set shortNames(WP81,2013) SQLite.WP81 set shortNames(Win32,2012) SQLite.Win32 set shortNames(Win32,2013) SQLite.Win32.2013 set shortNames(UAP,2015) SQLite.UAP.2015 set displayNames(WinRT,2012) "SQLite for Windows Runtime" set displayNames(WinRT,2013) "SQLite for Windows Runtime" set displayNames(WinRT81,2013) "SQLite for Windows Runtime (Windows 8.1)" set displayNames(WP80,2012) "SQLite for Windows Phone" set displayNames(WP80,2013) "SQLite for Windows Phone" set displayNames(WP81,2013) "SQLite for Windows Phone 8.1" set displayNames(Win32,2012) "SQLite for Windows" set displayNames(Win32,2013) "SQLite for Windows" set displayNames(UAP,2015) "SQLite for Universal App Platform" if {[string equal $packageFlavor WinRT]} then { set shortName $shortNames($packageFlavor,$vsVersion) set displayName $displayNames($packageFlavor,$vsVersion) set targetPlatformIdentifier Windows set targetPlatformVersion v8.0 set minVsVersion [getMinVsVersionXmlChunk $vsVersion] |
︙ | ︙ | |||
426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 | set displayName $displayNames($packageFlavor,$vsVersion) set targetPlatformIdentifier WindowsPhoneApp set targetPlatformVersion v8.1 set minVsVersion [getMinVsVersionXmlChunk $vsVersion] set maxPlatformVersion \ [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion] set extraSdkPath "\\..\\$targetPlatformIdentifier" set extraFileListAttributes \ [getExtraFileListXmlChunk $packageFlavor $vsVersion] } elseif {[string equal $packageFlavor Win32]} then { set shortName $shortNames($packageFlavor,$vsVersion) set displayName $displayNames($packageFlavor,$vsVersion) set targetPlatformIdentifier Windows set targetPlatformVersion v8.0 set minVsVersion [getMinVsVersionXmlChunk $vsVersion] set maxPlatformVersion \ [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion] set extraSdkPath "" set extraFileListAttributes \ [getExtraFileListXmlChunk $packageFlavor $vsVersion] } else { fail [appendArgs \ "unsupported package flavor, must be one of: " \ | > > > > > > > > > > > > > > > > | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | set displayName $displayNames($packageFlavor,$vsVersion) set targetPlatformIdentifier WindowsPhoneApp set targetPlatformVersion v8.1 set minVsVersion [getMinVsVersionXmlChunk $vsVersion] set maxPlatformVersion \ [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion] set extraSdkPath "\\..\\$targetPlatformIdentifier" set extraFileListAttributes \ [getExtraFileListXmlChunk $packageFlavor $vsVersion] } elseif {[string equal $packageFlavor UAP]} then { if {$vsVersion ne "2015"} then { fail [appendArgs \ "unsupported combination, package flavor " $packageFlavor \ " is only supported with Visual Studio 2015"] } set shortName $shortNames($packageFlavor,$vsVersion) set displayName $displayNames($packageFlavor,$vsVersion) set targetPlatformIdentifier UAP set targetPlatformVersion v0.8.0.0 set minVsVersion [getMinVsVersionXmlChunk $vsVersion] set maxPlatformVersion \ [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion] set extraSdkPath "\\..\\$targetPlatformIdentifier" set extraFileListAttributes \ [getExtraFileListXmlChunk $packageFlavor $vsVersion] } elseif {[string equal $packageFlavor Win32]} then { set shortName $shortNames($packageFlavor,$vsVersion) set displayName $displayNames($packageFlavor,$vsVersion) set targetPlatformIdentifier Windows set targetPlatformVersion v8.0 set minVsVersion [getMinVsVersionXmlChunk $vsVersion] set maxPlatformVersion \ [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion] set extraSdkPath "" set extraFileListAttributes \ [getExtraFileListXmlChunk $packageFlavor $vsVersion] } else { fail [appendArgs \ "unsupported package flavor, must be one of: " \ [list WinRT WinRT81 WP80 WP81 UAP Win32]] } ############################################################################### # # NOTE: Evaluate the user-specific customizations file, if it exists. # |
︙ | ︙ |