[drogon] fix drogon_ctl command not found error (#32870)

* fix: patch to use find_program for drogon_ctl * update drogon port version
microsoft · Aug 3, 2023 · b3d05b2 · b3d05b2
1 parent 83f77ef
commit b3d05b2
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 6 deletions.
diff --git a/ports/drogon/vcpkg.patch → ports/drogon/001_vcpkg.patch b/ports/drogon/vcpkg.patch → ports/drogon/001_vcpkg.patch
diff --git a/ports/drogon/drogon_config.patch → ports/drogon/002_drogon_config.patch b/ports/drogon/drogon_config.patch → ports/drogon/002_drogon_config.patch
diff --git a/ports/drogon/fix_gcc13.patch → ports/drogon/003_fix_gcc13.patch b/ports/drogon/fix_gcc13.patch → ports/drogon/003_fix_gcc13.patch
diff --git a/ports/drogon/deps_redis.patch → ports/drogon/004_deps_redis.patch b/ports/drogon/deps_redis.patch → ports/drogon/004_deps_redis.patch
diff --git a/ports/drogon/005_drogon_ctl.patch b/ports/drogon/005_drogon_ctl.patch
@@ -0,0 +1,30 @@
+diff --git a/cmake/DrogonUtilities.cmake b/cmake/DrogonUtilities.cmake
+index 7cb9799..5462572 100644
+--- a/cmake/DrogonUtilities.cmake
++++ b/cmake/DrogonUtilities.cmake
+@@ -3,6 +3,7 @@
+ # [TRUE to use_path_as_namespace] [prefixed namespace])
+ # ##############################################################################
+ function(drogon_create_views arg)
++  find_program(DROGON_CTL_COMMAND drogon_ctl REQUIRED)
+   if(ARGC LESS 3)
+     message(STATUS "arguments error when calling drogon_create_views")
+     return()
+@@ -39,7 +40,7 @@ function(drogon_create_views arg)
+         set(ns "")
+       endif()
+       add_custom_command(OUTPUT ${ARGV2}/${outputFile}.h ${ARGV2}/${outputFile}.cc
+-                         COMMAND drogon_ctl
++                         COMMAND ${DROGON_CTL_COMMAND}
+                                  ARGS
+                                  create
+                                  view
+@@ -55,7 +56,7 @@ function(drogon_create_views arg)
+     else()
+       get_filename_component(classname ${cspFile} NAME_WE)
+       add_custom_command(OUTPUT ${ARGV2}/${classname}.h ${ARGV2}/${classname}.cc
+-                         COMMAND drogon_ctl
++                         COMMAND ${DROGON_CTL_COMMAND}
+                                  ARGS
+                                  create
+                                  view
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
@@ -5,10 +5,11 @@ vcpkg_from_github(
     SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2
     HEAD_REF master
     PATCHES
-        vcpkg.patch
-        drogon_config.patch
-        fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563
-        deps_redis.patch
+        001_vcpkg.patch
+        002_drogon_config.patch
+        003_fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563
+        004_deps_redis.patch
+        005_drogon_ctl.patch
 )
 
 vcpkg_check_features(

diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "drogon",
   "version": "1.8.4",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2214,7 +2214,7 @@
     },
     "drogon": {
       "baseline": "1.8.4",
-      "port-version": 3
+      "port-version": 4
     },
     "dstorage": {
       "baseline": "1.2.0",

diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f8d8eadd014bf7d28bfff57e3e11e211fa8c4ae",
+      "version": "1.8.4",
+      "port-version": 4
+    },
     {
       "git-tree": "dde2eb171931557ecf9c74459cceb6a7b1d7ce9a",
       "version": "1.8.4",