osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

As long as NEWS is still part of the git tree: At least don't differ 

because of different timezones.

Change-Id: I93809447db29c2cc5f848edb438ee16372b57453
Reviewed-on: https://code.wireshark.org/review/3824
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2014-08-25 07:54:13 +02:00 committed by Jörg Mayer
parent a84937198b
commit 7f05ae67d3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindASCIIDOC.cmake
View File

@ -90,7 +90,7 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conf_files )
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT
${_output}
COMMAND ${A2X_EXECUTABLE}
COMMAND TZ=UTC ${A2X_EXECUTABLE}
--format=text
--destination-dir=${CMAKE_CURRENT_BINARY_DIR}
--asciidoc-opts=${_conf_opts}

2
docbook/Makefile.am
View File

@ -249,7 +249,7 @@ release-notes.html: $(RELEASE_NOTES_SOURCE)
# create txt single page file (through HTML)
release-notes.txt: $(RELEASE_NOTES_SOURCE)
@ echo --- RELEASE NOTES - TXT ---
$(A2X) --format=text $(A2X_TEXT_OPTS) \
TZ=UTC $(A2X) --format=text $(A2X_TEXT_OPTS) \
--xsltproc-opts "--stringparam generate.toc \"article nop\"" \
$(srcdir)/release-notes.asciidoc
mv $(srcdir)/release-notes.text $@

1
docbook/Makefile.nmake
View File

@ -266,6 +266,7 @@ release-notes.txt: $(RELEASE_NOTES_SOURCE)
$(SH) <<
PATH=/usr/bin
PYTHONHOME=/
TZ=UTC
$(A2X) -v --format=text $(A2X_TEXT_OPTS) \
--xsltproc-opts "--stringparam generate.toc \"article nop\"" \
release-notes.asciidoc