Skip to content

Commit

Permalink
[functionalplus] Remove fplus, add functionalplus to instead of fplus. (
Browse files Browse the repository at this point in the history
#38346)

Closes #38213.

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

---------

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
  • Loading branch information
LilyWangLL and Lily Wang committed Apr 29, 2024
1 parent 31e85fd commit 9ff5229
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 39 deletions.
20 changes: 0 additions & 20 deletions ports/fplus/portfile.cmake

This file was deleted.

13 changes: 0 additions & 13 deletions ports/fplus/vcpkg.json

This file was deleted.

3 changes: 2 additions & 1 deletion ports/frugally-deep/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "frugally-deep",
"version-semver": "0.15.31",
"port-version": 1,
"description": "Header-only library for using Keras models in C++.",
"homepage": "https://github.com/Dobiasd/frugally-deep",
"license": "MIT",
"dependencies": [
"eigen3",
"fplus",
"functionalplus",
"nlohmann-json",
{
"name": "vcpkg-cmake",
Expand Down
19 changes: 19 additions & 0 deletions ports/functionalplus/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
set(VCPKG_BUILD_TYPE release) # header-only

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Dobiasd/FunctionalPlus
REF "v${VERSION}"
SHA512 7b3e451af977ef52a112ad59a4b1f4dc64b120348acb80b751a01bc56d986358b6237d461fe0cf91431b6bc49bc823f8b4ac0016ede9a9e85561cf278d00bb41
HEAD_REF master
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DFunctionalPlus_INSTALL_CMAKEDIR=share/functionalplus
)

vcpkg_cmake_install()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
13 changes: 13 additions & 0 deletions ports/functionalplus/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "functionalplus",
"version": "0.2.24",
"description": "This port is the new fplus port, the old fplus has been removed. Functional Programming Library for C++. Write concise and readable C++ code",
"homepage": "https://github.com/Dobiasd/FunctionalPlus",
"license": "BSL-1.0",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}
10 changes: 5 additions & 5 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2816,10 +2816,6 @@
"baseline": "2021-02-21",
"port-version": 2
},
"fplus": {
"baseline": "0.2.23",
"port-version": 0
},
"freealut": {
"baseline": "1.1.0",
"port-version": 4
Expand Down Expand Up @@ -2866,7 +2862,7 @@
},
"frugally-deep": {
"baseline": "0.15.31",
"port-version": 0
"port-version": 1
},
"fruit": {
"baseline": "3.7.1",
Expand All @@ -2884,6 +2880,10 @@
"baseline": "4.2.4",
"port-version": 0
},
"functionalplus": {
"baseline": "0.2.24",
"port-version": 0
},
"functions-framework-cpp": {
"baseline": "1.2.0",
"port-version": 0
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/frugally-deep.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d924a5757d3a38c1e6583282ed57a9ac3ff51145",
"version-semver": "0.15.31",
"port-version": 1
},
{
"git-tree": "df2995d023174c6daf1fae111a4140ecdf151bce",
"version-semver": "0.15.31",
Expand Down
9 changes: 9 additions & 0 deletions versions/f-/functionalplus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "b7b848450c56319f9bb6eed3239126417ea3bbc8",
"version": "0.2.24",
"port-version": 0
}
]
}

0 comments on commit 9ff5229

Please sign in to comment.