[wtl] Remove 'wtl' subdirectory to conform to upstream (microsoft#25108)

* [wtl] Fix internal include path * more double quotes * change to version * version * typo * version * Add license * version * Apply suggestion * version
jiayuehua · Jun 8, 2022 · 1323f4b · 1323f4b
1 parent 5d992a4
commit 1323f4b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake
@@ -4,14 +4,14 @@ vcpkg_from_sourceforge(
     REF WTL%2010.0.10320%20Release
     FILENAME "WTL10_10320_Release.zip"
     NO_REMOVE_ONE_LEVEL
-	SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309
-	PATCHES
-		appwizard_setup.js-vs2022.patch
-		atlmisc.h-bug329.patch
+    SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309
+    PATCHES
+        appwizard_setup.js-vs2022.patch
+        atlmisc.h-bug329.patch
 )
 
-file(INSTALL ${SOURCE_PATH}/Include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.h")
-file(COPY ${SOURCE_PATH}/Samples DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(COPY ${SOURCE_PATH}/AppWizard DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${SOURCE_PATH}/Include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h")
+file(COPY "${SOURCE_PATH}/Samples" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${SOURCE_PATH}/AppWizard" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(INSTALL ${SOURCE_PATH}/MS-PL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/MS-PL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/wtl/vcpkg.json b/ports/wtl/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "wtl",
-  "version-string": "10.0.10320",
-  "port-version": 2,
+  "version": "10.0.10320",
+  "port-version": 3,
   "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.",
-  "homepage": "https://sourceforge.net/projects/wtl/"
+  "homepage": "https://sourceforge.net/projects/wtl/",
+  "license": "MS-PL"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7582,7 +7582,7 @@
     },
     "wtl": {
       "baseline": "10.0.10320",
-      "port-version": 2
+      "port-version": 3
     },
     "wxchartdir": {
       "baseline": "2.0.0",

diff --git a/versions/w-/wtl.json b/versions/w-/wtl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "77302be4bab5f3221389c7948462e15ac941002b",
+      "version": "10.0.10320",
+      "port-version": 3
+    },
     {
       "git-tree": "3345336300f47e924a80d3be0f3fb76c558a54fe",
       "version-string": "10.0.10320",