Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: third_party/sqlite/src/tool/mkvsix.tcl

Issue 1610963002: Import SQLite 3.10.2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/tool/mksqlite3internalh.tcl ('k') | third_party/sqlite/src/tool/opcodeDoc.awk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 208ce2b14211e1df899e292f9150be470fa38632..b7c5983dbe270694f6800282b5eefde1c1fb3da1 100644
--- a/third_party/sqlite/src/tool/mkvsix.tcl
+++ b/third_party/sqlite/src/tool/mkvsix.tcl
@@ -174,6 +174,9 @@ proc writeFile { fileName data } {
return ""
}
+#
+# TODO: Modify this procedure when a new version of Visual Studio is released.
+#
proc getMinVsVersionXmlChunk { vsVersion } {
switch -exact $vsVersion {
2012 {
@@ -184,17 +187,26 @@ proc getMinVsVersionXmlChunk { vsVersion } {
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 supports this SDK manifest attribute.
+ # NOTE: Only Visual Studio 2013 and later support this attribute within the
+ # SDK manifest.
#
- if {![string equal $vsVersion 2013]} then {
+ if {![string equal $vsVersion 2013] && \
+ ![string equal $vsVersion 2015]} then {
return ""
}
@@ -221,6 +233,9 @@ proc getMaxPlatformVersionXmlChunk { packageFlavor vsVersion } {
}
}
+#
+# 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
@@ -245,6 +260,11 @@ proc getExtraFileListXmlChunk { packageFlavor vsVersion } {
"\r\n " AppliesTo=\" $appliesTo \" \
"\r\n " {DependsOn="Microsoft.VCLibs, version=12.0"}]
}
+ 2015 {
+ return [appendArgs \
+ "\r\n " AppliesTo=\" $appliesTo \" \
+ "\r\n " {DependsOn="Microsoft.VCLibs, version=14.0"}]
+ }
default {
return ""
}
@@ -354,10 +374,11 @@ if {[string length $vsVersion] == 0} then {
fail "invalid Visual Studio version"
}
-if {![string equal $vsVersion 2012] && ![string equal $vsVersion 2013]} then {
+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]]
+ [list 2012 2013 2015]]
}
set shortNames(WinRT,2012) SQLite.WinRT
@@ -368,6 +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 displayNames(WinRT,2012) "SQLite for Windows Runtime"
set displayNames(WinRT,2013) "SQLite for Windows Runtime"
@@ -377,6 +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"
if {[string equal $packageFlavor WinRT]} then {
set shortName $shortNames($packageFlavor,$vsVersion)
@@ -432,6 +455,22 @@ if {[string equal $packageFlavor WinRT]} then {
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)
@@ -446,7 +485,7 @@ if {[string equal $packageFlavor WinRT]} then {
} else {
fail [appendArgs \
"unsupported package flavor, must be one of: " \
- [list WinRT WinRT81 WP80 WP81 Win32]]
+ [list WinRT WinRT81 WP80 WP81 UAP Win32]]
}
###############################################################################
« no previous file with comments | « third_party/sqlite/src/tool/mksqlite3internalh.tcl ('k') | third_party/sqlite/src/tool/opcodeDoc.awk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698