Skip to content

Fix baseline error #10051

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

Merged
vicroms merged 8 commits into from
Feb 20, 2020
Merged

Fix baseline error #10051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d870b0
Fix osx baseline
Feb 13, 2020
8171a98
fix osg configure issue
PhoebeHui Feb 14, 2020
07ba1cb
Merge branch 'master' into dev/jack/fix_osx_build_20200213
PhoebeHui Feb 14, 2020
4ba3d9c
re-trigger ci test
Feb 14, 2020
5e47fcf
re-trigger ci test
Feb 14, 2020
d38f5f6
[osg] Revert changes with osg and temporarily skip osg detection
Feb 15, 2020
7a977db
trigger ci test
Feb 15, 2020
9980228
update baseline
Feb 16, 2020
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
2 changes: 1 addition & 1 deletion ports/eathread/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: eathread
Version: 1.32.09
Version: 1.32.09-1
Homepage: https://github.com/electronicarts/EAThread
Description: Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.
Build-Depends: eabase, eastl
2 changes: 1 addition & 1 deletion ports/eathread/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread)
2 changes: 1 addition & 1 deletion ports/geotrans/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: geotrans
Version: 3.7-1
Version: 3.8
Description: Geotrans is a library that allows you convert geographic coordinates among a wide variety of coordinate systems, map projections, and datums.
2 changes: 1 addition & 1 deletion ports/geotrans/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${P
file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

# Install the geo model data
file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
2 changes: 1 addition & 1 deletion ports/llvm/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: llvm
Version: 8.0.0-3
Version: 8.0.0-4
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)
Expand Down
2 changes: 1 addition & 1 deletion ports/llvm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ if(NOT MACHOFILES)
endif()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
2 changes: 1 addition & 1 deletion ports/qt5-base/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: qt5-base
Version: 5.12.5-9
Version: 5.12.5-10
Homepage: https://www.qt.io/
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
Expand Down
2 changes: 1 addition & 1 deletion ports/qt5-base/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,4 +340,4 @@ if(QT_BUILD_LATEST)
DESTINATION
${CURRENT_PACKAGES_DIR}/share/qt5
)
endif()
endif()
2 changes: 1 addition & 1 deletion ports/qt5-tools/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: qt5-tools
Version: 5.12.5-3
Version: 5.12.5-4
Copy link
Contributor

@Neumann-A Neumann-A Feb 14, 2020

Choose a reason for hiding this comment

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

If you have build failures in qt5-tools it is probably a hidden dependency in qt5-base. You can check the *.prl files for the required dependencies.

Copy link
Contributor Author

@JackBoosY JackBoosY Feb 14, 2020

Choose a reason for hiding this comment

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

LINK : fatal error LNK1104: cannot open file 'C:\vsts\_work\4\s\installed\x64-windows-static\debug\lib\Qt5Cored.lib'

This should be a fake error.

Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows)
2 changes: 2 additions & 0 deletions ports/qt5-tools/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)

qt_submodule_installation()

if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
endif()
2 changes: 1 addition & 1 deletion ports/xlnt/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: xlnt
Version: 1.4.0
Version: 1.4.0-1
Homepage: https://github.com/tfussell/xlnt
Description: Cross-platform user-friendly xlsx library for C++14
4 changes: 2 additions & 2 deletions ports/xlnt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tfussell/xlnt
REF v1.4.0
SHA512 74abbee97994098fb7d8fd0839929db74fe01b8428f8bdb8edd28340d3b3ed04d4c7d6dd5d886ae766054ff1b0fe9a8275098a1462e7a5146ff09f1cdb063360
REF 85e6878cc41d4c5ad002e961dc1fe35e41f936b6 # v1.4.0
SHA512 335198fbcc1b3028e38bced4ee26047047b02372b6c52727a64c0cab6db19cc31be8ac6c08e96f415875a181d6f717082220b0f63f08ef6ac194927e2184a9df
HEAD_REF master
PATCHES
${win_patch}
Expand Down
3 changes: 2 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,10 +1327,11 @@ opusfile:x64-uwp=fail
orc:x64-linux=ignore
orocos-kdl:arm-uwp=fail
orocos-kdl:x64-uwp=fail
osg:x86-windows=skip
osg:x64-windows=skip
osgearth:x64-osx=fail
osgearth:x64-linux=fail
osgearth:x64-windows-static=fail
osg-qt:x64-linux=fail
osg-qt:x64-windows-static=fail
otl:x64-windows=ignore
otl:x64-windows-static=ignore
Expand Down