DebugServer: update dependencies

joelday · Sep 1, 2023 · 86b2e1b · 86b2e1b
1 parent 274a163
commit 86b2e1b
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 99 deletions.
diff --git a/dependencies/ports/Champollion/portfile.cmake b/dependencies/ports/Champollion/portfile.cmake
@@ -1,28 +1,31 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Orvid/Champollion
-  REF v1.1.0
-  SHA512 a95a2f82f27da2ac71fed156e32b824ef2897400c64cf3fd2221a367b61a6cc5bd224706868a9dc8ddd5f6c0054a10943d759cc170bebadca42a58384f8d0eef
+  REF 83d7f92481c797f2732fcaed016c24f9fcfb3eba
+  SHA512 2ffd56fc9f5ec98444124d60e86771e7e5aa1f68d27bd561bcffe0d5b04ac98913e656a50131a28178d39231404bb2502737bf56c07592867b871f372fcdce95
   HEAD_REF master
 )
+
 # Check if one or more features are a part of a package installation.
 # See /docs/maintainers/vcpkg_check_features.md for more details
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   INVERTED_FEATURES
-	  standalone   CHAMPOLLION_STATIC_LIBRARY
+  standalone CHAMPOLLION_STATIC_LIBRARY
 )
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-		OPTIONS
-      ${FEATURE_OPTIONS}
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+  ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-if (${CHAMPOLLION_STATIC_LIBRARY})
+
+if(${CHAMPOLLION_STATIC_LIBRARY})
   vcpkg_cmake_config_fixup(PACKAGE_NAME Champollion CONFIG_PATH lib/cmake/Champollion)
 endif()
+
 file(
-        INSTALL "${SOURCE_PATH}/LICENSE"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-        RENAME copyright)
+  INSTALL "${SOURCE_PATH}/LICENSE"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+  RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/dependencies/ports/Champollion/vcpkg.json b/dependencies/ports/Champollion/vcpkg.json
@@ -1,16 +1,16 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/master/docs/vcpkg.schema.json",
   "name": "champollion",
-  "version-semver": "1.1.0",
+  "version-semver": "1.1.4",
   "port-version": 0,
   "description": "Papyrus Script Decompiler.",
   "homepage": "https://github.com/Orvid/Champollion",
   "license": "LGPL-3.0-only",
   "supports": "windows & x64",
-  "dependencies": [    
+  "dependencies": [
     {
-    "name": "vcpkg-cmake",
-    "host": true
+      "name": "vcpkg-cmake",
+      "host": true
     },
     {
       "name": "vcpkg-cmake-config",
@@ -20,10 +20,8 @@
   "features": {
     "standalone": {
       "description": "Build as a standalone program",
-      "dependencies": [
-        "boost-program-options"
-      ]
+      "dependencies": ["boost-program-options"]
     }
   },
   "default-features": []
-}
+}
diff --git a/dependencies/ports/commonlibf4/portfile.cmake b/dependencies/ports/commonlibf4/portfile.cmake
@@ -1,57 +1,57 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
-  REPO nikitalita/CommonLibF4
-  REF 71da8c1d96b6084795a61dce4b453583396f240b
-  SHA512 9b0c4a7ef09b7fd4362dce16cfd4bdc57b077498d534ccf7b52a28916ecafe913f24281668323612c52a558d7dc829e8840aea771f4c7818e56b2f0876deddf2
+  REPO powerof3/CommonLibF4
+  REF d3e9231e796eb5dd4b7dd3d1d778e8c1807ffc18
+  SHA512 e1ddb0cc04ee9eecba3a8e69d56bb0e6190fbe92db12f51cc1aff5c7400e4ff980cf365dfca2d3bebe5681a85925639dc33ce769bc6e6ee4da83b2b400a78476
   HEAD_REF master
 )
-     
+
 # set(SOURCE_PATH "C:\\Users\\Nikita\\Workspace\\skyrim-mod-workspace\\CommonLibF4-merge-ws\\CommonLibF4")
