Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
974ae7b
[ace] Update to 6.5.8
jwillemsen Feb 10, 2020
0f88c1a
Address review comments
jwillemsen Feb 11, 2020
411981f
Put back copy step
jwillemsen Feb 11, 2020
0c31b88
Fixed error
jwillemsen Feb 11, 2020
aeec218
ARM should work, let us try it
jwillemsen Feb 11, 2020
d3d5f66
ARM doesn't work yet, so disable it again
jwillemsen Feb 11, 2020
6b22b90
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 2, 2020
4bc796b
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 23, 2020
1162f9a
Add support for vcpkg of ace on MacOSX
jwillemsen Apr 23, 2020
42ed50c
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 24, 2020
751fb81
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 24, 2020
0b96ccf
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 1, 2020
158f002
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 6, 2020
77ab4e6
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 15, 2020
642a4e1
[ace] Add patch to fix Visual Studio 2019 internal compiler error
jwillemsen May 15, 2020
0bcf649
Attempt to fix apply patches
jwillemsen May 15, 2020
73985a0
[ace] Updated baseline for ace, 4 configurations work again with the …
jwillemsen May 15, 2020
5f8ad22
Address review comments
jwillemsen May 18, 2020
0ea23d3
Revised patch for ACE
jwillemsen May 18, 2020
a22f3e1
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 19, 2020
506ebd5
Merge branch 'master' into jwi-ace-659patch
jwillemsen May 19, 2020
e870128
[ace] Add support for uwp
jwillemsen May 19, 2020
b264978
Merge branch 'jwi-ace-659patch'
jwillemsen May 19, 2020
77d7c93
ace now works in all configurations
jwillemsen May 19, 2020
d583340
Removed !uwp and update version
jwillemsen May 19, 2020
6f46b29
Simplified install of copyright file and on windows we always have a …
jwillemsen May 19, 2020
9712200
[ace] resolve merge conflicts
jwillemsen May 27, 2020
ad64f9f
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 27, 2020
c406a36
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Jun 2, 2020
a3bffcf
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Jul 1, 2020
9c8825d
Rename xmlch_wchar feature to xmlchwchar, we got from today the follo…
jwillemsen Jul 1, 2020
9cc923b
Files back to dos eol
jwillemsen Jul 2, 2020
8d16105
Update CONTROL
jwillemsen Jul 1, 2020
9373b13
Update portfile.cmake
jwillemsen Jul 1, 2020
4ff9517
All back to dos eol
jwillemsen Jul 2, 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
24 changes: 12 additions & 12 deletions ports/xerces-c/CONTROL
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Source: xerces-c
Version: 3.2.3
Homepage: https://github.com/apache/xerces-c
Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.

Feature: icu
Description: ICU support
Build-Depends: icu

Feature: xmlch_wchar
Description: XMLCh type uses wchar_t

Source: xerces-c
Version: 3.2.3-1
Homepage: https://github.com/apache/xerces-c
Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
Feature: icu
Description: ICU support
Build-Depends: icu
Feature: xmlch-wchar
Description: XMLCh type uses wchar_t
130 changes: 65 additions & 65 deletions ports/xerces-c/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/xerces-c
REF v3.2.3
SHA512 aaafe2de4ea156d94e71e3631c79bd66660badf17bf2a19587a0ca34011f70bd1584a0beef909409a3ff05eecea9d37ffee6dbb267625f59217fd86705d2cd28
HEAD_REF master
PATCHES
disable-tests.patch
remove-dll-export-macro.patch
)

set(DISABLE_ICU ON)
if("icu" IN_LIST FEATURES)
set(DISABLE_ICU OFF)
endif()
if ("xmlch_wchar" IN_LIST FEATURES)
set(XMLCHTYPE -Dxmlch-type=wchar_t)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DDISABLE_TESTS=ON
-DDISABLE_DOC=ON
-DDISABLE_SAMPLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ICU=${DISABLE_ICU}
-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON
${XMLCHTYPE}
)

vcpkg_install_cmake()

vcpkg_copy_pdbs()

if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xercesc)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XercesC TARGET_PATH share/xercesc)
endif()

