From d1df265ae6fa4b050c567925af3bb6e982381445 Mon Sep 17 00:00:00 2001
From: Avee <muhtaufikt@gmail.com>
Date: Wed, 23 Dec 2020 14:24:39 +0700
Subject: [x-plane] Update to 3.0.3 (#15244)

---
 ports/x-plane/CONTROL        |  4 ----
 ports/x-plane/portfile.cmake | 36 +++++++++++++++++++-----------------
 ports/x-plane/vcpkg.json     |  7 +++++++
 scripts/ci.baseline.txt      |  4 ----
 4 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 ports/x-plane/CONTROL
 create mode 100644 ports/x-plane/vcpkg.json

diff --git a/ports/x-plane/CONTROL b/ports/x-plane/CONTROL
deleted file mode 100644
index de1217a60..000000000
--- a/ports/x-plane/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: x-plane
-Version: 3.0.1-1
-Description: The X-Plane Plugin SDK.
-Supports: !x86
\ No newline at end of file
diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake
index ccd3007e8..56ea2e77e 100644
--- a/ports/x-plane/portfile.cmake
+++ b/ports/x-plane/portfile.cmake
@@ -1,11 +1,9 @@
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-    message(FATAL_ERROR "the x-plane SDK cannot be built for the x86 architecture")
-endif()
+vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64" "wasm32")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK301.zip
-    FILENAME XPSDK301.zip
-    SHA512 3044d606039be8230f35a5992d322d4c009b4056f8fb17e929a9f5c2204c084e2c83ddad10801b21727645ec957c8942b83938f81256ec3778dbe75df525e62a
+    URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip"
+    FILENAME "XPSDK303.zip"
+    SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395
 )
 
 vcpkg_extract_source_archive_ex(
@@ -13,25 +11,29 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
 )
 
-file(MAKE_DIRECTORY
-    ${CURRENT_PACKAGES_DIR}/lib
-    ${CURRENT_PACKAGES_DIR}/debug/lib
-)
+# create lib dir
+if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
+    file(MAKE_DIRECTORY
+        ${CURRENT_PACKAGES_DIR}/lib
+        ${CURRENT_PACKAGES_DIR}/debug/lib
+    )   
+endif()
 
+# copy headers & sources
 file(COPY ${SOURCE_PATH}/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(COPY ${SOURCE_PATH}/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(COPY ${SOURCE_PATH}/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+# copy prebuilt libs
+if(VCPKG_TARGET_IS_WINDOWS)
     file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
     file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
     file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
     file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    file(COPY ${SOURCE_PATH}/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+elseif (VCPKG_TARGET_IS_OSX)
+    file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
 endif()
 
-file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/x-plane/ RENAME copyright)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/x-plane/vcpkg.json b/ports/x-plane/vcpkg.json
new file mode 100644
index 000000000..4884ca8e8
--- /dev/null
+++ b/ports/x-plane/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "x-plane",
+  "version-string": "3.0.3",
+  "description": "The X-Plane Plugin SDK",
+  "homepage": "https://developer.x-plane.com/sdk/",
+  "supports": "!(x86 | arm | wasm32)"
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 24c51949d..d8c655e1b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1623,10 +1623,6 @@ xmsh:x64-uwp=skip
 xmsh:x64-windows-static=skip
 xmsh:x64-windows=skip
 xmsh:x86-windows=skip
-x-plane:arm64-windows=fail
-x-plane:arm-uwp=fail
-x-plane:x64-linux=fail
-x-plane:x86-windows=fail
 yajl:arm-uwp=fail
 yajl:x64-uwp=fail
 yara:arm-uwp=fail
-- 
cgit v1.2.3