[ace] Respect VCPKG_BUILD_TYPE (microsoft#34838)

* respect VCPKG_BUILD_TYPE * update version * format * update git-tree --------- Co-authored-by: Monica <[email protected]>
jozefizso · Nov 1, 2023 · 85b031a · 85b031a
1 parent b6d0c11
commit 85b031a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -294,6 +294,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY)
   set(ENV{PWD} "${WORKING_DIR}")
 
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
   message(STATUS "Building ${TARGET_TRIPLET}-dbg")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}"
@@ -344,7 +345,9 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
       LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg
     )
   endif()
-
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
   message(STATUS "Building ${TARGET_TRIPLET}-rel")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}"
@@ -377,6 +380,8 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
   endif()
   message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
+endif()
+
   # Restore `PWD` environment variable
   set($ENV{PWD} _prev_env)
 

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ace",
   "version": "7.1.2",
+  "port-version": 1,
   "maintainers": "Johnny Willemsen <[email protected]>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

diff --git a/versions/a-/ace.json b/versions/a-/ace.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "00c6b2eb50cad87d13e5a6a59f38e30cfa954651",
+      "version": "7.1.2",
+      "port-version": 1
+    },
     {
       "git-tree": "696c1096e0de3cd394392720aa34e0ceceac52e7",
       "version": "7.1.2",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -26,7 +26,7 @@
     },
     "ace": {
       "baseline": "7.1.2",
-      "port-version": 0
+      "port-version": 1
     },
     "acl": {
       "baseline": "2.3.1",