Naming updates for Universal Windows Platform.

sxlxnyw · Feb 12, 2016 · 6978a62 · 6978a62
1 parent 70747b7
commit 6978a62
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/Makefile.msc b/Makefile.msc
@@ -126,12 +126,12 @@ USE_RC = 1
 FOR_WINRT = 0
 !ENDIF
 
-# Set this non-0 to compile binaries suitable for the UAP environment.
+# Set this non-0 to compile binaries suitable for the UWP environment.
 # This setting does not apply to any binaries that require Tcl to operate
 # properly (i.e. the text fixture, etc).
 #
-!IFNDEF FOR_UAP
-FOR_UAP = 0
+!IFNDEF FOR_UWP
+FOR_UWP = 0
 !ENDIF
 
 # Set this non-0 to compile binaries suitable for the Windows 10 platform.
@@ -907,10 +907,10 @@ LTLINKOPTS = $(LTLINKOPTS) WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelH
 LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:ole32.lib
 !ENDIF
 
-# When compiling for UAP or the Windows 10 platform, some extra linker
+# When compiling for UWP or the Windows 10 platform, some extra linker
 # options are also required.
 #
-!IF $(FOR_UAP)!=0 || $(FOR_WIN10)!=0
+!IF $(FOR_UWP)!=0 || $(FOR_WIN10)!=0
 LTLINKOPTS = $(LTLINKOPTS) /DYNAMICBASE /NODEFAULTLIB:kernel32.lib
 LTLINKOPTS = $(LTLINKOPTS) mincore.lib
 !IFDEF PSDKLIBPATH

diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
@@ -119,12 +119,12 @@ USE_RC = 1
 FOR_WINRT = 0
 !ENDIF
 
-# Set this non-0 to compile binaries suitable for the UAP environment.
+# Set this non-0 to compile binaries suitable for the UWP environment.
 # This setting does not apply to any binaries that require Tcl to operate
 # properly (i.e. the text fixture, etc).
 #
-!IFNDEF FOR_UAP
-FOR_UAP = 0
+!IFNDEF FOR_UWP
+FOR_UWP = 0
 !ENDIF
 
 # Set this non-0 to compile binaries suitable for the Windows 10 platform.
@@ -802,10 +802,10 @@ LTLINKOPTS = $(LTLINKOPTS) WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelH
 LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:ole32.lib
 !ENDIF
 
-# When compiling for UAP or the Windows 10 platform, some extra linker
+# When compiling for UWP or the Windows 10 platform, some extra linker
 # options are also required.
 #
-!IF $(FOR_UAP)!=0 || $(FOR_WIN10)!=0
+!IF $(FOR_UWP)!=0 || $(FOR_WIN10)!=0
 LTLINKOPTS = $(LTLINKOPTS) /DYNAMICBASE /NODEFAULTLIB:kernel32.lib
 LTLINKOPTS = $(LTLINKOPTS) mincore.lib
 !IFDEF PSDKLIBPATH

diff --git a/autoconf/README.txt b/autoconf/README.txt
@@ -75,10 +75,10 @@ NMAKE command line as well:
 
   "NSDKLIBPATH=%WindowsSdkDir%\..\8.1\lib\winv6.3\um\x86"
 
-Building for UAP 10.0
+Building for UWP 10.0
 ---------------------
 
-  FOR_WINRT=1 FOR_UAP=1
+  FOR_WINRT=1 FOR_UWP=1
 
 Using Microsoft Visual C++ 2015 (or later) is required.  When using the
 above, something like the following macros will need to be added to the

diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
@@ -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,15 +455,15 @@ 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 \
         " is only supported with Visual Studio 2015"]
   }
   set shortName $shortNames($packageFlavor,$vsVersion)
   set displayName $displayNames($packageFlavor,$vsVersion)
-  set targetPlatformIdentifier UAP
+  set targetPlatformIdentifier 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]]
 }
 
 ###############################################################################