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.

Sign up for GitHub

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

[icu] add host depedency #16577

Merged
merged 41 commits into from
May 1, 2021
Merged

[icu] add host depedency #16577

Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2807910
[icu] introduce host dependency
autoantwort Mar 6, 2021
35ff48d
add version files
autoantwort Mar 6, 2021
31e061a
[icu] host dependency windows, update ci baseline
autoantwort Mar 6, 2021
62eaa95
add version files
autoantwort Mar 6, 2021
5145658
[icu] add debug messages
autoantwort Mar 6, 2021
0424614
[icu] do not depend on buildtree, install required files instead
autoantwort Mar 7, 2021
8094631
[icu] set env variable for dynamic libs
autoantwort Mar 7, 2021
2dc5974
[icu] find dlls for windows
autoantwort Mar 7, 2021
81e94e0
[icu] copy dlls
autoantwort Mar 7, 2021
736bced
[icu] cleanup, fix apple arm targets
autoantwort Mar 7, 2021
fa8524b
add version files
autoantwort Mar 7, 2021
5ec4fe9
[icu] no for-cross-compile subfolder
autoantwort Mar 10, 2021
d44e2df
add version files
autoantwort Mar 10, 2021
6e64f28
[icu] use instead of
autoantwort Mar 11, 2021
5410603
add version files
autoantwort Mar 11, 2021
2d4b190
[icu] convert to vcpkg_configure_make
autoantwort Mar 17, 2021
3cfdec0
[icu] also build on arm
autoantwort Mar 17, 2021
2c832ee
[icu] add DESTINATION param to vcpkg_copy_tools and use it
autoantwort Mar 17, 2021
4e17a78
[icu] use foreach in macOS build
autoantwort Mar 18, 2021
09d20d9
[icu] fix of copy tool dependencies on windows
autoantwort Mar 18, 2021
3c33e2c
[icu] delete more folders on windows
autoantwort Mar 18, 2021
681ffe1
[icu] copy tool dependencies manually
autoantwort Mar 18, 2021
70cd3c6
[icu] don't copy non existing pdb files
autoantwort Mar 22, 2021
3948c69
add version files
autoantwort Mar 22, 2021
a941681
[icu] bring vcpkg_copy_pdbs() back
autoantwort Mar 27, 2021
e1a79f0
add version files
autoantwort Mar 27, 2021
6e9ad66
[icu] add comment
autoantwort Apr 1, 2021
2444feb
add version files
autoantwort Apr 1, 2021
ba8615f
[icu] use BUILD_TRIPLET instead of VCPKG_MAKE_BUILD_TRIPLET
autoantwort Apr 14, 2021
6425fa1
add version files
autoantwort Apr 14, 2021
8ac9fd7
[icu] simply logic for build on mac
autoantwort Apr 15, 2021
9214f9e
add version files
autoantwort Apr 15, 2021
9732940
Trigger Build
autoantwort Apr 15, 2021
f39a261
Merge branch 'master' into icu-hosts
autoantwort Apr 20, 2021
7a8ae4e
add version files
autoantwort Apr 20, 2021
2cf5c8f
Trigger Build
autoantwort Apr 22, 2021
50a12a1
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Apr 29, 2021
048b17b
Trigger Build
autoantwort Apr 30, 2021
5b45a3e
Apply suggestions from code review
strega-nil-ms May 1, 2021
a70426a
Apply suggestions from code review
autoantwort May 1, 2021
d0ec5ba
Trigger Build
autoantwort May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/maintainers/vcpkg_copy_tools.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/t
### AUTO_CLEAN
Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`.

### DESTINATION
The destination folder. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if ommited.

autoantwort marked this conversation as resolved.
Show resolved Hide resolved
## Examples

* [cpuinfo](https://github.com/microsoft/vcpkg/blob/master/ports/cpuinfo/portfile.cmake)
Expand Down
6 changes: 0 additions & 6 deletions ports/icu/CONTROL
View file
Open in desktop

This file was deleted.

371 changes: 98 additions & 273 deletions ports/icu/portfile.cmake
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions ports/icu/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "icu",
"version": "69.1",
"port-version": 9,
"description": "Mature and widely used Unicode and localization library.",
"homepage": "http://icu-project.org/apiref/icu4c/",
"supports": "!uwp",
"dependencies": [
{
"name": "icu",
"host": true
}
]
}
4 changes: 2 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,6 @@ hiredis:x64-uwp=fail
hpx:x64-windows-static=fail
hpx:x64-linux=fail
libhsplasma:x64-windows-static=fail
icu:arm-uwp=fail
icu:x64-uwp=fail
ideviceinstaller:x64-windows-static-md=fail
idevicerestore:x64-linux=fail
idevicerestore:x64-osx=fail
Expand Down Expand Up @@ -692,6 +690,7 @@ libmpeg2:x64-osx=fail
libmpeg2:x64-uwp=fail
libmupdf:x64-osx=fail
libmysql:x86-windows=fail
libmysql:arm64-windows=fail
#The official website of libnice https://nice.freedesktop.org cannot be accessed
libnice:x86-windows=skip
libnice:x64-windows=skip
Expand Down Expand Up @@ -1304,6 +1303,7 @@ qpid-proton:x64-uwp=fail
qpid-proton:x64-windows-static=fail
qt5-activeqt:x64-linux=fail
qt5-activeqt:x64-osx=fail
qt5-base:arm64-windows=fail
# Skip deprecated Qt module
# (remnove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
qt5-canvas3d:x64-linux=skip
Expand Down
3 changes: 3 additions & 0 deletions scripts/cmake/vcpkg_copy_tools.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/t
### AUTO_CLEAN
Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`.

### DESTINATION
The destination folder. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if ommited.

autoantwort marked this conversation as resolved.
Show resolved Hide resolved
## Examples

* [cpuinfo](https://github.com/microsoft/vcpkg/blob/master/ports/cpuinfo/portfile.cmake)
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,7 +2502,7 @@
},
"icu": {
"baseline": "69.1",
"port-version": 8
"port-version": 9
},
"ideviceinstaller": {
"baseline": "1.1.2.23-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5c039f72ee659cc0522524889b9219615f28263a",
"version": "69.1",
"port-version": 9
},
{
"git-tree": "c918e5cfffd2c55c740dd69ef3f5eb36c1e17806",
"version-string": "69.1",
Expand Down