Skip to content

[xalan-c] Use CMake build system, enables linux/mac build #5399

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

Closed
seanwarren wants to merge 1 commit into from
Closed

[xalan-c] Use CMake build system, enables linux/mac build #5399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions ports/xalan-c/0001-ALLOW_RTCc_IN_STL.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj b/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
diff --git a/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj b/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
index 5a9d6a0..a0d12e8 100644
--- a/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
+++ b/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
--- a/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
+++ b/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
@@ -159,7 +159,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
Expand All @@ -20,10 +20,10 @@ index 5a9d6a0..a0d12e8 100644
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj b/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
diff --git a/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj b/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
index 27958b5..9f7767b 100644
--- a/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
+++ b/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
--- a/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
+++ b/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
@@ -159,6 +159,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
Expand All @@ -41,10 +41,10 @@ index 27958b5..9f7767b 100644
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj b/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
diff --git a/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj b/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
index facbbc1..53b83a8 100644
--- a/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
+++ b/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
--- a/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
+++ b/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
@@ -144,7 +144,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
Expand Down
6 changes: 3 additions & 3 deletions ports/xalan-c/0002-no-mfc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN a/c/Projects/Win32/Res/AllInOne/AllInOne.rc b/c/Projects/Win32/Res/AllInOne/AllInOne.rc
--- a/c/Projects/Win32/Res/AllInOne/AllInOne.rc 2012-03-19 16:18:11.000000000 +0000
+++ b/c/Projects/Win32/Res/AllInOne/AllInOne.rc 2018-09-07 16:08:59.871434376 +0100
diff -urN a/Projects/Win32/Res/AllInOne/AllInOne.rc b/Projects/Win32/Res/AllInOne/AllInOne.rc
--- a/Projects/Win32/Res/AllInOne/AllInOne.rc 2012-03-19 16:18:11.000000000 +0000
+++ b/Projects/Win32/Res/AllInOne/AllInOne.rc 2018-09-07 16:08:59.871434376 +0100
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
Expand Down
18 changes: 9 additions & 9 deletions ports/xalan-c/0003-char16_t.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp b/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
--- a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2012-03-19 16:18:10.000000000 +0000
+++ b/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2018-09-07 16:08:39.207316486 +0100
diff -urN a/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp b/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
--- a/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2012-03-19 16:18:10.000000000 +0000
+++ b/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2018-09-07 16:08:39.207316486 +0100
@@ -84,7 +84,7 @@
const XalanDOMChar*
getName() const
Expand All @@ -19,9 +19,9 @@ diff -urN a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp b/c/src/xalanc/
&theFindData);
#pragma warning(pop)