file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake _contents)
string(REPLACE
"get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
"get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
_contents
"${_contents}"
)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake "${_contents}")

file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake _contents)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake "include(CMakeFindDependencyMacro)\nfind_dependency(Threads)\n${_contents}")

configure_file(
${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
${CURRENT_PACKAGES_DIR}/share/xercesc
@ONLY
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/xerces-c
REF v3.2.3
SHA512 aaafe2de4ea156d94e71e3631c79bd66660badf17bf2a19587a0ca34011f70bd1584a0beef909409a3ff05eecea9d37ffee6dbb267625f59217fd86705d2cd28
HEAD_REF master
PATCHES
disable-tests.patch
remove-dll-export-macro.patch
)

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

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
set(DISABLE_ICU ON)
if("icu" IN_LIST FEATURES)
set(DISABLE_ICU OFF)
endif()
if ("xmlch-wchar" IN_LIST FEATURES)
set(XMLCHTYPE -Dxmlch-type=wchar_t)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DDISABLE_TESTS=ON
-DDISABLE_DOC=ON
-DDISABLE_SAMPLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ICU=${DISABLE_ICU}
-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON
${XMLCHTYPE}
)

vcpkg_install_cmake()

vcpkg_copy_pdbs()

if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xercesc)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XercesC TARGET_PATH share/xercesc)
endif()

file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake _contents)
string(REPLACE
"get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
"get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
_contents
"${_contents}"
)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake "${_contents}")

file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake _contents)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake "include(CMakeFindDependencyMacro)\nfind_dependency(Threads)\n${_contents}")

configure_file(
${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
${CURRENT_PACKAGES_DIR}/share/xercesc
@ONLY
)

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

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
54 changes: 27 additions & 27 deletions ports/xerces-c/remove-dll-export-macro.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp
index 8071260..cd6bd68 100644
--- a/src/xercesc/util/XercesDefs.hpp
+++ b/src/xercesc/util/XercesDefs.hpp
@@ -133,7 +133,7 @@ typedef XMLUInt32 UCS4Ch;
// The DLL_EXPORT flag should be defined on the command line during the build of a DLL
// configure conspires to make this happen.

-#if defined(DLL_EXPORT)
+#if defined(XERCES_DLL_EXPORT)
#if defined(XERCES_BUILDING_LIBRARY)
#define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT
#define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
index e849e08..69fe3bf 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
@@ -85,9 +85,6 @@
#define XERCES_PLATFORM_EXPORT @XERCES_PLATFORM_EXPORT@
#define XERCES_PLATFORM_IMPORT @XERCES_PLATFORM_IMPORT@
#define XERCES_TEMPLATE_EXTERN @XERCES_TEMPLATE_EXTERN@
-#ifdef XERCES_DLL_EXPORT
-# define DLL_EXPORT
-#endif

// ---------------------------------------------------------------------------
// Include standard headers, if available, that we may rely on below.
diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp
index 8071260..cd6bd68 100644
--- a/src/xercesc/util/XercesDefs.hpp
+++ b/src/xercesc/util/XercesDefs.hpp
@@ -133,7 +133,7 @@ typedef XMLUInt32 UCS4Ch;
// The DLL_EXPORT flag should be defined on the command line during the build of a DLL
// configure conspires to make this happen.
-#if defined(DLL_EXPORT)
+#if defined(XERCES_DLL_EXPORT)
#if defined(XERCES_BUILDING_LIBRARY)
#define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT
#define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
index e849e08..69fe3bf 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
@@ -85,9 +85,6 @@
#define XERCES_PLATFORM_EXPORT @XERCES_PLATFORM_EXPORT@
#define XERCES_PLATFORM_IMPORT @XERCES_PLATFORM_IMPORT@
#define XERCES_TEMPLATE_EXTERN @XERCES_TEMPLATE_EXTERN@
-#ifdef XERCES_DLL_EXPORT
-# define DLL_EXPORT
-#endif
// ---------------------------------------------------------------------------
// Include standard headers, if available, that we may rely on below.