You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2020/09/05 20:51:31 UTC
[logging-log4cxx] branch logcxx_510_rm_vs2019 updated (bda5252 ->
e37622a)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from bda5252 ensured that things work with expat
new ff3fefa Use find expat
new 70855b8 MD5 is not used anymore for releases and the SHA file extension needed to be different because of SHA-512. (#36)
new d438c8f Added .asf.yaml file to better configure the github git mirror (#38)
new 11f8fa9 Search for programs needed for tests (#37)
new cd83d33 Changed some docs and model dependencies for tests etc. using MVN. (#35)
new f1bf48b Add CMAKE_PROGRAM_PATH to path for tests
new e37622a Merge branch 'logcxx_510_rm_vs2019' of https://github.com/apache/logging-log4cxx into logcxx_510_rm_vs2019
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/cmake/FindAPR-Util.cmake | 1 -
src/site/apt/building/cmake.apt | 15 +++++++++++++++
src/test/cpp/CMakeLists.txt | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
[logging-log4cxx] 05/07: Changed some docs and model dependencies
for tests etc. using MVN. (#35)
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit cd83d33fe679f8e3e6625214c03fb3e3bbbe9751
Author: Thorsten Schöning <62...@users.noreply.github.com>
AuthorDate: Fri Sep 4 02:50:28 2020 +0200
Changed some docs and model dependencies for tests etc. using MVN. (#35)
* Remove reference to build tools that are no longer supported
* Remove the Java style dependencies page
* Add a paragraph on the building page on running unit tests
* Add a systems to the 'covered by team' section
* Add a systems to the 'covered by team' section
* Incorporate changes from review
* Incorporate changes from review
* Keep the dependencies, but try to make more use of them regarding necessary binaries to test with.
This reverts commit b42df2f2a6f8b1eafc6ad36b222c2a0edf8a7244.
* A PoC of adding depenencies like GREP etc. using Maven and public repos.
* Added a PoC to model necessary bins for tests using a local MVN-repo.
* Couldn't find a reference that ZIP is necessary for tests. I don't have it in my PATH-variable.
* Had an additional look at what is really necessary for tests and couldn't find a reference to GREP anymore. Additionally, GZIP seems to be required at runtime in "gzcompressaction.cpp" as well, not only in tests or better, not additionally in tests. So I've refactored the modeled dependencies to take that into account.
* Put dependencies in markdown format
* Replacing MVN-based dependencies in favour of a customly maintained markdown-table with those. MVN might be removed in the not too far future anyway and the approach using a local repo seems pretty complicated as well. The markdown document as well easily provides support for arbitrary describing text beyond a table.
* Added a hint that CMAKE does things automatically only.
Co-authored-by: Stephen Webb <st...@sabreautonomous.com.au>
Co-authored-by: Stephen Webb <sw...@gmail.com>
Co-authored-by: Robert Middleton <ro...@rm5248.com>
---
INSTALL | 26 ++-
pom.xml | 9 -
src/site/apt/building/vstudio.apt | 86 --------
src/site/markdown/dependencies.md | 59 ++++++
src/site/xdoc/building/index.xml | 405 ++++++++++++++++++++------------------
5 files changed, 288 insertions(+), 297 deletions(-)
diff --git a/INSTALL b/INSTALL
index 89baa3e..6844f94 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,24 +15,20 @@ limitations under the License.
Detailed build instructions are provided for in both HTML
and APT format in releases. The APT sources are
-available in Subversion checkouts.
-
-autotools:
-site/building/autotools.html
-src/site/apt/building/autotools.apt
-
-Apache Ant:
-site/building/ant.html
-src/site/apt/building/ant.apt
+available in Git checkouts.
Apache Maven 2:
site/building/maven.html
src/site/apt/building/maven.apt
-Microsoft Visual Studio:
-site/building/vstudio.html
-src/site/apt/building/vstudio.apt
+autotools:
+site/building/autotools.html
+src/site/apt/building/autotools.apt
+
+CMake:
+site/building/cmake.html
+src/site/apt/building/cmake.apt
-Apple Xcode:
-site/building/xcode.html
-src/site/apt/building/xcode.apt
+Microsoft Vcpkg:
+site/building/vcpkg.html
+src/site/apt/building/vcpkg.apt
diff --git a/pom.xml b/pom.xml
index e08e09f..ba23870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,15 +353,6 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
diff --git a/src/site/apt/building/vstudio.apt b/src/site/apt/building/vstudio.apt
deleted file mode 100644
index 8305838..0000000
--- a/src/site/apt/building/vstudio.apt
+++ /dev/null
@@ -1,86 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with
-~~ this work for additional information regarding copyright ownership.
-~~ The ASF licenses this file to You under the Apache License, Version 2.0
-~~ (the "License"); you may not use this file except in compliance with
-~~ the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
- ------
- Building Apache log4cxx with Microsoft Visual Studio
- ------
- ------
- ------
-
-Building Apache log4cxx with Microsoft Visual Studio
-
-*Preparation
-
-+----+
-unzip apr-1.2.11-win32-src.zip
-rename apr-1.2.11 apr
-unzip apr-util-1.2.10-win32-src.zip
-rename apr-util-1.2.10 apr-util
-cd apache-log4cxx-x.x.x
-configure
-configure-aprutil
-+----+
-
- configure.bat copies the prefabricated log4cxx.hw and private/log4cxx_private.hw over
- to log4cxx.h and private/log4cxx_private.h.
-
- configure-aprutil.bat uses "sed" to modify apu.hw and apr_ldap.hw to disable APR-Iconv
- and LDAP which are not necessary for log4cxx and problematic to build.
- If "sed" is not available, the modifications would be trivial to do in any text editor.
-
- Use the Win32 source zips for APR and APR-Util to preserve the required line endings
- for the project files. Directories need to be renamed to "apr" and "apr-util" respectively.
-
-
-
-*Building log4cxx.dll
-
- Open projects/log4cxx.dsw with Microsoft
- Visual Studio 6 or later at which time you may be prompted to
- upgrade the projects to the format used by your version
- of Microsoft Visual Studio.
-
- Select log4cxx as active project and build.
-
-
-*Running unit tests
-
- To pass the unit tests, gzip, zip and sed must be on the path.
- Also three
- environment variables need to be defined: TOTO=wonderful,
- key1=value1 and key2=value2. These must be done outside
- of Microsoft Visual Studio, either in the Control Panel or
- in a Command Prompt used to launch Microsoft Visual Studio.
-
- Open projects/testsuite.dsw or projects/testsuite-standalone.dsw
- (test suite and implementation in one project) in Microsoft Visual
- Studio, select active project and build.
-
- On the Debug Tab of the Project/Settings dialog,
- set the Working Directory to "../src/test/resources".
- Individual tests can be specified in Program Arguments
- and "-v" can be specified to output verbose test results.
-
-
-*Known Issues
-
- *APR 1.2.12 has a known issue that will prevent
- compilation with Visual Studio 6 unless a later Platform SDK is installed.
- See APR bug {{{https://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}.
- APR 1.2.11 and the corresponding APR-Util 1.2.10 will compile with Visual Studio 6.
-
- *APR-Util requires later LDAP headers than provided with Visual Studio 6
- and will fail to compile. log4cxx does not use LDAP, it can be disabled in apr_ldap.hw.
-
- *APR-Iconv is problematic and not used by log4cxx, it can be disabled in apu.hw.
diff --git a/src/site/markdown/dependencies.md b/src/site/markdown/dependencies.md
new file mode 100644
index 0000000..49a21ec
--- /dev/null
+++ b/src/site/markdown/dependencies.md
@@ -0,0 +1,59 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+# LOG4CXX Dependencies
+
+log4cxx requires the following software to build and/or run correctly:
+
+|Dependency Name|Version|Dependency Type|Homepage|
+|---------------|-------|---------------|--------|
+|Apache Portable Runtime(APR)|>=1.5.4|Compile/Runtime|https://apr.apache.org
+|APR-Util |>=1.5.4|Compile/Runtime|https://apr.apache.org
+|gzip |any |Test/Runtime(optional)|https://gzip.org
+|sed |any |Test|N/A
+|zip |any |Test/Runtime(optional)|N/A
+|log4j |1.2.14 |Test |https://http://logging.apache.org/log4j/2.x/
+|java |>=6 |Test |https://adoptopenjdk.net
+
+## APR+APR-Util
+
+The Apache Portable Runtime(APR) provides the cross-platform backend for log4cxx.
+Both APR and APR-util need to be installed and available on your system.
+
+## sed+gzip+zip
+
+These applications are needed during test of log4cxx. `gzip`and `sed` are generally installed
+by default on Linux. `zip` may not be installed by default; check your distribution's
+documentation for information on how to install these applications.
+
+For Windows, you will have to install those tools through a system such as
+MinGW, cygwin, or MSYS2.
+
+`gzip` and `zip` only needed during runtime if you are compressing the log
+files, for example by setting a rollover policy which ends in `.gz` or `.zip`.
+
+## log4j+Java
+
+log4j and Java are needed to run some tests to ensure that log4cxx has binary compatability with
+log4j. Note that the correct binary for log4j will be downloaded and used automatically if CMAKE is
+used to build the project, otherwise one needs to get that manually. Java needs to be installed on
+the system already in all cases, but with CMAKE again, if it's not, the corresponding tests are
+skipped entirely automatically.
+
+# Licenses(direct dependencies only)
+
+**Apache License, Version 2.0**: log4cxx, APR, APR-util
diff --git a/src/site/xdoc/building/index.xml b/src/site/xdoc/building/index.xml
index 1a28ce1..e7303e6 100644
--- a/src/site/xdoc/building/index.xml
+++ b/src/site/xdoc/building/index.xml
@@ -1,187 +1,218 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<document>
- <properties>
- <title>Building Apache log4cxx</title>
- </properties>
-
- <body>
- <section name="Building Apache log4cxx">
- <p>
- The project supports different build tools on different platforms, have a look at
- the menu to find the platform you need. If your environment is not covered already,
- feel free to ask about it on one of the <a href="../mail-lists.html">Mailing Lists</a>
- or leave a bug in our <a href="../issue-tracking.html">Issue Tracker</a>. In this
- case it would be very helpful of course if you could already provide some patches
- to support your environment or at least provide some technical details about the
- build tools, compiler etc. you use.
- </p>
- </section>
-
- <section name="Covered by the team">
- <p>
- The following table provides an overview about the environments some of the team
- members have access to and therefore normally should work out of the box or at
- least were used sometimes in the past. This list by no means tells something about
- how good the support on each platform is, it's just a guide.
- </p>
-
- <table>
- <caption>Environments in use</caption>
- <thead>
- <tr>
- <th id="os">OS</th>
- <th id="os_x86_x64">x86 vs. x64</th>
- <th id="environment">Environment</th>
- <th id="compiler">Compiler</th>
- <th id="compiler_x86_x64">x86 vs. x64</th>
- </tr>
- </thead>
- <tbody>
- <!-- Windows -->
- <tr>
- <td headers="os"
- rowspan="9">
- Windows 7
- </td>
- <td headers="os_x86_x64"
- rowspan="9">
- x64
- </td>
- <td headers="environment"
- rowspan="6">
- Win32
- </td>
- <td headers="compiler">
- MS Visual Studio 2008
- </td>
- <td headers="compiler_x86_x64"
- rowspan="5">
- both
- </td>
- </tr>
- <tr>
- <td headers="compiler">MS Visual Studio 2010 (Pro)</td>
- </tr>
- <tr>
- <td headers="compiler">MS Visual Studio 2010 (Express)</td>
- </tr>
- <tr>
- <td headers="compiler">MS Visual Studio 2012</td>
- </tr>
- <tr>
- <td headers="compiler">MS Visual Studio 2013 (Express)</td>
- </tr>
- <tr>
- <td headers="compiler">Embarcadero C++ Builder XE 4</td>
- <td headers="compiler_x86_x64">x86</td>
- </tr>
- <tr>
- <td headers="environment"
- rowspan="2">
- MinGW
- </td>
- <td headers="compiler">
- gcc 4.5.4
- </td>
- <td headers="compiler_x86_x64"
- rowspan="3">
- both
- </td>
- </tr>
- <tr>
- <td headers="compiler">gcc 4.6.4</td>
- </tr>
- <tr>
- <td headers="environment">Cygwin</td>
- <td headers="compiler">gcc 4.8.2</td>
- </tr>
- <!-- Linux -->
- <tr>
- <td headers="os"
- rowspan="2">
- Debian
- </td>
- <td headers="os_x86_x64"
- rowspan="2">
- x86
- </td>
- <td headers="environment"
- rowspan="11">
- Posix
- </td>
- <td headers="compiler">
- gcc
- </td>
- <td headers="compiler_x86_x64"
- rowspan="2">
- x86
- </td>
- </tr>
- <tr>
- <td headers="compiler">clang</td>
- </tr>
- <tr>
- <td headers="os" rowspan="7">
- Ubuntu and Scientific Linux
- </td>
- <td headers="os_x86_x64"
- rowspan="9">
- x64
- </td>
- <td headers="compiler">
- gcc 4.5
- </td>
- <td headers="compiler_x86_x64"
- rowspan="8">
- both
- </td>
- </tr>
- <tr>
- <td headers="compiler">gcc 4.6</td>
- </tr>
- <tr>
- <td headers="compiler">gcc 4.7</td>
- </tr>
- <tr>
- <td headers="compiler">gcc 4.8</td>
- </tr>
- <tr>
- <td headers="compiler">Intel 11.1</td>
- </tr>
- <tr>
- <td headers="compiler">Intel 12.1</td>
- </tr>
- <tr>
- <td headers="compiler">Intel 13.1</td>
- </tr>
- <tr>
- <td headers="os">Red Hat</td>
- <td headers="compiler">gcc</td>
- </tr>
- <!-- Mac OS X -->
- <tr>
- <td headers="os">Mac OS X 10.9 Mavericks</td>
- <td headers="compiler">Xcode 5.0.2</td>
- <td headers="compiler_x86_x64">x64</td>
- </tr>
- </tbody>
- </table>
- </section>
- </body>
-</document>
\ No newline at end of file
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<document>
+ <properties>
+ <title>Building Apache log4cxx</title>
+ </properties>
+
+ <body>
+ <section name="Building Apache log4cxx">
+ <p>
+ The project supports different build tools on different platforms, have a look at
+ the menu to find the platform you need. If your environment is not covered already,
+ feel free to ask about it on one of the <a href="../mail-lists.html">Mailing Lists</a>
+ or leave a bug in our <a href="../issue-tracking.html">Issue Tracker</a>. In this
+ case it would be very helpful of course if you could already provide some patches
+ to support your environment or at least provide some technical details about the
+ build tools, compiler etc. you use.
+ </p>
+ </section>
+
+ <section name="Running unit tests">
+ <p>
+ Autotools will link all tests into a single executable (testsuite).
+ The cmake build generates a number of executables which can be run using the ctest
+ tool. Some unit tests will fail if sed and gzip are not available.
+ </p>
+ </section>
+
+ <section name="Covered by the team">
+ <p>
+ The following table provides an overview about the environments some of the team
+ members have access to and therefore normally should work out of the box or at
+ least were used sometimes in the past. This list by no means tells something about
+ how good the support on each platform is, it's just a guide.
+ </p>
+
+ <table>
+ <caption>Environments in use</caption>
+ <thead>
+ <tr>
+ <th id="os">OS</th>
+ <th id="os_arch">Architecture</th>
+ <th id="environment">Environment</th>
+ <th id="compiler">Compiler</th>
+ <th id="compiler_arch">Architecture</th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- Windows -->
+ <tr>
+ <td headers="os"
+ rowspan="9">
+ Windows 7
+ </td>
+ <td headers="os_arch"
+ rowspan="9">
+ x64
+ </td>
+ <td headers="environment"
+ rowspan="6">
+ Win32
+ </td>
+ <td headers="compiler">
+ MS Visual Studio 2008
+ </td>
+ <td headers="compiler_arch"
+ rowspan="5">
+ x86 and x64
+ </td>
+ </tr>
+ <tr>
+ <td headers="compiler">MS Visual Studio 2010 (Pro)</td>
+ </tr>
+ <tr>
+ <td headers="compiler">MS Visual Studio 2010 (Express)</td>
+ </tr>
+ <tr>
+ <td headers="compiler">MS Visual Studio 2012</td>
+ </tr>
+ <tr>
+ <td headers="compiler">MS Visual Studio 2013 (Express)</td>
+ </tr>
+ <tr>
+ <td headers="compiler">Embarcadero C++ Builder XE 4</td>
+ <td headers="compiler_arch">x86</td>
+ </tr>
+ <tr>
+ <td headers="environment"
+ rowspan="2">
+ MinGW
+ </td>
+ <td headers="compiler">
+ gcc 4.5.4
+ </td>
+ <td headers="compiler_arch"
+ rowspan="3">
+ x86 and x64
+ </td>
+ </tr>
+ <tr>
+ <td headers="compiler">gcc 4.6.4</td>
+ </tr>
+ <tr>
+ <td headers="environment">Cygwin</td>
+ <td headers="compiler">gcc 4.8.2</td>
+ </tr>
+ <tr>
+ <td headers="os">Windows 10</td>
+ <td headers="os_arch">x64</td>
+ <td headers="environment">Win32</td>
+ <td headers="compiler">MS Visual Studio 2019 (Community)</td>
+ <td headers="compiler_arch">x86</td>
+ </tr>
+ <!-- Linux -->
+ <tr>
+ <td headers="os"
+ rowspan="2">
+ Debian
+ </td>
+ <td headers="os_arch"
+ rowspan="2">
+ x86
+ </td>
+ <td headers="environment"
+ rowspan="14">
+ Posix
+ </td>
+ <td headers="compiler">
+ gcc
+ </td>
+ <td headers="compiler_arch"
+ rowspan="2">
+ x86
+ </td>
+ </tr>
+ <tr>
+ <td headers="compiler">clang</td>
+ </tr>
+ <tr>
+ <td headers="os" rowspan="8">
+ Ubuntu and Scientific Linux
+ </td>
+ <td headers="os_arch"
+ rowspan="10">
+ x64
+ </td>
+ <td headers="compiler">
+ gcc 4.5
+ </td>
+ <td headers="compiler_arch"
+ rowspan="8">
+ x86 and x64
+ </td>
+ </tr>
+ <tr>
+ <td headers="compiler">gcc 4.6</td>
+ </tr>
+ <tr>
+ <td headers="compiler">gcc 4.7</td>
+ </tr>
+ <tr>
+ <td headers="compiler">gcc 4.8</td>
+ </tr>
+ <tr>
+ <td headers="compiler">gcc 7.5</td>
+ </tr>
+ <tr>
+ <td headers="compiler">Intel 11.1</td>
+ </tr>
+ <tr>
+ <td headers="compiler">Intel 12.1</td>
+ </tr>
+ <tr>
+ <td headers="compiler">Intel 13.1</td>
+ </tr>
+ <tr>
+ <td headers="os">Red Hat</td>
+ <td headers="compiler">gcc</td>
+ </tr>
+ <!-- Mac OS X -->
+ <tr>
+ <td headers="os">Mac OS X 10.9 Mavericks</td>
+ <td headers="compiler">Xcode 5.0.2</td>
+ <td headers="compiler_arch">x64</td>
+ </tr>
+ <!-- Arm -->
+ <tr>
+ <td headers="os">Raspian</td>
+ <td headers="os_arch">armv7</td>
+ <td headers="compiler">gcc 8.3</td>
+ <td headers="compiler_arch">armv7</td>
+ </tr>
+ <tr>
+ <td headers="os">Ubuntu 20.04</td>
+ <td headers="os_arch">armv8</td>
+ <td headers="compiler">gcc 9.10</td>
+ <td headers="compiler_arch">aarch</td>
+ </tr>
+ </tbody>
+ </table>
+ </section>
+ </body>
+</document>
[logging-log4cxx] 01/07: Use find expat
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit ff3fefad1a7e221913b43dc306080a8b5359324b
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Thu Sep 3 21:18:31 2020 -0400
Use find expat
Use expat variables to link
---
CMakeLists.txt | 3 +++
src/CMakeLists.txt | 2 +-
src/cmake/FindAPR-Util.cmake | 2 --
src/test/cpp/CMakeLists.txt | 10 ++++++++++
src/test/cpp/xml/CMakeLists.txt | 2 +-
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d30a71b..3ecf5f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,9 @@ find_package(APR REQUIRED)
# Find Apache Runtime Utilities
find_package(APR-Util REQUIRED)
+# Find expat for XML parsing
+find_package(EXPAT REQUIRED)
+
# Building
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e0cb17..9a450b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
add_subdirectory(main)
target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} )
target_include_directories(log4cxx INTERFACE $<INSTALL_INTERFACE:include> PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR})
-target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES} ${APR_LIBRARIES} ${APR_SYSTEM_LIBS})
+target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS})
if(WIN32)
# The ODBC appender is always enabled in the Windows configuration
target_link_libraries(log4cxx PRIVATE odbc32.lib)
diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake
index 76d4c3b..aecb240 100644
--- a/src/cmake/FindAPR-Util.cmake
+++ b/src/cmake/FindAPR-Util.cmake
@@ -52,8 +52,6 @@ else()
else()
find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1)
find_program(APR_UTIL_DLL libaprutil-1.dll)
- find_library(XMLLIB_LIBRARIES NAMES libexpatd)
- find_program(XMLLIB_DLL libexpatd.dll)
endif()
endif()
diff --git a/src/test/cpp/CMakeLists.txt b/src/test/cpp/CMakeLists.txt
index d81b213..2e847d5 100644
--- a/src/test/cpp/CMakeLists.txt
+++ b/src/test/cpp/CMakeLists.txt
@@ -5,6 +5,16 @@ target_include_directories(testingFramework PRIVATE ${CMAKE_CURRENT_LIST_DIR} $<
add_subdirectory(util)
target_sources(testingUtilities PRIVATE xml/xlevel.cpp)
+set( LOG4CXX_TEST_PROGRAM_PATH "" CACHE PATH "Extra path for test programs" )
+set( CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH}" ${LOG4CXX_PROGRAM_PATH} )
+
+# sed, zip, and gzip are needed for the tests to work properly
+# Note: option 'required' not available until cmake 3.18, however adding
+# it does not cause an issue
+find_program(SED_APP sed REQUIRED)
+find_program(ZIP_APP zip REQUIRED)
+find_program(GZIP_APP gzip REQUIRED)
+
# Tests defined in this directory
set(ALL_LOG4CXX_TESTS
asyncappendertestcase
diff --git a/src/test/cpp/xml/CMakeLists.txt b/src/test/cpp/xml/CMakeLists.txt
index bddfe48..138c489 100644
--- a/src/test/cpp/xml/CMakeLists.txt
+++ b/src/test/cpp/xml/CMakeLists.txt
@@ -4,5 +4,5 @@ add_executable(xmltests
xmllayouttestcase
)
-target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES})
+target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT)
set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE)
[logging-log4cxx] 07/07: Merge branch 'logcxx_510_rm_vs2019' of
https://github.com/apache/logging-log4cxx into logcxx_510_rm_vs2019
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit e37622af7e9ef325595b2e5888c0917ece273c4e
Merge: f1bf48b bda5252
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Sat Sep 5 13:50:48 2020 -0700
Merge branch 'logcxx_510_rm_vs2019' of https://github.com/apache/logging-log4cxx into logcxx_510_rm_vs2019
[logging-log4cxx] 02/07: MD5 is not used anymore for releases and
the SHA file extension needed to be different because of SHA-512. (#36)
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 70855b85b14ff394f688f325f31e71e5facb40d1
Author: Thorsten Schöning <62...@users.noreply.github.com>
AuthorDate: Thu Aug 27 02:06:31 2020 +0200
MD5 is not used anymore for releases and the SHA file extension needed to be different because of SHA-512. (#36)
---
release_perform.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/release_perform.sh b/release_perform.sh
index a6d8565..b55461c 100755
--- a/release_perform.sh
+++ b/release_perform.sh
@@ -76,15 +76,13 @@ function sign_and_copy
echo "Processing ${file}:"
gpg -ab --yes "${file}" > "${file}.asc"
- md5sum "${file}" > "${file}.md5"
- sha512sum "${file}" > "${file}.sha"
+ sha512sum "${file}" > "${file}.sha512"
# No symlinks because those would be treated as is, no hard-links because it should be safer for
# commits.
- cp --force "${file}" "${WD_DIST_DEV}"
- cp --force "${file}.asc" "${WD_DIST_DEV}"
- cp --force "${file}.md5" "${WD_DIST_DEV}"
- cp --force "${file}.sha" "${WD_DIST_DEV}"
+ cp --force "${file}" "${WD_DIST_DEV}"
+ cp --force "${file}.asc" "${WD_DIST_DEV}"
+ cp --force "${file}.sha512" "${WD_DIST_DEV}"
done
}
[logging-log4cxx] 06/07: Add CMAKE_PROGRAM_PATH to path for tests
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit f1bf48bdab448f40706d4968a2c457471354c4fd
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Thu Sep 3 20:04:57 2020 -0700
Add CMAKE_PROGRAM_PATH to path for tests
ensured that things work with expat
Updated documentation and made sure varaibles are correct
---
src/cmake/FindAPR-Util.cmake | 1 -
src/site/apt/building/cmake.apt | 15 +++++++++++++++
src/test/cpp/CMakeLists.txt | 7 ++++---
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake
index aecb240..b2da4b4 100644
--- a/src/cmake/FindAPR-Util.cmake
+++ b/src/cmake/FindAPR-Util.cmake
@@ -48,7 +48,6 @@ else()
if (APU_STATIC OR NOT BUILD_SHARED_LIBS)
set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC)
find_library(APR_UTIL_LIBRARIES NAMES aprutil-1)
- find_library(XMLLIB_LIBRARIES NAMES expat)
else()
find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1)
find_program(APR_UTIL_DLL libaprutil-1.dll)
diff --git a/src/site/apt/building/cmake.apt b/src/site/apt/building/cmake.apt
index fbbecac..9bfb794 100644
--- a/src/site/apt/building/cmake.apt
+++ b/src/site/apt/building/cmake.apt
@@ -57,6 +57,9 @@ $ sudo make install
| -DAPR_STATIC=yes | Link to the APR static library. By default, the log4cxx shared library is linked to the |
| | APR shared library. If BUILD_SHARED_LIBS=off, the static APR library is always used. |
*------------------------+---------------------------------------------------------------------------------------------+
+|-DLOG4CXX_TEST_PROGRAM_PATH=path| An extra path to prepend to the PATH for test programs. Log4cxx requires zip, |
+| | sed, and grep on the PATH in order for the tests to work properly. |
+*------------------------+---------------------------------------------------------------------------------------------+
Building and testing log4cxx on a Microsoft Windows with APR, Expat and APR-Util built from source
extracted into apr-1.7.0, libexpat(from github) and apr-util-1.6.1 in %HOMEPATH%\Libraries.
@@ -117,6 +120,18 @@ $ make
$ make install
+----+
+** Windows:
+
+The easiest way to get dependencies installed is to use vcpkg(for APR/expat), and msys2 for the command-line
+utilities(zip, grep, sed).
+
+Msys2 can be downloaded from: https://www.msys2.org/
+By default, this will be installed under C:\msys2, so you can add that to the build PATH by setting
+LOG4CXX_TEST_PROGRAM_PATH=C:/msys64/usr/bin in your build settings.
+
+For vcpkg, follow the directions at https://github.com/microsoft/vcpkg#quick-start-windows and then install
+the dependencies needed using `vcpkg install apr apr-util`.
+
* Using log4cxx in a CMake build
A log4cxxConfig.cmake and log4cxxConfigVersion.cmake is installed to allow use of find_package()
diff --git a/src/test/cpp/CMakeLists.txt b/src/test/cpp/CMakeLists.txt
index 2e847d5..72fdc27 100644
--- a/src/test/cpp/CMakeLists.txt
+++ b/src/test/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(util)
target_sources(testingUtilities PRIVATE xml/xlevel.cpp)
set( LOG4CXX_TEST_PROGRAM_PATH "" CACHE PATH "Extra path for test programs" )
-set( CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH}" ${LOG4CXX_PROGRAM_PATH} )
+set( CMAKE_PROGRAM_PATH "${LOG4CXX_TEST_PROGRAM_PATH};${CMAKE_PROGRAM_PATH}" )
# sed, zip, and gzip are needed for the tests to work properly
# Note: option 'required' not available until cmake 3.18, however adding
@@ -71,10 +71,11 @@ add_subdirectory(xml)
if( WIN32 )
get_filename_component(APR_DLL_DIR "${APR_DLL}" DIRECTORY)
get_filename_component(APR_UTIL_DLL_DIR "${APR_UTIL_DLL}" DIRECTORY)
- get_filename_component(XMLLIB_DLL_DIR "${XMLLIB_DLL}" DIRECTORY)
+ get_filename_component(EXPAT_LIB_DIR "${EXPAT_LIBRARY}" DIRECTORY)
+ set(EXPAT_DLL_DIR "${EXPAT_LIB_DIR}/../bin")
set(LOG4CXX_DLL_DIR "$<SHELL_PATH:$<TARGET_FILE_DIR:log4cxx>>;")
- set(PATH_FOR_TESTS ${APR_DLL_DIR};${APR_UTIL_DLL_DIR};${LOG4CXX_DLL_DIR};${XMLLIB_DLL_DIR}\;)
+ set(PATH_FOR_TESTS ${CMAKE_PROGRAM_PATH};${APR_DLL_DIR};${APR_UTIL_DLL_DIR};${LOG4CXX_DLL_DIR};${EXPAT_DLL_DIR}\;)
list(REMOVE_DUPLICATES PATH_FOR_TESTS)
set(NORMAL_PATH $ENV{PATH})
set(ESCAPED_PATH "")
[logging-log4cxx] 04/07: Search for programs needed for tests (#37)
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 11f8fa9e047b9d39eebc8efbe8b5785e74ae0289
Author: Robert Middleton <rm...@users.noreply.github.com>
AuthorDate: Sat Aug 29 14:29:16 2020 -0400
Search for programs needed for tests (#37)
* Search for programs needed for tests
* Renamed variables to not imply windows
---
CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ecf5f0..b728ff7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,3 +126,10 @@ message(STATUS " logchar type .................... : ${LOG4CXX_CHAR}")
message(STATUS " Using libESMTP .................. : ${HAS_LIBESMTP}")
message(STATUS " ODBC library .................... : ${HAS_ODBC}")
message(STATUS " syslog .......................... : ${HAS_SYSLOG}")
+
+if(BUILD_TESTING)
+message(STATUS "Applications required for tests:")
+message(STATUS " zip ............................. : ${ZIP_APP}")
+message(STATUS " sed ............................. : ${SED_APP}")
+message(STATUS " gzip ............................ : ${GZIP_APP}")
+endif(BUILD_TESTING)
[logging-log4cxx] 03/07: Added .asf.yaml file to better configure
the github git mirror (#38)
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit d438c8fe979f50b7f5b71fec300141103c5c6cd6
Author: Robert Middleton <rm...@users.noreply.github.com>
AuthorDate: Thu Aug 27 08:43:20 2020 -0400
Added .asf.yaml file to better configure the github git mirror (#38)
---
.asf.yaml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..0fa512b
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+notifications:
+ jira_options: link label
+
+github:
+ description: "Apache Log4cxx is a C++ port of Apache Log4j"
+ homepage: http://logging.apache.org/log4cxx
+ labels:
+ - apache
+ - logging
+ - cpp