Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg baseline][tinyfiledialogs] Change repo to sourceforge #19287

Merged
merged 4 commits into from
Aug 2, 2021

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Aug 2, 2021

Since the repo https://git.code.sf.net is unavaliable (404), change it to sourceforge.

Note the current version is 3.8.8.

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Aug 2, 2021
@JackBoosY
Copy link
Contributor Author

cc @SamuelMarks

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 261c458af6e3eed5d099144aff95d2b5035f656b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 7e64191..714402d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6294,7 +6294,7 @@
     },
     "tinyfiledialogs": {
       "baseline": "3.8.8",
-      "port-version": 0
+      "port-version": 1
     },
     "tinygltf": {
       "baseline": "2020-07-28",
diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json
index d918fbd..91fc4e7 100644
--- a/versions/t-/tinyfiledialogs.json
+++ b/versions/t-/tinyfiledialogs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "02f1f2a70350a2bf3701cf6279af2ab577d0e6da",
+      "version-semver": "3.8.8",
+      "port-version": 1
+    },
     {
       "git-tree": "1a5b599e8303e1b62bca446461bd7114ec97caba",
       "version-string": "3.8.8",

@JackBoosY JackBoosY requested a review from PhoebeHui August 2, 2021 02:19
@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Aug 2, 2021
@SamuelMarks
Copy link
Contributor

@JackBoosY Hmm that doesn't work @ f596542:

$ gh pr checkout 19287
$ ./bootstrap-vcpkg.sh
$ ./vcpkg install tinyfiledialogs

Then in another dir with this above it:

cmake_minimum_required(VERSION 3.4)
cmake_policy(SET CMP0048 NEW)
project(pp VERSION 0.0.0 LANGUAGES C)

file(DOWNLOAD "https://sourceforge.net/p/tinyfiledialogs/code/ci/4b65621952f2cf1045837a6380aa912b028daa47/tree/hello.c?format=raw"
              "src/main.c"
     EXPECTED_HASH SHA256=72502b4b5e93bf262b1ff148de028d12a187c1fda45de89212a3f896e2be1827)
set(src "${CMAKE_CURRENT_BINARY_DIR}/src/main.c")
file(READ "${src}" _c)
# Also tried `<tinyfiledialogs/tinyfiledialogs.h>`
string(REPLACE [[#include "tinyfiledialogs.h"]] [[#include <tinyfiledialogs.h>]] _c "${_c}")
file(WRITE "${src}" "${_c}")

find_package(tinyfiledialogs CONFIG REQUIRED)

add_executable("${PROJECT_NAME}" "${src}")

target_link_libraries("${PROJECT_NAME}" PRIVATE tinyfiledialogs::tinyfiledialogs)
$ cmake -DCMAKE_BUILD_TYPE='Debug' -DCMAKE_TOOLCHAIN_FILE='[path]/vcpkg/scripts/buildsystems/vcpkg.cmake' ..
$ cmake --build .
build/src/main.c:54:10: fatal error: 'tinyfiledialogs.h' file not found
#include <tinyfiledialogs.h>
         ^~~~~~~~~~~~~~~~~~~
1 error generated.
gmake[2]: *** [CMakeFiles/pp.dir/build.make:76: CMakeFiles/pp.dir/src/main.c.o] Error 1
gmake[1]: *** [CMakeFiles/Makefile2:83: CMakeFiles/pp.dir/all] Error 2
gmake: *** [Makefile:91: all] Error 2

@JackBoosY
Copy link
Contributor Author

@SamuelMarks Can you please try again?

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 261c458af6e3eed5d099144aff95d2b5035f656b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json
index 91fc4e7..d7b0b5f 100644
--- a/versions/t-/tinyfiledialogs.json
+++ b/versions/t-/tinyfiledialogs.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "02f1f2a70350a2bf3701cf6279af2ab577d0e6da",
+      "git-tree": "3959a47c7d93ca7db6e2022553b1d3427970cecf",
       "version-semver": "3.8.8",
       "port-version": 1
     },

@SamuelMarks
Copy link
Contributor

@JackBoosY great that worked @ 408df6b:

$ gh pr checkout 19287
$ ./bootstrap-vcpkg.sh
$ ./vcpkg install tinyfiledialogs

Then in another dir with this above it:

cmake_minimum_required(VERSION 3.4)
cmake_policy(SET CMP0048 NEW)
project(pp VERSION 0.0.0 LANGUAGES C)

file(DOWNLOAD "https://sourceforge.net/p/tinyfiledialogs/code/ci/0002/tree/hello.c?format=raw"
              "src/main.c"
     EXPECTED_HASH SHA256=ceef2c9cb381704f9a321260a4869daa427ab4dd2b82f01e72fd768365210ccb)
set(src "${CMAKE_CURRENT_BINARY_DIR}/src/main.c")
file(READ "${src}" _c)
string(REPLACE [[#include "tinyfiledialogs.h"]] [[#include <tinyfiledialogs.h>]] _c "${_c}")
file(WRITE "${src}" "${_c}")

find_package(tinyfiledialogs CONFIG REQUIRED)

add_executable("${PROJECT_NAME}" "${src}")

target_link_libraries("${PROJECT_NAME}" PRIVATE tinyfiledialogs::tinyfiledialogs)
$ cmake -DCMAKE_BUILD_TYPE='Debug' -DCMAKE_TOOLCHAIN_FILE='[path]/vcpkg/scripts/buildsystems/vcpkg.cmake' ..
$ cmake --build .
[ 50%] Building C object CMakeFiles/pp.dir/src/main.c.o
[100%] Linking C executable pp
[100%] Built target pp

@dan-shaw dan-shaw merged commit 667f041 into microsoft:master Aug 2, 2021
@JackBoosY JackBoosY deleted the dev/jack/fix-baseline-20210802 branch August 3, 2021 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants