[gtk-doc] gtkdoc-common: remove the perl version



commit dc3f36cfbc72e1f35803268a751c81e2fe374936
Author: Stefan Sauer <ensonic users sf net>
Date:   Fri Apr 28 14:11:54 2017 +0200

    gtkdoc-common: remove the perl version
    
    With the last script gone, drop the module and the perl dependency.

 Makefile.am           |    2 -
 README                |    3 -
 configure.ac          |   19 +--
 gtkdoc-common.pl.in   |  553 -------------------------------------------------
 tests/Makefile.am     |    9 +-
 tests/gtkdoc-common.t |   36 ----
 tests/tools.sh.in     |   11 +-
 7 files changed, 7 insertions(+), 626 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b9f3eb9..6624e10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@ bin_SCRIPTS = \
 
 gtkdocdatadir = $(datadir)/gtk-doc/data
 gtkdocdata_DATA = \
-       gtkdoc-common.pl        \
        gtk-doc.xsl             \
        version-greater-or-equal.xsl \
        devhelp2.xsd            \
@@ -98,7 +97,6 @@ CLEANFILES = \
 
 DISTCLEANFILES = \
   gtkdoc-check \
-  gtkdoc-common.pl \
   gtkdoc-depscan \
   gtkdoc-fixxref \
   gtkdocize \
diff --git a/README b/README
index d7beedb..b052456 100644
--- a/README
+++ b/README
@@ -31,9 +31,6 @@ dropped.
 Requirements
 ============
 
-Perl v5 - the main scripts are in Perl.
-    http://www.perl.com/
-
 Python 2.7, 3.x - the secondary scripts are written in Python
     http:///www.python.org
 
diff --git a/configure.ac b/configure.ac
index e74e4f7..fc37b3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ m4_define(gtk_doc_version, 1.25.1)
 AC_INIT([gtk-doc],[gtk_doc_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc],[gtk-doc])
 
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([gtkdoc-common.pl.in])
+AC_CONFIG_SRCDIR([gtk-doc.pc.in])
 AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([1.11 check-news std-options -Wno-portability tar-ustar no-dist-gzip dist-xz])
@@ -32,22 +32,6 @@ dnl Make sure we have pkg-config >= 0.19, so installing in $(datadir) is OK.
 PKG_PROG_PKG_CONFIG([0.19])
 
 dnl
-dnl Check for Perl.
-dnl
-AC_PATH_PROG([PERL], [perl])
-if test -z "$PERL"; then
-       AC_MSG_ERROR([perl not found])
-fi
-
-AC_MSG_CHECKING([if Perl version >= 5.16.0])
-if "$PERL" -e "require v5.16.0"; then
-       AC_MSG_RESULT([yes])
-else
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([perl >= 5.16.0 is required for gtk-doc])
-fi
-
-dnl
 dnl Check for Python.
 dnl
 AM_PATH_PYTHON([2.7])
@@ -237,7 +221,6 @@ AM_CONDITIONAL([HAVE_YELP_TOOLS],[test x$have_yelp_tools = xyes])
 
 AC_CONFIG_FILES([Makefile
 gtk-doc.pc
-gtkdoc-common.pl
 cmake/Makefile
 cmake/GtkDocConfig.cmake
 cmake/GtkDocConfigVersion.cmake
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 44e1a54..873e738 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = gobject bugs annotations fail empty program .
 if BUILD_TESTS
 
 TESTS = \
-  gtkdoc-common.t \
   gtkdoc-check.py gtkdoc-common.py \
   tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh \
   program.sh
@@ -21,10 +20,10 @@ TESTS_ENVIRONMENT = \
 
 endif
 
-EXTRA_DIST = gtkdoctest.sh tools.sh sanity.sh \
-       gobject.sh bugs.sh annotations.sh fail.sh empty.sh \
-       gtkdoc-common.t gtkdoc-fixxref.t gtkdoc-mkdb.t
-
+EXTRA_DIST = gtkdoctest.sh \
+  gtkdoc-check.py gtkdoc-common.py \
+  tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh \
+       program.sh
 
 # run any given test by running make <test>.check
 %.check: %
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index ac930e4..1bf19e0 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -7,14 +7,7 @@ tested=0
 
 echo "Running suite(s): gtk-doc-$suite";
 
-# we can use which here as we override the path in TEST_ENVIRONMENT
-
-# test perl scripts
-for file in gtkdoc-check gtkdoc-fixxref gtkdoc-scangobj ; do
-  @PERL@ -cwT `which $file`
-  if test $? = 1 ; then failed=`expr $failed + 1`; fi
-  tested=`expr $tested + 1`
-done
+# we use 'which' here as we override the path in TEST_ENVIRONMENT
 
 
 # test shell scripts
@@ -34,7 +27,7 @@ done
 
 
 # test python scripts
-for file in gtkdoc-depscan gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase; do
+for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf 
gtkdoc-rebase gtkdoc-scangobj; do
     fullfile=`which $file`
     @PYTHON@ -m py_compile $fullfile
     if test $? != 0 ; then failed=`expr $failed + 1`; fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]