From 3bf9d1ce93c7a3f01e921b6cae42ecc37eb63d14 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Mon, 14 Oct 2024 21:34:59 +0100 Subject: [PATCH 01/13] Add eventbus library to vcpkg --- ports/eventbus/portfile.cmake | 23 +++++++++++++++++++++++ ports/eventbus/vcpkg.json | 16 ++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/eventbus/portfile.cmake create mode 100644 ports/eventbus/vcpkg.json diff --git a/ports/eventbus/portfile.cmake b/ports/eventbus/portfile.cmake new file mode 100644 index 00000000000000..5de0d957ac82e4 --- /dev/null +++ b/ports/eventbus/portfile.cmake @@ -0,0 +1,23 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gelldur/EventBus + REF master + SHA512 68be92be9a1adc37498e24850ae87384a34ed0343f29a5e525c984f5e220dd721b506fdd7f627e369300c07300f5fff06d88991f69c1e9bc0fff0d2a5b8f0eba + HEAD_REF master +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + WINDOWS_USE_MSBUILD + OPTIONS + -DENABLE_TEST=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eventbus) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/eventbus/vcpkg.json b/ports/eventbus/vcpkg.json new file mode 100644 index 00000000000000..b24150d7897f41 --- /dev/null +++ b/ports/eventbus/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "eventbus", + "version": "3.1.2", + "description": "Simple and very fast event bus.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 9847da256f140482af1ed1912a1fc274da6bc8f3 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Mon, 14 Oct 2024 22:06:30 +0100 Subject: [PATCH 02/13] fix compilation errors --- ports/eventbus/portfile.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/eventbus/portfile.cmake b/ports/eventbus/portfile.cmake index 5de0d957ac82e4..6851c13d4ff211 100644 --- a/ports/eventbus/portfile.cmake +++ b/ports/eventbus/portfile.cmake @@ -1,18 +1,22 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() + +# before this revision the build would fail on windows vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gelldur/EventBus - REF master - SHA512 68be92be9a1adc37498e24850ae87384a34ed0343f29a5e525c984f5e220dd721b506fdd7f627e369300c07300f5fff06d88991f69c1e9bc0fff0d2a5b8f0eba + REF 4689564c4c775456bfa0dfd976b4f48aca5f4d2a + SHA512 0f1f3c21d1c5a18da87e331f252cb464143ba2038a26e6edb6b11c9544c02dd1919fe728e803b382e8f6b89550582d7905170437c184f784cfa3f28c784a7e59 HEAD_REF master ) + + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - WINDOWS_USE_MSBUILD OPTIONS -DENABLE_TEST=OFF + -DCMAKE_CXX_STANDARD=17 ) vcpkg_cmake_install() From e635ac3c9b373e6cfd27d2c0874b6938f8377eab Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Mon, 14 Oct 2024 22:09:07 +0100 Subject: [PATCH 03/13] version database --- ports/eventbus/vcpkg.json | 2 +- versions/baseline.json | 4 ++++ versions/e-/eventbus.json | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 versions/e-/eventbus.json diff --git a/ports/eventbus/vcpkg.json b/ports/eventbus/vcpkg.json index b24150d7897f41..0dd512894ba24e 100644 --- a/ports/eventbus/vcpkg.json +++ b/ports/eventbus/vcpkg.json @@ -12,5 +12,5 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 9e7c47898947c5..0c24140f36bd39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2592,6 +2592,10 @@ "baseline": "2023.2.15", "port-version": 0 }, + "eventbus": { + "baseline": "3.1.2", + "port-version": 0 + }, "eventpp": { "baseline": "0.1.3", "port-version": 1 diff --git a/versions/e-/eventbus.json b/versions/e-/eventbus.json new file mode 100644 index 00000000000000..caacf92ffca58a --- /dev/null +++ b/versions/e-/eventbus.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f97f52c7baa94af1f321ab60276c97af264fb545", + "version": "3.1.2", + "port-version": 0 + } + ] +} From b407ee841a835e74215ed6895b92746afaadc430 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Wed, 16 Oct 2024 11:22:44 +0100 Subject: [PATCH 04/13] update the version file --- versions/e-/eventbus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eventbus.json b/versions/e-/eventbus.json index caacf92ffca58a..fbb10147997455 100644 --- a/versions/e-/eventbus.json +++ b/versions/e-/eventbus.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f97f52c7baa94af1f321ab60276c97af264fb545", + "git-tree": "0c470733c54afbaba845f06f6d23d9cf06108308", "version": "3.1.2", "port-version": 0 } From 45d546c591f5da67465082413e759c232b3d5aba Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Thu, 17 Oct 2024 22:58:43 +0100 Subject: [PATCH 05/13] fix linux bug --- ports/eventbus/portfile.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/eventbus/portfile.cmake b/ports/eventbus/portfile.cmake index 6851c13d4ff211..80ee1e36c1b730 100644 --- a/ports/eventbus/portfile.cmake +++ b/ports/eventbus/portfile.cmake @@ -22,6 +22,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eventbus) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eventbus) +endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From fb0cf4c44818425dbe4db69572f2bd734e7baf34 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Thu, 17 Oct 2024 23:02:06 +0100 Subject: [PATCH 06/13] update version --- versions/e-/eventbus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eventbus.json b/versions/e-/eventbus.json index fbb10147997455..0d243230836314 100644 --- a/versions/e-/eventbus.json +++ b/versions/e-/eventbus.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0c470733c54afbaba845f06f6d23d9cf06108308", + "git-tree": "01839b9f46686cffaa3f70f12b76fc8c0c7b9408", "version": "3.1.2", "port-version": 0 } From 81d6ab70dbc523f4672d380d139334a13accbad2 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Thu, 17 Oct 2024 23:46:08 +0100 Subject: [PATCH 07/13] solve a bug --- ports/eventbus/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/eventbus/portfile.cmake b/ports/eventbus/portfile.cmake index 80ee1e36c1b730..14f2f7565a36c8 100644 --- a/ports/eventbus/portfile.cmake +++ b/ports/eventbus/portfile.cmake @@ -23,8 +23,5 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eventbus) -endif() - +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eventbus) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From c02223dfa0d0f74ac249d0957a88aa72bf90200e Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Thu, 17 Oct 2024 23:47:09 +0100 Subject: [PATCH 08/13] update version --- versions/e-/eventbus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eventbus.json b/versions/e-/eventbus.json index 0d243230836314..5a233b13e78aa8 100644 --- a/versions/e-/eventbus.json +++ b/versions/e-/eventbus.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "01839b9f46686cffaa3f70f12b76fc8c0c7b9408", + "git-tree": "d424c1792a726756225d5988c5c31080cd8fe8a7", "version": "3.1.2", "port-version": 0 } From eff9c5a4e1b730b58d0f7442d0e67445f157287b Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Thu, 17 Oct 2024 23:57:05 +0100 Subject: [PATCH 09/13] fix a bug caused by case sensitivity --- ports/eventbus/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/eventbus/portfile.cmake b/ports/eventbus/portfile.cmake index 14f2f7565a36c8..f493ed7d689376 100644 --- a/ports/eventbus/portfile.cmake +++ b/ports/eventbus/portfile.cmake @@ -23,5 +23,5 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eventbus) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EventBus) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From 08e60a6e5a2a6cc87b77af135d3a9b69530b9aa7 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Thu, 17 Oct 2024 23:57:55 +0100 Subject: [PATCH 10/13] update version file --- versions/e-/eventbus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eventbus.json b/versions/e-/eventbus.json index 5a233b13e78aa8..357c6b3e757970 100644 --- a/versions/e-/eventbus.json +++ b/versions/e-/eventbus.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d424c1792a726756225d5988c5c31080cd8fe8a7", + "git-tree": "a042276e659403d1417119961c89d3646b4f6a3f", "version": "3.1.2", "port-version": 0 } From a587cb27a01be44b327f47bb53021d28f74cec2e Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 17 Oct 2024 20:00:50 -0700 Subject: [PATCH 11/13] Add homepage --- ports/eventbus/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/eventbus/vcpkg.json b/ports/eventbus/vcpkg.json index 0dd512894ba24e..4d3854a17c0cf9 100644 --- a/ports/eventbus/vcpkg.json +++ b/ports/eventbus/vcpkg.json @@ -2,6 +2,7 @@ "name": "eventbus", "version": "3.1.2", "description": "Simple and very fast event bus.", + "homepage": "https://github.com/gelldur/EventBus", "license": "Apache-2.0", "dependencies": [ { From 6d57befc04d460a37f087c477c6c0e97e004fb7d Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 17 Oct 2024 20:01:48 -0700 Subject: [PATCH 12/13] update version --- versions/e-/eventbus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eventbus.json b/versions/e-/eventbus.json index 357c6b3e757970..719bc93590f55c 100644 --- a/versions/e-/eventbus.json +++ b/versions/e-/eventbus.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a042276e659403d1417119961c89d3646b4f6a3f", + "git-tree": "99744eb5c1976adc3690dee995b516244b2a5eab", "version": "3.1.2", "port-version": 0 } From c900a266f01ea2cefb0379acf8b6534f6da480a8 Mon Sep 17 00:00:00 2001 From: motazmuhammad Date: Fri, 18 Oct 2024 09:54:42 +0100 Subject: [PATCH 13/13] Update ports/eventbus/portfile.cmake apply suggested changes Co-authored-by: Kai Pastor --- ports/eventbus/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/eventbus/portfile.cmake b/ports/eventbus/portfile.cmake index f493ed7d689376..f83e39deb51591 100644 --- a/ports/eventbus/portfile.cmake +++ b/ports/eventbus/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DENABLE_TEST=OFF - -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_STANDARD=17 + -DENABLE_TEST=OFF ) vcpkg_cmake_install()