[openscap] no absolute paths (#25838)

* [openscap] no absolute paths * format * x-add-version * format * x-add-version Co-authored-by: LilyWangLL <v-lilywang@microsoft.com>
microsoft · Jul 20, 2022 · 7fe8b4a · 7fe8b4a
1 parent 84541b3
commit 7fe8b4a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake
@@ -14,15 +14,15 @@ if ("python" IN_LIST FEATURES)
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    docs ENABLE_DOCS
-    tests ENABLE_TESTS
-    util ENABLE_OSCAP_UTIL
-    python ENABLE_PYTHON3
+    FEATURES
+        docs    ENABLE_DOCS
+        tests   ENABLE_TESTS
+        util    ENABLE_OSCAP_UTIL
+        python  ENABLE_PYTHON3
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
         -DPYTHON_EXECUTABLE=${PYTHON3}
         -DENABLE_PERL=OFF
@@ -37,11 +37,12 @@ vcpkg_configure_cmake(
         -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 #Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "openscap",
   "version": "1.3.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
   "homepage": "https://github.com/OpenSCAP/openscap",
+  "license": "LGPL-2.1-or-later",
   "dependencies": [
     "curl",
     "glib",
@@ -14,6 +15,10 @@
     "openssl",
     "pcre2",
     "pthread",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     "zlib"
   ],
   "features": {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5246,7 +5246,7 @@
     },
     "openscap": {
       "baseline": "1.3.1",
-      "port-version": 2
+      "port-version": 3
     },
     "openssl": {
       "baseline": "3.0.5",

diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f96365cae0ee049b58b5863a0d59ca32782a9fa",
+      "version": "1.3.1",
+      "port-version": 3
+    },
     {
       "git-tree": "cbc6ed45cdfd68efd53ee939bed2440e2971730f",
       "version": "1.3.1",