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

[osgearth]add featurs examples and controls #44479

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

yanzixiang
Copy link

Fixes #44303

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@Mengna-Li Mengna-Li added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Mar 19, 2025
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
endif()

if("examples" IN_LIST FEATURES)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please adjust the code indentation, thanks.

file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/osgearth_skyviewd.exe")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/osgearth_terrainprofiled.exe")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/osgearth_tracksd.exe")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/osgearth_transformd.exe")
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it necessary to add so much code for examples?

Copy link
Author

@yanzixiang yanzixiang Mar 20, 2025

Choose a reason for hiding this comment

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

i'am sorry,i can not find an easy method to del the exe files and keep the dll files in the same dir, so i have to hard code it.

@Mengna-Li
Copy link
Contributor

Note: I will be converting your PR to draft status. When you're ready, please revert to "ready for review". That way, I can be aware that you've responded since you can't modify the tags.

@Mengna-Li Mengna-Li marked this pull request as draft March 19, 2025 07:46
@yanzixiang yanzixiang requested a review from Mengna-Li March 19, 2025 09:10
@yanzixiang yanzixiang marked this pull request as ready for review March 19, 2025 09:10
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

@Mengna-Li
Copy link
Contributor

Mengna-Li commented Mar 20, 2025

Before merging the PR, please run vcpkg x-add-version osgearth --overwrite-version after each commit to update the git tree.

CI error:

D:\a\_work\1\s\versions\o-\osgearth.json: error: [email protected]#2 git tree 0c88720520bcbe2dde308d617d56b4eff94202b5 does not match the port directory
D:\a\_work\1\s\ports\osgearth: note: the port directory has git tree 4385bdc101417df686a0ec34e17214f99fb16eec
D:\a\_work\1\s\ports\osgearth\vcpkg.json: note: if [email protected]#2 is already published, update this file with a new version or port-version, commit it, then add the new version by running:
  vcpkg x-add-version osgearth
  git add versions
  git commit -m "Update version database"
note: if [email protected]#2 is not yet published, overwrite the previous git tree by running:
  vcpkg x-add-version osgearth --overwrite-version
  git add versions
  git commit -m "Update version database"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[osgearth] osgEarth/Controls is missing
2 participants