Commit e95ea254 authored by Behdad Esfahbod's avatar Behdad Esfahbod Committed by Behdad Esfahbod

Update the build infrastructure. make distcheck works now!

2006-02-10  Behdad Esfahbod  <behdad@gnome.org>

        Update the build infrastructure.  make distcheck works now!

        * autogen.sh: Use a generic autogen.sh that uses gnome-common.

        * configure.in: Simplify gtk-doc stuff.  Update to newer syntax.

        * Makefile.am, src/Makefile.am, doc/reference/Makefile.am: Updated.
parent 2f710f0f
......@@ -22,3 +22,8 @@ install-sh
ltmain.sh
missing
mkinstalldirs
gtk-doc.make
omf.make
vte.spec
xmldocs.make
2006-02-10 Behdad Esfahbod <behdad@gnome.org>
Update the build infrastructure. make distcheck works now!
* autogen.sh: Use a generic autogen.sh that uses gnome-common.
* configure.in: Simplify gtk-doc stuff. Update to newer syntax.
* Makefile.am, src/Makefile.am, doc/reference/Makefile.am: Updated.
2006-02-10 Behdad Esfahbod <behdad@gnome.org>
* src/vte.c (_vte_invalidate_cells): Throttle invalidating to at most
......
......@@ -38,3 +38,5 @@ archive:
srpm: $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
rpmbuild -ts $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
......@@ -4,115 +4,20 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
PROJECT=vte
TEST_TYPE=-f
REQUIRED_AUTOMAKE_VERSION=1.8
DIE=0
PKG_NAME="vte"
have_libtool=false
if libtool --version < /dev/null > /dev/null 2>&1 ; then
libtool_version=`libtoolize --version | libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
case $libtool_version in
1.4*|1.5*)
have_libtool=true
;;
esac
fi
if $have_libtool ; then : ; else
echo
echo "You must have libtool 1.4 or newer installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
fi
# Tell the Mandrake autoconf wrapper to prefer autoconf 2.5.
WANT_AUTOCONF_2_5=1
export WANT_AUTOCONF_2_5
for autoconf in autoconf autoconf-2.59 autoconf-2.58 autoconf-2.57 autoconf-2.56 autoconf-2.55 autoconf-2.54 autoconf-2.53 autoconf-2.52 autoconf-2.51 autoconf-2.50 autoconf-2.5 ; do
if "$autoconf" --version < /dev/null > /dev/null 2>&1 ; then
version=`"$autoconf" --version | head -n 1 | awk '{print $NF}'`
acmajor=`echo "$version" | cut -f1 -d.`
acminor=`echo "$version" | cut -f2 -d.`
if test "$acmajor" -ge 3 ; then
break
fi
if test "$acmajor" -ge 2 ; then
if test "$acminor" -ge 50 ; then
break
fi
fi
fi
done
autoheader=`echo "$autoconf" | sed -e s,autoconf,autoheader,g`
if ! "$autoconf" --version < /dev/null > /dev/null 2>&1 ; then
echo
echo "You must have autoconf 2.52 installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
fi
autoheader=`echo "$autoconf" | sed s,autoconf,autoheader,g`
(freetype-config --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have freetype 2 installed to compile $PROJECT."
echo "Install the appropriate package for your distribution, or get the"
echo "source tarball at ftp://ftp.freetype.org/freetype/freetype2"
DIE=1
(test -f $srcdir/configure.in \
&& test -f $srcdir/README \
&& test -d $srcdir/src) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
}
have_automake=false
for automakev in 1.9 1.8 1.7 1.6 ; do
if automake-$automakev --version < /dev/null > /dev/null 2>&1 ; then
have_automake=true
break;
fi
done
if $have_automake ; then : ; else
echo
echo "You must have automake 1.6 installed to compile $PROJECT."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.6.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
fi
if test "$DIE" -eq 1; then
exit 1
fi
if test -z "$AUTOGEN_SUBDIR_MODE"; then
if test -z "$*"; then
echo "I am going to run ./configure with no arguments - if you wish "
echo "to pass any to it, please specify them on the $0 command line."
fi
fi
case $CC in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
esac
libtoolize -f -c
glib-gettextize -f -c
aclocal-$automakev $ACLOCAL_FLAGS
$autoheader
automake-$automakev -a -c $am_opt
$autoconf
cd gnome-pty-helper
aclocal-$automakev $ACLOCAL_FLAGS
$autoheader
automake-$automakev -a -c $am_opt
$autoconf
cd $ORIGDIR
if test -z "$AUTOGEN_SUBDIR_MODE"; then
$srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
chmod -Rf u+w $srcdir
echo
echo "Now type 'make' to compile $PROJECT."
fi
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME CVS"
exit 1
}
USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
AC_INIT(vte.pc.in)
VERSION=`grep ^Version: $srcdir/vte.spec | awk '{print $NF}'`
AM_INIT_AUTOMAKE(vte,$VERSION)
AC_PREREQ(2.56)
AC_INIT(vte, [0.11.17],
[http://bugzilla.gnome.org/enter_bug.cgi?product=vte])
AC_CONFIG_SRCDIR([src/vte.c])
AM_INIT_AUTOMAKE(1.6)
AM_CONFIG_HEADER([config.h])
AC_ISC_POSIX
AC_PROG_CC
......@@ -437,66 +440,11 @@ AM_CONDITIONAL(BUILD_GNOME_PTY_HELPER,[test "$enable_gnome_pty_helper" != no])
################################################################################
# This is a check for gtk-doc which you can insert into your configure.in.
# You shouldn't need to change it at all.
##################################################
# Check for gtk-doc.
##################################################
AC_ARG_WITH(html-dir, [AS_HELP_STRING(--with-html-dir=PATH,path to installed docs)])
if test "x$with_html_dir" = "x" ; then
HTML_DIR='${datadir}/gtk-doc/html'
else
HTML_DIR=$with_html_dir
fi
AC_SUBST(HTML_DIR)
AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
gtk_doc_min_version=0.6
if $GTKDOC ; then
gtk_doc_version=`gtkdoc-mkdb --version`
AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
IFS="${IFS= }"; vte_save_IFS="$IFS"; IFS="."
set $gtk_doc_version
for min in $gtk_doc_min_version ; do
cur=$1; shift
if test -z $min ; then break; fi
if test -z $cur ; then GTKDOC=false; break; fi
if test $cur -gt $min ; then break ; fi
if test $cur -lt $min ; then GTKDOC=false; break ; fi
done
IFS="$vte_save_IFS"
if $GTKDOC ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
fi
dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [AS_HELP_STRING(--enable-gtk-doc,Use gtk-doc to build documentation [default=auto])], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
if test x$enable_gtk_doc = xauto ; then
if test x$GTKDOC = xtrue ; then
enable_gtk_doc=yes
else
enable_gtk_doc=no
fi
fi
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
GTK_DOC_CHECK([1.0])
################################################################################
AM_CONFIG_HEADER(config.h)
AC_OUTPUT([
AC_CONFIG_FILES([
Makefile
src/Makefile
termcaps/Makefile
......@@ -507,4 +455,6 @@ doc/openi18n/Makefile
doc/reference/Makefile
vte.pc
vte-uninstalled.pc
vte.spec
])
AC_OUTPUT
## Process this file with automake to produce Makefile.in
## Process this file with automake to create Makefile.in.
MAINTAINERCLEANFILES = html/*
# This file was adapted from the sample Makefile.am included with gtk-doc.
# See the GTK+ Makefiles in gtk+/docs/reference for examples of using the
# various options.
# The name of the module, e.g. 'glib'.
# The name of the module.
DOC_MODULE=vte
# The top-level SGML file. Change it if you want.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# The top-level SGML file.
DOC_MAIN_SGML_FILE=vte-docs.sgml
# The directory containing the source code. Relative to $(srcdir).
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting functions and macros.
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../src
# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj.
SCANOBJ_OPTIONS=
# Extra options to supply to gtkdoc-scan.
SCAN_OPTIONS=
# Extra options to supply to gtkdoc-mkdb.
MKDB_OPTIONS=--output-format=xml
# Extra options to supply to gtkdoc-fixref.
# Used for dependencies
HFILE_GLOB= $(top_srcdir)/src/*.h
CFILE_GLOB=$(top_srcdir)/src/*.c
IGNORE_HFILES= \
buffer.h \
caps.h \
debug.h \
iso2022.h \
keymap.h \
marshal.h \
matcher.h \
ring.h \
table.h \
trie.h \
vtebg.h \
vteconv.h \
vtedraw.h \
vtefc.h \
vteft2.h \
vtegl.h \
vteglyph.h \
vteint.h \
vtepango.h \
vtepangox.h \
vte-private.h \
vterdb.h \
vteregex.h \
vtergb.h \
vteseq.h \
vteseq-list.h \
vteseq-table.h \
vteskel.h \
vtetc.h \
vtetree.h \
vtexft.h
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = $(VTE_CFLAGS) -I$(top_srcdir)/src
GTKDOC_LIBS = $(top_builddir)/src/libvte.la
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=
# Used for dependencies.
HFILE_GLOB=
CFILE_GLOB=
# Header files to ignore when scanning.
IGNORE_HFILES=
# Images to copy into HTML directory.
HTML_IMAGES =
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
content_files =
# Other files to distribute.
extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
# contains GtkObjects/GObjects and you want to document signals and properties.
GTKDOC_CFLAGS = @CPPFLAGS@ @VTE_CFLAGS@ -I$(srcdir)/../../src
GTKDOC_LIBS = @LDFLAGS@ @VTE_LIBS@ ../../src/libvte.la
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
# If you need to override some of the declarations, place them in the
# $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
DOC_OVERRIDES =
#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
###########################################################################
# Everything below here is generic and you shouldn't need to change it.
###########################################################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(content_files) \
$(extra_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt \
$(DOC_OVERRIDES)
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).signals
if ENABLE_GTK_DOC
all-local: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
@true
#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
#### sgml ####
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
test -d $(srcdir)/html || mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo '-- Fixing Crossreferences'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
endif
##############
clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
fi)
#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/index.html $(distdir)/html
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
images=$(HTML_IMAGES) ; \
for i in $$images ; do \
cp $(srcdir)/$$i $(distdir)/html ; \
done
.PHONY : dist-hook-local
include $(top_srcdir)/gtk-doc.make
......@@ -10,3 +10,5 @@ config.status
configure
gnome-pty-helper
stamp-h1
omf.make
xmldocs.make
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vte\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-12-12 19:52+0100\n"
"POT-Creation-Date: 2006-02-10 21:32-0500\n"
"PO-Revision-Date: 2004-01-03 20:07+0330\n"
"Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
"Language-Team: Persian <farsi@lists.sharif.edu>\n"
......@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/iso2022.c:792 src/iso2022.c:803 src/iso2022.c:852 src/vte.c:2134
#: src/iso2022.c:792 src/iso2022.c:803 src/iso2022.c:852 src/vte.c:1559
#, c-format
msgid "Unable to convert characters from %s to %s."
msgstr "نمی‌توان نویسه‌ها را از %s به %s تبدیل کرد."
......@@ -56,49 +56,44 @@ msgstr ""
msgid "Duplicate (%s/%s)!"
msgstr "تکراری (%s/%s)!"
#: src/vte.c:1477
#: src/vte.c:985
#, c-format
msgid "Error compiling regular expression \"%s\"."
msgstr "خطا در ترجمه‌ی عبارت باقاعده‌ی \"%s\"."
#: src/vte.c:5994
#, c-format
msgid "Got unexpected (key?) sequence `%s'."
msgstr ""
#: src/vte.c:7090
#: src/vte.c:2441
#, c-format
msgid "No handler for control sequence `%s' defined."
msgstr ""
#. Translators: %s is replaced with error message returned by strerror().
#: src/vte.c:7899
#: src/vte.c:3284
#, c-format
msgid "Error reading from child: %s."
msgstr "خطا در خواندن از فرزند: %s."
#: src/vte.c:8021 src/vte.c:8906
#: src/vte.c:3406 src/vte.c:4294
#, c-format
msgid "Error (%s) converting data for child, dropping."
msgstr ""
#: src/vte.c:10849
#: src/vte.c:6247
#, c-format
msgid "Error reading PTY size, using defaults: %s."
msgstr "خطا در خواندن اندازه‌ی PTY، از پیشفرض‌ها استفاده می‌کنیم: %s."
#: src/vte.c:10885
#: src/vte.c:6283
#, c-format
msgid "Error setting PTY size: %s."
msgstr "خطا در تنظیم اندازه‌ی PTY: %s."
#. Aaargh. We're screwed.
#: src/vte.c:15321
#: src/vte.c:10592
msgid "_vte_conv_open() failed setting word characters"
msgstr "‎_vte_conv_open()‎ نتوانست نویسه‌های کلمه را تنظیم کند"
#. Bail back to normal mode.
#: src/vteapp.c:728
#: src/vteapp.c:736
msgid "Could not open console.\n"
msgstr "نمی‌توان پیشانه را باز کرد.\n"
......
#!/usr/bin/python2.2
#!/usr/bin/python
import sys
import string
import getopt
......
......@@ -6,6 +6,7 @@ pkglib_SCRIPTS = decset osc window
noinst_PROGRAMS = buffer dumpkeys iso2022 pty reaper reflect-text-view reflect-vte $(REFLECT_ZVT) ring mev ssfe table trie xticker vteconv vtetc
EXTRA_DIST = \
$(pkglib_SCRIPTS) \
vteseq-gen.c \
genkeysyms.py \
iso2022.txt \
marshal.list \
......
Name: vte
Version: 0.11.17
Version: @VERSION@
Release: 1
Summary: An experimental terminal emulator.
License: LGPL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment