Merge branch 'master' of https://gitbox.apache.org/repos/asf/logging-log4cxx
diff --git a/.editorconfig b/.editorconfig
index 8faf628..c013fc3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,28 @@
root = true
+[.editorconfig]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+tab_width = 4
+trim_trailing_whitespace = true
+
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
+insert_final_newline = true
tab_width = 4
trim_trailing_whitespace = true
+
+[*.sh]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+tab_width = 2
+trim_trailing_whitespace = true
diff --git a/autogen.sh b/autogen.sh
index 8a9b561..2ca2925 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,8 +17,8 @@
# Regenerate the files autoconf / automake
case `uname` in
- (Darwin) LIBTOOLIZE=glibtoolize ;;
- (*) LIBTOOLIZE=libtoolize ;;
+ (Darwin) LIBTOOLIZE=glibtoolize ;;
+ (*) LIBTOOLIZE=libtoolize ;;
esac
$LIBTOOLIZE --force --automake --copy
diff --git a/configure-aprutil.bat b/configure-aprutil.bat
index 576c22e..6477b2c 100755
--- a/configure-aprutil.bat
+++ b/configure-aprutil.bat
@@ -1,20 +1,19 @@
-ECHO OFF
+ECHO OFF
REM Licensed to the Apache Software Foundation (ASF) under one or more
REM contributor license agreements. See the NOTICE file distributed with
REM this work for additional information regarding copyright ownership.
REM The ASF licenses this file to You under the Apache License, Version 2.0
REM (the "License"); you may not use this file except in compliance with
REM the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
-REM
-REM
-sed -i -e "s/#define APU_HAVE_APR_ICONV\b.*/#define APU_HAVE_APR_ICONV 0/" ..\apr-util\include\apu.hw
-sed -i -e "s/#define APR_HAS_LDAP\b.*/#define APR_HAS_LDAP 0/" ..\apr-util\include\apr_ldap.hw
-
+REM
+
+sed -i -e "s/#define APU_HAVE_APR_ICONV\b.*/#define APU_HAVE_APR_ICONV 0/" ..\apr-util\include\apu.hw
+sed -i -e "s/#define APR_HAS_LDAP\b.*/#define APR_HAS_LDAP 0/" ..\apr-util\include\apr_ldap.hw
diff --git a/configure.bat b/configure.bat
index 1021514..b1101c0 100644
--- a/configure.bat
+++ b/configure.bat
@@ -5,15 +5,15 @@
REM The ASF licenses this file to You under the Apache License, Version 2.0
REM (the "License"); you may not use this file except in compliance with
REM the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
-REM
-REM
+REM
+
copy /Y src\main\include\log4cxx\log4cxx.hw src\main\include\log4cxx\log4cxx.h
copy /Y src\main\include\log4cxx\private\log4cxx_private.hw src\main\include\log4cxx\private\log4cxx_private.h
diff --git a/release_perform.sh b/release_perform.sh
index 7a3df1b..ce862d8 100755
--- a/release_perform.sh
+++ b/release_perform.sh
@@ -78,12 +78,12 @@
md5sum "${file}" > "${file}.md5"
sha512sum "${file}" > "${file}.sha"
- # No symlinks because those would be treated as is, no hardlinks because it should be safer for
+ # 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}.md5" "${WD_DIST_DEV}"
+ cp --force "${file}.sha" "${WD_DIST_DEV}"
done
}
diff --git a/release_purge.sh b/release_purge.sh
index 1abfcc8..64c6fe7 100755
--- a/release_purge.sh
+++ b/release_purge.sh
@@ -32,7 +32,7 @@
function purge_branch_and_tag
{
- git checkout "release_scripts"
+ git checkout "release_scripts"
git branch -D "next_stable"
git push --delete "origin" "next_stable"
