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

[omniorb] new port #30900

Merged
merged 16 commits into from
Apr 27, 2023
Merged

[omniorb] new port #30900

merged 16 commits into from
Apr 27, 2023

Conversation

Neumann-A
Copy link
Contributor

  • Changes comply with the maintainer guide
  • The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
  • Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all find_package calls are REQUIRED, are satisfied by vcpkg.json's declared dependencies, or disabled with CMAKE_DISABLE_FIND_PACKAGE_Xxx
  • The versioning scheme in vcpkg.json matches what upstream says.
  • The license declaration in vcpkg.json matches what upstream says.
  • The installed as the "copyright" file matches what upstream says.
  • The source code of the component installed comes from an authoritative source.
  • The generated "usage text" is accurate. See adding-usage for context.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is in the new port's versions file.
  • Only one version is added to each modified port's versions file.

(i feel like deleting the above if I put in x everywhere anyway)

supersedes #7071; #8609
removes tag from #3346

Sorry, something went wrong.

@Neumann-A Neumann-A marked this pull request as draft April 15, 2023 20:12
"version": "4.3.0",
"description": "omniORB is a robust high performance CORBA ORB for C++",
"license": "LGPL-2.1-or-later",
"supports": "!uwp & !((arm | x86) & windows) & !osx",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the windows stuff is manily due to what vcpkg_configure_make considers cross compiling. It probably could be patched to make it work but I am not going to spend time on that.

@Neumann-A Neumann-A marked this pull request as ready for review April 16, 2023 05:34
@JonLiu1993 JonLiu1993 added category:new-port The issue is requesting a new library to be added; consider making a PR! info:good-first-issue This issue would be a good issue to get one's feet wet in solving. requires:author-response and removed info:good-first-issue This issue would be a good issue to get one's feet wet in solving. labels Apr 17, 2023
@Neumann-A
Copy link
Contributor Author

@JonLiu1993 Why did you add requires:author-response?

JonLiu1993
JonLiu1993 previously approved these changes Apr 19, 2023
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
JonLiu1993
JonLiu1993 previously approved these changes Apr 19, 2023
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Apr 19, 2023
@JonLiu1993
Copy link
Member

No usage needs to be tested:

-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniCOS4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniCOSDynamic4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniConnectionMgmt4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniDynamic4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniORB4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniZIOP4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omniZIOPDynamic4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/lib/pkgconfig/omnithread3.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniCOS4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniCOSDynamic4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniConnectionMgmt4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniDynamic4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniORB4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniZIOP4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omniZIOPDynamic4.pc
-- Fixing pkgconfig file: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/debug/lib/pkgconfig/omnithread3.pc
-- Installing: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/share/omniorb/copyright
-- Installing: F:/Feature-test/omniorb/vcpkg/packages/omniorb_x64-windows/tools/omniorb/bin/copyright
-- Performing post-build validation
Stored binaries in 1 destinations.

image

Comment on lines +23 to +28
fix_dependency.patch
def_gen_fix.patch
msvc-src-build-fixes.patch
release-debug-static.patch
add_win_into_autotools.patch
python-fixes.patch
Copy link
Member

Choose a reason for hiding this comment

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

Have these been submitted upstream? They might not care about Windows so much but clearly the unedited code is talking about dumpbin and winver so they must care somewhat.

Comment on lines +63 to +78
set(progs C_COMPILER CXX_COMPILER AR
LINKER RANLIB OBJDUMP MT
STRIP NM DLLTOOL RC_COMPILER)
list(TRANSFORM progs PREPEND "VCPKG_DETECTED_CMAKE_")
foreach(prog IN LISTS progs)
if(${prog})
set(path "${${prog}}")
unset(prog_found CACHE)
get_filename_component(${prog} "${${prog}}" NAME)
find_program(prog_found ${${prog}} PATHS ENV PATH NO_DEFAULT_PATH)
if(NOT path STREQUAL prog_found)
get_filename_component(path "${path}" DIRECTORY)
vcpkg_add_to_path(PREPEND ${path})
endif()
endif()
endforeach()
Copy link
Member

Choose a reason for hiding this comment

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

This block looks like it is likely to happen elsewhere. Do you think it's worth extracting for other ports to use? If not, no change requested.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is actually copied out of vcpkg_configure_make. So if that ever gets updated it can be refactored out there.

@BillyONeal BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Apr 20, 2023
@BillyONeal
Copy link
Member

Thanks for the new port!

@JonLiu1993 JonLiu1993 requested a review from BillyONeal April 24, 2023 08:32
@BillyONeal BillyONeal merged commit 3ef62a2 into microsoft:master Apr 27, 2023
@BillyONeal
Copy link
Member

Thanks again!

@Neumann-A Neumann-A deleted the add_omniorb branch April 27, 2023 07:37
@Neumann-A
Copy link
Contributor Author

@BillyONeal please remove the tag(info:new-port-unresolved) from #3346

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants