diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | docbook/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | docbook/Makefile.am | 17 | ||||
| -rw-r--r-- | docbook/Makefile.common | 1 | ||||
| -rw-r--r-- | docbook/Makefile.nmake | 11 | ||||
| -rwxr-xr-x | docbook/check_git_version.sh | 43 |
6 files changed, 1 insertions, 83 deletions
diff --git a/.gitignore b/.gitignore index d512d826b2..9c92cebc7f 100644 --- a/.gitignore +++ b/.gitignore @@ -147,7 +147,6 @@ docbook/*-guide-*.pdf docbook/ws?g_html/ docbook/ws?g_html_chunked/ docbook/ws?g_chm/ -docbook/git_version.xml docbook/release-notes-*.pdf docbook/release-notes.txt docbook/wsdg.validated diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index f7fa55fa90..a3c09833d6 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -232,7 +232,6 @@ set(WSDG_GRAPHICS # user-guide.xml must be first in the list set(WSUG_SOURCE user-guide.xml - git_version.xml ${WSUG_FILES} ${WSUG_GRAPHICS} ) @@ -252,7 +251,6 @@ ASCIIDOC2DOCBOOK( user-guide.asciidoc "${ASCIIDOC_CONF_FILES}" ) # developer-guide.xml must be first in the list set(WSDG_SOURCE developer-guide.xml - git_version.xml ${WSDG_FILES} ${WSDG_GRAPHICS} ) @@ -273,15 +271,6 @@ set(WSLUA_MODULES ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_struct.c ) -ADD_CUSTOM_COMMAND( - OUTPUT - git_version.xml - COMMAND ${SH_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/check_git_version.sh - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/check_git_version.sh -) - if(ENABLE_HTML_GUIDES) set(WSUG_HTML_OUTPUT wsug_html_chunked/index.html wsug_html/index.html) endif() diff --git a/docbook/Makefile.am b/docbook/Makefile.am index e25fca4bf9..8f8ae167ac 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -34,25 +34,11 @@ else endif if HAVE_XSLTPROC -ALL_TARGETS=git_version_check wsug wsdg release_notes -else -# if we don't have XSLTPROC, there's nothing to do... -ALL_TARGETS=git_version_check +ALL_TARGETS=wsug wsdg release_notes endif all: $(ALL_TARGETS) -# -# on every build, record the working copy revision string -# -# FORCE is the portable version of .PHONY -FORCE: - -git_version_check: FORCE - cat $(srcdir)/check_git_version.sh | tr -d '\015' | /bin/bash - -git_version.xml: git_version_check - # Wireshark User Guide if HAVE_FOP WSUG_TARGETS=wsug.validated wsug_html_chunked wsug_html user-guide-a4.pdf user-guide-us.pdf @@ -258,7 +244,6 @@ EXTRA_DIST = \ $(WSUG_DIST) \ $(WSDG_DIST) \ $(RELEASE_NOTES_SOURCE) \ - check_git_version.sh \ dfilter2xml.pl \ make-wsluarm.pl \ README.txt \ diff --git a/docbook/Makefile.common b/docbook/Makefile.common index e56a534df2..4c9e941334 100644 --- a/docbook/Makefile.common +++ b/docbook/Makefile.common @@ -243,7 +243,6 @@ CLEANFILES = \ release_notes_chm \ release-notes.html \ release-notes.txt \ - git_version.xml \ user-guide.zip \ wsluarm diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index a1b14553a4..21c018fda4 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -57,17 +57,6 @@ maintainer-clean: distclean all_x: wsug.validated wsdg.validated wsug_x wsdg_x release_notes_x -# -- Documentation version ------------------------------------------------------------------------ - -# On every build, record the working copy revision string -# in git_version.xml (if the git version has changed). -# This is done during nmake "preprocessing" so that it's done *before* -# nmake gets the date/time of the dependency file(s)]. -git_version_check: _FORCE_ - $(SH) ./check_git_version.sh - -git_version.xml: git_version_check - # -- User Guide ------------------------------------------------------------------------ wsug_x: wsug_html_chunked wsug_html user-guide-a4.pdf user-guide-us.pdf user-guide.chm diff --git a/docbook/check_git_version.sh b/docbook/check_git_version.sh deleted file mode 100755 index b1ef85892a..0000000000 --- a/docbook/check_git_version.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# Check for Git version -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 2005 Ulf Lamping -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -GIT_VERSION="unknown git version" -if [ -d ../.git ] ; then - GIT_VERSION=`git describe --always --long` -fi -echo '<!ENTITY GitVersion "'${GIT_VERSION}'">' > git_version_tmp.xml - -#echo -n '<!ENTITY GitVersion "' > git_version_tmp.xml -#[ -x svnversion ] && svnversion -n . >> git_version_tmp.xml -#echo '">' >> git_version_tmp.xml - -# /dev/null buries the output of the "cmp" command. -diff git_version.xml git_version_tmp.xml &> /dev/null - -if [ $? -ne 0 ] -then - cp git_version_tmp.xml git_version.xml -fi - -rm git_version_tmp.xml - |