mirror of
https://github.com/weechat/weechat.git
synced 2026-07-09 11:13:12 +02:00
core: rename and convert ChangeLog.adoc to CHANGELOG.md
This commit is contained in:
+4082
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -322,7 +322,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in" "${CMAKE_CURRENT
|
||||
if(CYGWIN)
|
||||
install(FILES
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/README.adoc"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc"
|
||||
|
||||
-4195
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -17,7 +17,7 @@ override_dh_auto_configure:
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
|
||||
|
||||
override_dh_installchangelogs:
|
||||
dh_installchangelogs ChangeLog.adoc
|
||||
dh_installchangelogs CHANGELOG.md
|
||||
|
||||
%:
|
||||
dh $@ --builddirectory=$(BUILDDIR)
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ override_dh_auto_configure:
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
|
||||
|
||||
override_dh_installchangelogs:
|
||||
dh_installchangelogs ChangeLog.adoc
|
||||
dh_installchangelogs CHANGELOG.md
|
||||
|
||||
%:
|
||||
dh $@ --builddirectory=$(BUILDDIR)
|
||||
|
||||
+1
-20
@@ -111,7 +111,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
|
||||
-a docinfo1
|
||||
)
|
||||
|
||||
# sed arguments used to replace links in ChangeLog and release notes
|
||||
# sed arguments used to replace links in release notes
|
||||
set(SED_LINKS_ARGS
|
||||
-e "'s/issue #\\([0-9][0-9]*\\)/https:\\/\\/github.com\\/weechat\\/weechat\\/issues\\/\\1[issue #\\1^]/g'"
|
||||
-e "'s/bug #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/bugs\\/?\\1[bug #\\1^]/g'"
|
||||
@@ -121,25 +121,6 @@ if(ENABLE_MAN OR ENABLE_DOC)
|
||||
-e "'s/\\(CVE-[0-9][0-9]*-[0-9][0-9]*\\)/https:\\/\\/cve.mitre.org\\/cgi-bin\\/cvename.cgi?name=\\1[\\1^]/g'"
|
||||
)
|
||||
|
||||
# ChangeLog
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
|
||||
COMMAND sed ARGS ${SED_LINKS_ARGS} "${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc" > "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
|
||||
DEPENDS
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc"
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
|
||||
)
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html"
|
||||
COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -o ChangeLog.html "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
|
||||
DEPENDS
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
|
||||
COMMENT "Building ChangeLog.html"
|
||||
)
|
||||
add_custom_target(changelog DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html")
|
||||
|
||||
# Release notes
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
|
||||
|
||||
@@ -1188,7 +1188,7 @@ Where _component_ is one of following:
|
||||
|
||||
| core
|
||||
| AUTHORS.adoc +
|
||||
ChangeLog.adoc +
|
||||
CHANGELOG.md +
|
||||
Contributing.adoc +
|
||||
.github/FUNDING.yml +
|
||||
.github/ISSUE_TEMPLATE/* +
|
||||
|
||||
@@ -1208,7 +1208,7 @@ Où _composant_ est :
|
||||
|
||||
| core
|
||||
| AUTHORS.adoc +
|
||||
ChangeLog.adoc +
|
||||
CHANGELOG.md +
|
||||
Contributing.adoc +
|
||||
.github/FUNDING.yml +
|
||||
.github/ISSUE_TEMPLATE/* +
|
||||
|
||||
@@ -1324,7 +1324,7 @@ _component_ には以下から 1 つ選んで記入してください:
|
||||
|
||||
| core
|
||||
| AUTHORS.adoc +
|
||||
ChangeLog.adoc +
|
||||
CHANGELOG.md +
|
||||
Contributing.adoc +
|
||||
.github/FUNDING.yml +
|
||||
.github/ISSUE_TEMPLATE/* +
|
||||
|
||||
@@ -1159,7 +1159,7 @@ server->hook_timer_sasl = weechat_hook_timer (timeout * 1000,
|
||||
|
||||
| core
|
||||
| AUTHORS.adoc +
|
||||
ChangeLog.adoc +
|
||||
CHANGELOG.md +
|
||||
Contributing.adoc +
|
||||
.github/FUNDING.yml +
|
||||
.github/ISSUE_TEMPLATE/* +
|
||||
|
||||
@@ -54,12 +54,10 @@ cd "${build_dir}"
|
||||
run cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON "${BUILDARGS}"
|
||||
if [ -f "build.ninja" ]; then
|
||||
ninja -v
|
||||
ninja -v changelog
|
||||
ninja -v rn
|
||||
sudo ninja install
|
||||
else
|
||||
make VERBOSE=1 --jobs="$(nproc)"
|
||||
make VERBOSE=1 changelog
|
||||
make VERBOSE=1 rn
|
||||
sudo make install
|
||||
fi
|
||||
|
||||
+6
-8
@@ -22,7 +22,7 @@
|
||||
# Make a new WeeChat release:
|
||||
# 1. bump version
|
||||
# 2. git commit + tag
|
||||
# 3. compile, run, test, build changelog + rn + packages
|
||||
# 3. compile, run, test, build rn + packages
|
||||
# 4. test package: unpack, compile, run, test
|
||||
#
|
||||
|
||||
@@ -55,23 +55,24 @@ release_start ()
|
||||
fi
|
||||
mkdir -p "${build_dir}"
|
||||
pkg_tar="${build_dir}/weechat-${version}.tar"
|
||||
chglog="${build_dir}/doc/ChangeLog.html"
|
||||
rn="${build_dir}/doc/ReleaseNotes.html"
|
||||
}
|
||||
|
||||
release_bump_version ()
|
||||
{
|
||||
"${root_dir}/tools/bump_version.sh" stable
|
||||
sed -i \
|
||||
-e "s/^\(## Version ${version}\) (under dev)$/\1 (${date})/" \
|
||||
"${root_dir}/CHANGELOG.md"
|
||||
sed -i \
|
||||
-e "s/^\(== Version ${version}\) (under dev)$/\1 (${date})/" \
|
||||
"${root_dir}/ChangeLog.adoc" \
|
||||
"${root_dir}/ReleaseNotes.adoc"
|
||||
}
|
||||
|
||||
release_commit_tag ()
|
||||
{
|
||||
cd "${root_dir}"
|
||||
git commit -m "Version ${version}" version.sh ChangeLog.adoc ReleaseNotes.adoc || release_error "git commit error, release already done?"
|
||||
git commit -m "Version ${version}" version.sh CHANGELOG.md ReleaseNotes.adoc || release_error "git commit error, release already done?"
|
||||
git tag -a "v${version}" -m "WeeChat ${version}"
|
||||
}
|
||||
|
||||
@@ -87,7 +88,6 @@ release_build ()
|
||||
-DENABLE_TESTS=ON \
|
||||
"${root_dir}"
|
||||
make install
|
||||
make changelog
|
||||
make rn
|
||||
make test CTEST_OUTPUT_ON_FAILURE=TRUE
|
||||
make dist
|
||||
@@ -134,13 +134,11 @@ release_end ()
|
||||
echo " version : ${version}"
|
||||
echo " date : ${date}"
|
||||
echo " build dir: ${build_dir}"
|
||||
echo " rn : $rn"
|
||||
echo " packages :"
|
||||
for pkg in "${pkg_tar}".*; do
|
||||
echo " $pkg"
|
||||
done
|
||||
echo " chglog/rn:"
|
||||
echo " $chglog"
|
||||
echo " $rn"
|
||||
echo "=========================================================================="
|
||||
echo
|
||||
echo "*** SUCCESS! ***"
|
||||
|
||||
+1
-1
@@ -116,7 +116,7 @@ weechat_CONTENTS="
|
||||
usr/share/locale/
|
||||
usr/share/man/
|
||||
usr/share/doc/weechat/AUTHORS.adoc
|
||||
usr/share/doc/weechat/ChangeLog.adoc
|
||||
usr/share/doc/weechat/CHANGELOG.md
|
||||
usr/share/doc/weechat/Contributing.adoc
|
||||
usr/share/doc/weechat/COPYING
|
||||
usr/share/doc/weechat/README.adoc
|
||||
|
||||
Reference in New Issue
Block a user