Index: third_party/sqlite/src/tool/mkvsix.tcl |
diff --git a/third_party/sqlite/src/tool/mkvsix.tcl b/third_party/sqlite/src/tool/mkvsix.tcl |
index b7c5983dbe270694f6800282b5eefde1c1fb3da1..c874d538fbe0300f616ae7cf25430cddca6cbee2 100644 |
--- a/third_party/sqlite/src/tool/mkvsix.tcl |
+++ b/third_party/sqlite/src/tool/mkvsix.tcl |
@@ -77,7 +77,7 @@ |
# command prompt: |
# |
# CD /D C:\dev\sqlite\core |
-# tclsh85 tool\mkvsix.tcl C:\Temp |
+# tclsh tool\mkvsix.tcl C:\Temp |
# |
# In the example above, "C:\dev\sqlite\core" represents the root of the source |
# tree for SQLite and "C:\Temp" represents the top-level directory containing |
@@ -389,7 +389,7 @@ 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 shortNames(UWP,2015) SQLite.UWP.2015 |
set displayNames(WinRT,2012) "SQLite for Windows Runtime" |
set displayNames(WinRT,2013) "SQLite for Windows Runtime" |
@@ -399,7 +399,7 @@ 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" |
+set displayNames(UWP,2015) "SQLite for Universal Windows Platform" |
if {[string equal $packageFlavor WinRT]} then { |
set shortName $shortNames($packageFlavor,$vsVersion) |
@@ -455,7 +455,7 @@ if {[string equal $packageFlavor WinRT]} then { |
set extraSdkPath "\\..\\$targetPlatformIdentifier" |
set extraFileListAttributes \ |
[getExtraFileListXmlChunk $packageFlavor $vsVersion] |
-} elseif {[string equal $packageFlavor UAP]} then { |
+} elseif {[string equal $packageFlavor UWP]} then { |
if {$vsVersion ne "2015"} then { |
fail [appendArgs \ |
"unsupported combination, package flavor " $packageFlavor \ |
@@ -463,7 +463,7 @@ if {[string equal $packageFlavor WinRT]} then { |
} |
set shortName $shortNames($packageFlavor,$vsVersion) |
set displayName $displayNames($packageFlavor,$vsVersion) |
- set targetPlatformIdentifier UAP |
+ set targetPlatformIdentifier UAP; # NOTE: Not "UWP". |
set targetPlatformVersion v0.8.0.0 |
set minVsVersion [getMinVsVersionXmlChunk $vsVersion] |
set maxPlatformVersion \ |
@@ -485,7 +485,7 @@ if {[string equal $packageFlavor WinRT]} then { |
} else { |
fail [appendArgs \ |
"unsupported package flavor, must be one of: " \ |
- [list WinRT WinRT81 WP80 WP81 UAP Win32]] |
+ [list WinRT WinRT81 WP80 WP81 UWP Win32]] |
} |
############################################################################### |