/ Check-in [0a4f5967]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:When using Visual Studio 2013, add the appropriate MaxPlatformVersion attribute to the VSIX SDK manifest.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0a4f59676bd0ab33b2c86c9a35a2ebbdbaf09ee7
User & Date: mistachkin 2014-05-10 17:28:45
Context
2014-05-12
20:04
Experimental code to prevent FTS indexes from growing indefinitely as the table is updated. check-in: b3b505a4 user: dan tags: fts4-experimental
15:37
In mutex_w32.c, make inclusion of the Windows header file dependent on SQLITE_OS_WIN, not SQLITE_MUTEX_W32. check-in: 93ffbcc0 user: mistachkin tags: trunk
2014-05-10
17:33
Merge updates from trunk. Emit the AppliesTo and DependsOn SDK manifest attributes when building the VSIX for Windows Phone 8.1. Closed-Leaf check-in: f6237a5f user: mistachkin tags: vsixWinPhone81
17:28
When using Visual Studio 2013, add the appropriate MaxPlatformVersion attribute to the VSIX SDK manifest. check-in: 0a4f5967 user: mistachkin tags: trunk
2014-05-09
20:51
When cross-compiling with the MSVC makefile, make sure the correct library path is used. Also, keep track of the required compilation options separately. check-in: c3dce2e7 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tool/mkvsix.tcl.

   184    184             "\r\n    " {MinVSVersion="12.0"}]
   185    185       }
   186    186       default {
   187    187         return ""
   188    188       }
   189    189     }
   190    190   }
          191  +
          192  +proc getMaxPlatformVersionXmlChunk { packageFlavor vsVersion } {
          193  +  #
          194  +  # NOTE: Only Visual Studio 2013 supports this SDK manifest attribute.
          195  +  #
          196  +  if {![string equal $vsVersion 2013]} then {
          197  +    return ""
          198  +  }
          199  +
          200  +  switch -exact $packageFlavor {
          201  +    WinRT {
          202  +      return [appendArgs \
          203  +          "\r\n    " {MaxPlatformVersion="8.0"}]
          204  +    }
          205  +    WinRT81 {
          206  +      return [appendArgs \
          207  +          "\r\n    " {MaxPlatformVersion="8.1"}]
          208  +    }
          209  +    WP80 {
          210  +      return [appendArgs \
          211  +          "\r\n    " {MaxPlatformVersion="8.0"}]
          212  +    }
          213  +    default {
          214  +      return ""
          215  +    }
          216  +  }
          217  +}
   191    218   
   192    219   proc getExtraFileListXmlChunk { packageFlavor vsVersion } {
   193    220     #
   194    221     # NOTE: Windows Phone 8.0 does not require any extra attributes in its VSIX
   195    222     #       package SDK manifests.
   196    223     #
   197    224     if {[string equal $packageFlavor WP80]} then {
................................................................................
   317    344     set vsVersion 2012
   318    345   }
   319    346   
   320    347   if {[string length $vsVersion] == 0} then {
   321    348     fail "invalid Visual Studio version"
   322    349   }
   323    350   
   324         -if {$vsVersion ne "2012" && $vsVersion ne "2013"} then {
          351  +if {![string equal $vsVersion 2012] && ![string equal $vsVersion 2013]} then {
   325    352     fail [appendArgs \
   326    353         "unsupported Visual Studio version, must be one of: " \
   327    354         [list 2012 2013]]
   328    355   }
   329    356   
   330    357   set shortNames(WinRT,2012) SQLite.WinRT
   331    358   set shortNames(WinRT,2013) SQLite.WinRT.2013
................................................................................
   345    372   
   346    373   if {[string equal $packageFlavor WinRT]} then {
   347    374     set shortName $shortNames($packageFlavor,$vsVersion)
   348    375     set displayName $displayNames($packageFlavor,$vsVersion)
   349    376     set targetPlatformIdentifier Windows
   350    377     set targetPlatformVersion v8.0
   351    378     set minVsVersion [getMinVsVersionXmlChunk $vsVersion]
          379  +  set maxPlatformVersion \
          380  +      [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion]
   352    381     set extraSdkPath ""
   353    382     set extraFileListAttributes \
   354    383         [getExtraFileListXmlChunk $packageFlavor $vsVersion]
   355    384   } elseif {[string equal $packageFlavor WinRT81]} then {
   356    385     if {$vsVersion ne "2013"} then {
   357    386       fail [appendArgs \
   358    387           "unsupported combination, package flavor " $packageFlavor \
................................................................................
   359    388           " is only supported with Visual Studio 2013"]
   360    389     }
   361    390     set shortName $shortNames($packageFlavor,$vsVersion)
   362    391     set displayName $displayNames($packageFlavor,$vsVersion)
   363    392     set targetPlatformIdentifier Windows
   364    393     set targetPlatformVersion v8.1
   365    394     set minVsVersion [getMinVsVersionXmlChunk $vsVersion]
          395  +  set maxPlatformVersion \
          396  +      [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion]
   366    397     set extraSdkPath ""
   367    398     set extraFileListAttributes \
   368    399         [getExtraFileListXmlChunk $packageFlavor $vsVersion]
   369    400   } elseif {[string equal $packageFlavor WP80]} then {
   370    401     set shortName $shortNames($packageFlavor,$vsVersion)
   371    402     set displayName $displayNames($packageFlavor,$vsVersion)
   372    403     set targetPlatformIdentifier "Windows Phone"
   373    404     set targetPlatformVersion v8.0
   374    405     set minVsVersion [getMinVsVersionXmlChunk $vsVersion]
          406  +  set maxPlatformVersion \
          407  +      [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion]
   375    408     set extraSdkPath "\\..\\$targetPlatformIdentifier"
   376    409     set extraFileListAttributes \
   377    410         [getExtraFileListXmlChunk $packageFlavor $vsVersion]
   378    411   } elseif {[string equal $packageFlavor Win32]} then {
   379    412     set shortName $shortNames($packageFlavor,$vsVersion)
   380    413     set displayName $displayNames($packageFlavor,$vsVersion)
   381    414     set targetPlatformIdentifier Windows
   382    415     set targetPlatformVersion v8.0
   383    416     set minVsVersion [getMinVsVersionXmlChunk $vsVersion]
          417  +  set maxPlatformVersion \
          418  +      [getMaxPlatformVersionXmlChunk $packageFlavor $vsVersion]
   384    419     set extraSdkPath ""
   385    420     set extraFileListAttributes \
   386    421         [getExtraFileListXmlChunk $packageFlavor $vsVersion]
   387    422   } else {
   388    423     fail [appendArgs \
   389    424         "unsupported package flavor, must be one of: " \
   390    425         [list WinRT WinRT81 WP80 Win32]]

Changes to tool/win/sqlite.vsix.

cannot compute difference between binary files