Update the build help for Windows and Mac example toolchains. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/272de26b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/272de26b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/272de26b
Branch: refs/heads/LOG4J2-1442 Commit: 272de26b9becd7c6cf4ff972e2aaee745ec9c506 Parents: 4d2ff5c Author: Gary Gregory <[email protected]> Authored: Thu May 4 21:09:41 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu May 4 21:09:41 2017 -0700 ---------------------------------------------------------------------- src/site/markdown/build.md | 14 +++++++---- toolchains-sample-mac.xml | 52 +++++++++++++++++++++++++++++++++++++++++ toolchains-sample.xml | 52 ----------------------------------------- 3 files changed, 61 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/272de26b/src/site/markdown/build.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/build.md b/src/site/markdown/build.md index b63d985..2a4b29d 100644 --- a/src/site/markdown/build.md +++ b/src/site/markdown/build.md @@ -30,12 +30,16 @@ obtained by downloading it using the instructions at [Log4j Downloads](download. Log4j 2.x uses Maven 3 as its build tool. Log4j 2.x uses the Java 9 compiler in addition to the Java version installed in the path. This is accomplished by usin Maven's toolchains support. -Log4j 2 provides a sample toolchains XML file in the root folder. This may be used by -modifying it and installing the file as toolchains.xml in the .m2 folder or by using --t ./toolchains-sample.xml when invoking Maven. +Log4j 2 provides sample toolchains XML files in the root folder. This may be used by +modifying it and installing the file as toolchains.xml in the .m2 folder or by using the +following when invoking Maven. -To build and install Log4j in your local Maven cache, from -the root directory run: `mvn install` +``` +[Macintosh] -t ./toolchains-sample-mac.xml +[Windows] -t ./toolchains-sample-win.xml +``` + +To build and install Log4j in your local Maven cache, from the root directory run: `mvn install` Note that if your `/etc/hosts` file does not include an entry for your computer's hostname, then many unit tests may execute slowly due to DNS lookups to translate your hostname to an IP address in http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/272de26b/toolchains-sample-mac.xml ---------------------------------------------------------------------- diff --git a/toolchains-sample-mac.xml b/toolchains-sample-mac.xml new file mode 100644 index 0000000..ce360ad --- /dev/null +++ b/toolchains-sample-mac.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF8"?> +<!-- + ~ 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. + --> +<toolchains> + <!-- JDK toolchains --> + <toolchain> + <type>jdk</type> + <provides> + <version>1.7</version> + <vendor>sun</vendor> + </provides> + <configuration> + <jdkHome>/Library/Java/JavaVirtualMachines/java7/Contents/Home</jdkHome> + </configuration> + </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>1.8</version> + <vendor>sun</vendor> + </provides> + <configuration> + <jdkHome>/Library/Java/JavaVirtualMachines/java8/Contents/Home</jdkHome> + </configuration> + </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <version>9</version> + <vendor>sun</vendor> + </provides> + <configuration> + <jdkHome>/Library/Java/JavaVirtualMachines/java9/Contents/Home</jdkHome> + </configuration> + </toolchain> + + <!-- other toolchains --> +</toolchains> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/272de26b/toolchains-sample.xml ---------------------------------------------------------------------- diff --git a/toolchains-sample.xml b/toolchains-sample.xml deleted file mode 100644 index ce360ad..0000000 --- a/toolchains-sample.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF8"?> -<!-- - ~ 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. - --> -<toolchains> - <!-- JDK toolchains --> - <toolchain> - <type>jdk</type> - <provides> - <version>1.7</version> - <vendor>sun</vendor> - </provides> - <configuration> - <jdkHome>/Library/Java/JavaVirtualMachines/java7/Contents/Home</jdkHome> - </configuration> - </toolchain> - <toolchain> - <type>jdk</type> - <provides> - <version>1.8</version> - <vendor>sun</vendor> - </provides> - <configuration> - <jdkHome>/Library/Java/JavaVirtualMachines/java8/Contents/Home</jdkHome> - </configuration> - </toolchain> - <toolchain> - <type>jdk</type> - <provides> - <version>9</version> - <vendor>sun</vendor> - </provides> - <configuration> - <jdkHome>/Library/Java/JavaVirtualMachines/java9/Contents/Home</jdkHome> - </configuration> - </toolchain> - - <!-- other toolchains --> -</toolchains>