+if(VCPKG_HOST_IS_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND DEFINED $ENV{VisualStudioVersion})
+  set(MSVC_RUNTIME_VCPKG_CONFIG_ARG "-DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"")
 
-if ( VCPKG_HOST_IS_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND DEFINED $ENV{VisualStudioVersion} )
-  set( MSVC_RUNTIME_VCPKG_CONFIG_ARG "-DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"")
   # 2022 requires `/external:anglebrackets` to build with the above argument
-  if ( $ENV{VisualStudioVersion} STREQUAL "17.0")
-    set( CXX_FLAGS_VCPKG_CONFIG_ARG "-DCMAKE_CXX_FLAGS=\"/EHsc /MP /W4 /WX /external:anglebrackets /external:W0\"")
+  if($ENV{VisualStudioVersion} STREQUAL "17.0")
+    set(CXX_FLAGS_VCPKG_CONFIG_ARG "-DCMAKE_CXX_FLAGS=\"/EHsc /MP /W4 /WX /external:anglebrackets /external:W0\"")
   else()
-    set( CXX_FLAGS_VCPKG_CONFIG_ARG "-DCMAKE_CXX_FLAGS=\"/EHsc /MP /W4 /WX /external:W0\"")
-  endif()  
+    set(CXX_FLAGS_VCPKG_CONFIG_ARG "-DCMAKE_CXX_FLAGS=\"/EHsc /MP /W4 /WX /external:W0\"")
+  endif()
 else()
-  set( MSVC_RUNTIME_VCPKG_CONFIG_ARG "")
-  set( CXX_FLAGS_VCPKG_CONFIG_ARG "")
-endif()  
+  set(MSVC_RUNTIME_VCPKG_CONFIG_ARG "")
+  set(CXX_FLAGS_VCPKG_CONFIG_ARG "")
+endif()
 
 # set(MSVC_RUNTIME_ARG "Some Text")
 vcpkg_configure_cmake(
   SOURCE_PATH "${SOURCE_PATH}"
   PREFER_NINJA
   OPTIONS
-    -DVCPKG_OVERLAY_PORTS="${SOURCE_PATH}/cmake/ports/"
-    -DBoost_USE_STATIC_LIBS=ON
-    -DBoost_USE_STATIC_RUNTIME=OFF
-    -DBoost_USE_STATIC_LIBS=ON
-    -DF4SE_SUPPORT_XBYAK=ON
-    -DCMAKE_EXE_LINKER_FLAGS_RELEASE="/DEBUG:FASTLINK"
-    ${MSVC_RUNTIME_VCPKG_CONFIG_ARG}
-    ${CXX_FLAGS_VCPKG_CONFIG_ARG}
+  -DVCPKG_OVERLAY_PORTS="${SOURCE_PATH}/cmake/ports/"
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBoost_USE_STATIC_LIBS=ON
+  -DF4SE_SUPPORT_XBYAK=ON
+  -DCMAKE_EXE_LINKER_FLAGS_RELEASE="/DEBUG:FASTLINK"
+  ${MSVC_RUNTIME_VCPKG_CONFIG_ARG}
+  ${CXX_FLAGS_VCPKG_CONFIG_ARG}
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(     
-  PACKAGE_NAME CommonLibF4   
-  CONFIG_PATH "lib/cmake/CommonLibF4"   
+vcpkg_cmake_config_fixup(
+  PACKAGE_NAME CommonLibF4
+  CONFIG_PATH "lib/cmake/CommonLibF4"
 )
 file(GLOB CMAKE_CONFIGS "${CURRENT_PACKAGES_DIR}/share/CommonLibF4/CommonLibF4/*.cmake")
 file(INSTALL ${CMAKE_CONFIGS} DESTINATION "${CURRENT_PACKAGES_DIR}/share/CommonLibF4")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/CommonLibF4/CommonLibF4")
-# file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/CommonLibF4")  
+
+# file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/CommonLibF4")
 # file(RENAME "${CURRENT_PACKAGES_DIR}/include/F4SE" "${CURRENT_PACKAGES_DIR}/include/CommonLibF4/F4SE")
 # file(RENAME "${CURRENT_PACKAGES_DIR}/include/RE" "${CURRENT_PACKAGES_DIR}/include/CommonLibF4/RE")
 # file(RENAME "${CURRENT_PACKAGES_DIR}/include/REL" "${CURRENT_PACKAGES_DIR}/include/CommonLibF4/REL")
-
 file(
   INSTALL "${SOURCE_PATH}/LICENSE"
   DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"

diff --git a/dependencies/ports/commonlibf4/vcpkg.json b/dependencies/ports/commonlibf4/vcpkg.json
@@ -1,26 +1,26 @@
 {
-    "name": "commonlibf4",
-    "version-string": "2022-12-24",
-    "description": "A reverse engineered resource for developing F4SE plugins for Fallout 4",
-    "homepage": "https://github.com/Ryan-rsm-McKenzie/CommonLibF4",
-    "license": "MIT",
-    "supports": "windows & x64",
-    "port-version": 0,
-    "dependencies": [
-      "args",
-      "boost-stl-interfaces",
-      "catch2",
-      "fmt",
-      "frozen",
-      "nowide",
-      "robin-hood-hashing",
-      "rsm-mmio",
-      "srell",
-      "spdlog",
-      "xbyak",
-      {
-        "name": "vcpkg-cmake-config",
-        "host": true
-      }
-    ]
+  "name": "commonlibf4",
+  "version-string": "2023.1.5",
+  "description": "A reverse engineered resource for developing F4SE plugins for Fallout 4",
+  "homepage": "https://github.com/Ryan-rsm-McKenzie/CommonLibF4",
+  "license": "MIT",
+  "supports": "windows & x64",
+  "port-version": 0,
+  "dependencies": [
+    "args",
+    "boost-stl-interfaces",
+    "catch2",
+    "fmt",
+    "frozen",
+    "nowide",
+    "robin-hood-hashing",
+    "rsm-mmio",
+    "srell",
+    "spdlog",
+    "xbyak",
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/dependencies/ports/cppdap/portfile.cmake b/dependencies/ports/cppdap/portfile.cmake
@@ -1,33 +1,33 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO google/cppdap
-  REF 0a340c6d71ca00893ca1aefea38f3504e6755196
-  SHA512 14f8d0438678eb715f171b95ed9733485bdb681bc174642f196b7665aad3157b500ba6e6abccc5adcb8ec17aeffa94ae562dcbd31248244d9c8f4a11b97fc2ea
+  REF 59819690ec4114b01aae73b4caf22650f029ce53
+  SHA512 88e381a9d41a1510e8e0afe9d0b6fd62ab834cecbdd91a042464a1003847fdeee2c9f94c9912a9ab2538140894ec965be96dda954edff81818c42c8d0a8846c1
   HEAD_REF main
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   FEATURES
-    use-nlohmann-json CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE
-    use-rapidjson CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE
+  use-nlohmann-json CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE
+  use-rapidjson CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE
 )
 
-if (NOT CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE AND NOT CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE)
+if(NOT CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE AND NOT CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE)
   message(FATAL_ERROR "Must set either \"use-nlohmann-json\" or \"use-rapidjson\" feature.")
 elseif(CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE AND CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE)
   message(FATAL_ERROR "Cannot set both \"use-nlohmann-json\" and \"use-rapidjson\" feature.")
 endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+  ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME cppdap CONFIG_PATH lib/cmake/cppdap)
 file(
-        INSTALL "${SOURCE_PATH}/LICENSE"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-        RENAME copyright)
+  INSTALL "${SOURCE_PATH}/LICENSE"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+  RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -2,7 +2,7 @@
   "registries": [
     {
       "kind": "git",
-      "baseline": "ef8d43afe4d26e842de3d034bff1081cb7990f07",
+      "baseline": "eb2f2bd143b8f7c52b57ef5a822163b56f7be7d6",
       "repository": "https://gitlab.com/colorglass/vcpkg-colorglass/",
       "packages": [
         "commonlibsse-ng",
@@ -11,6 +11,6 @@
     }
   ],
   "overlay-ports": [
-    "./dependencies/ports"
+    "F:\\workspace\\skyrim-mod-workspace\\papyrus-lang\\./dependencies/ports"
   ]
-}
+}
diff --git a/vcpkg.json b/vcpkg.json
@@ -18,15 +18,11 @@
   "features": {
     "skyrim": {
       "description": "Add deps for Skyrim",
-      "dependencies": [
-        "commonlibsse-ng"
-      ]
+      "dependencies": ["commonlibsse-ng"]
     },
     "fallout4": {
       "description": "Add deps for Fallout 4",
-      "dependencies": [
-        "commonlibf4"
-      ]
+      "dependencies": ["commonlibf4"]
     }
   },
   "overrides": [
@@ -42,18 +38,10 @@
       "name": "websocketpp",
       "version": "0.8.2"
     },
-    {
-      "name": "commonlibsse-ng",
-      "version": "3.6.0"
-    },
     {
       "name": "commonlibf4",
-      "version-string": "2022-12-24"
-    },
-    {
-      "name": "f4se",
-      "version": "0.6.23"
+      "version": "2023.1.5"
     }
   ],
-  "builtin-baseline": "4cb4a5c5ddcb9de0c83c85837ee6974c8333f032"
-}
+  "builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933"
+}