diff -urN a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp
--- a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp 2012-03-19 16:18:10.000000000 +0000
+++ b/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp 2018-09-07 16:08:39.207316486 +0100
diff -urN a/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/src/xalanc/PlatformSupport/DOMStringHelper.cpp
--- a/src/xalanc/PlatformSupport/DOMStringHelper.cpp 2012-03-19 16:18:10.000000000 +0000
+++ b/src/xalanc/PlatformSupport/DOMStringHelper.cpp 2018-09-07 16:08:39.207316486 +0100
@@ -868,7 +868,7 @@
const XalanDOMChar* theRHS)
{
Expand All @@ -31,9 +31,9 @@ diff -urN a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/c/src/xalanc/Plat
#else
return doCollationCompare(
theLHS,
diff -urN a/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp b/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
--- a/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp 2012-03-19 16:18:10.000000000 +0000
+++ b/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp 2018-09-07 16:08:39.207316486 +0100
diff -urN a/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp b/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
--- a/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp 2012-03-19 16:18:10.000000000 +0000
+++ b/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp 2018-09-07 16:08:39.207316486 +0100
@@ -123,7 +123,7 @@

#if defined(XALAN_WINDOWS)
Expand Down
6 changes: 3 additions & 3 deletions ports/xalan-c/0004-macosx-dyld-fallback.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN a/c/Makefile.incl.in b/c/Makefile.incl.in
--- a/c/Makefile.incl.in 2012-10-14 21:54:01.000000000 +0100
+++ b/c/Makefile.incl.in 2018-09-07 16:08:15.559182228 +0100
diff -urN a/Makefile.incl.in b/Makefile.incl.in
--- a/Makefile.incl.in 2012-10-14 21:54:01.000000000 +0100
+++ b/Makefile.incl.in 2018-09-07 16:08:15.559182228 +0100
@@ -598,7 +598,7 @@
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind -seg1addr 0x38000000 -compatibility_version 1 -current_version $(LIB_MAJOR_DOT_VER) -install_name ${LINK_NAME} ${LDFLAGS}
LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS} ${LDFLAGS}
Expand Down
12 changes: 6 additions & 6 deletions ports/xalan-c/0005-fix-ftbfs-ld-as-needed.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN a/c/samples/Makefile.in b/c/samples/Makefile.in
--- a/c/samples/Makefile.in 2012-03-19 16:18:12.000000000 +0000
+++ b/c/samples/Makefile.in 2018-09-07 16:07:59.063089005 +0100
diff -urN a/samples/Makefile.in b/samples/Makefile.in
--- a/samples/Makefile.in 2012-03-19 16:18:12.000000000 +0000
+++ b/samples/Makefile.in 2018-09-07 16:07:59.063089005 +0100
@@ -88,7 +88,7 @@

$(XSL_LIB_DIR)/mod_xslt$(SHLIBSUFFIX) : $(XSL_OBJ_DIR)/mod_xslt.o
Expand Down Expand Up @@ -154,9 +154,9 @@ diff -urN a/c/samples/Makefile.in b/c/samples/Makefile.in
$(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/ThreadSafe/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<

diff -urN a/c/Tests/Makefile.in b/c/Tests/Makefile.in
--- a/c/Tests/Makefile.in 2012-03-19 16:18:12.000000000 +0000
+++ b/c/Tests/Makefile.in 2018-09-07 16:07:59.063089005 +0100
diff -urN a/Tests/Makefile.in b/Tests/Makefile.in
--- a/Tests/Makefile.in 2012-03-19 16:18:12.000000000 +0000
+++ b/Tests/Makefile.in 2018-09-07 16:07:59.063089005 +0100
@@ -62,7 +62,7 @@

$(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o
Expand Down
6 changes: 3 additions & 3 deletions ports/xalan-c/0006-fix-testxslt-segfault.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN a/c/src/xalanc/PlatformSupport/XalanLocator.hpp b/c/src/xalanc/PlatformSupport/XalanLocator.hpp
--- a/c/src/xalanc/PlatformSupport/XalanLocator.hpp 2012-09-27 07:59:33.000000000 +0100
+++ b/c/src/xalanc/PlatformSupport/XalanLocator.hpp 2018-09-07 16:07:11.070819930 +0100
diff -urN a/src/xalanc/PlatformSupport/XalanLocator.hpp b/src/xalanc/PlatformSupport/XalanLocator.hpp
--- a/src/xalanc/PlatformSupport/XalanLocator.hpp 2012-09-27 07:59:33.000000000 +0100
+++ b/src/xalanc/PlatformSupport/XalanLocator.hpp 2018-09-07 16:07:11.070819930 +0100
@@ -91,7 +91,7 @@
const XalanDOMChar* theAlternateId = getEmptyPtr())
{
Expand Down
6 changes: 3 additions & 3 deletions ports/xalan-c/0007-fix-readme-typos.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN a/c/README b/c/README
--- a/c/README 2012-10-13 05:52:45.000000000 +0100
+++ b/c/README 2018-09-07 16:06:24.602562653 +0100
diff -urN a/README b/README
--- a/README 2012-10-13 05:52:45.000000000 +0100
+++ b/README 2018-09-07 16:06:24.602562653 +0100
@@ -3,7 +3,7 @@

Project Description:
Expand Down
Loading