Skip to content

Commit

Permalink
added minimal autotools infrastucture and moved documentation to use
Browse files Browse the repository at this point in the history
* AUTHORS, Makefile.am, autogen.sh, configure.ac, doc/Makefile.am,
doc/C/jhbuild.xml, doc/jhbuild.omf.in, doc/jhbuild.xml: added minimal
autotools infrastucture and moved documentation to use gnome-doc-utils.


svn path=/trunk/; revision=1562
  • Loading branch information
Frederic Peters committed Aug 12, 2007
1 parent 29edaf8 commit 4269303
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 3 deletions.
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
James Henstridge <[email protected]>

6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2007-08-12 Frederic Peters <[email protected]>

* AUTHORS, Makefile.am, autogen.sh, configure.ac, doc/Makefile.am,
doc/C/jhbuild.xml, doc/jhbuild.omf.in, doc/jhbuild.xml: added minimal
autotools infrastucture and moved documentation to use gnome-doc-utils.

2007-08-11 Fernando Herrera <[email protected]>

* modulesets/gnome-external-deps-2.20.modules: Update
Expand Down
Empty file added INSTALL
Empty file.
10 changes: 10 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
SUBDIRS = doc

EXTRA_DIST = gnome-doc-utils.make

all-local:
@echo "-------------------------------------------------------"
@echo "This Makefile is only used to build documentation"
@echo "Type make -f Makefile.plain to build or install JhBuild"
@echo "-------------------------------------------------------"

File renamed without changes.
Empty file added NEWS
Empty file.
30 changes: 30 additions & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#! /bin/sh
# Run this to generate all the initial makefiles, etc.

srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.

PKG_NAME=jhbuild

(test -f $srcdir/jhbuild/main.py) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
}

which gnome-autogen.sh || {
echo "Autotools are only used to build documentation"
echo "Type make -f Makefile.plain to build or install JhBuild"
echo ""
echo "If you want to build documentation, you need to install gnome-common"
echo "from the GNOME Subversion."
exit 1
}


REQUIRED_AUTOCONF_VERSION=2.57
REQUIRED_AUTOMAKE_VERSION=1.8
REQUIRED_INTLTOOL_VERSION=0.35.0
REQUIRED_PKG_CONFIG_VERSION=0.16.0
USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh

18 changes: 18 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
AC_INIT(jhbuild, 0.1, [email protected])
AC_CONFIG_SRCDIR(jhbuild/main.py)

AM_INIT_AUTOMAKE
GNOME_COMMON_INIT
AM_MAINTAINER_MODE

AC_PROG_CC

# gnome-doc-utils
PKG_PROG_PKG_CONFIG
GNOME_DOC_INIT

AC_OUTPUT([
Makefile
doc/Makefile
])

19 changes: 16 additions & 3 deletions doc/jhbuild.xml → doc/C/jhbuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<articleinfo>
<title>JHBuild Manual</title>
<authorgroup>
<author>
<author role="maintainer">
<firstname>James</firstname>
<surname>Henstridge</surname>
</author>
Expand All @@ -19,6 +19,19 @@
<year>2004,2007</year>
<holder>James Henstridge</holder>
</copyright>

<revhistory>
<revision>
<revnumber>JhBuild Manual v0.1</revnumber>
<date>August 2007</date>
</revision>
</revhistory>

<abstract role="description">
<para>JhBuild is a tool used to build the whole GNOME desktop from the
SVN source, however, it can be used to build other projects creating a
moduleset for it.</para>
</abstract>
</articleinfo>

<section id="introduction">
Expand Down Expand Up @@ -1180,7 +1193,7 @@ os.environ['INSTALL'] = os.path.join(os.environ['HOME'],
element.</para>

<para>Only module definitions are imported from the referenced
module set &mdash; module sources are not. Multiple levels of
module set - module sources are not. Multiple levels of
includes are allowed, but include loops are not (there isn't any
code to handle loops at the moment).</para>
</section>
Expand Down Expand Up @@ -1523,7 +1536,7 @@ done</programlisting>
</itemizedlist>
<para>If you are installing distro packages, you may need
to install corresponding "dev" or "devel" packages. Note
that this list is just a starting point &mdash; not a
that this list is just a starting point - not a
comprehensive list.</para>
</answer>
</qandaentry>
Expand Down
7 changes: 7 additions & 0 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
DOC_LINGUAS =

include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook

DOC_MODULE = jhbuild

9 changes: 9 additions & 0 deletions doc/jhbuild.omf.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" standalone="no"?>
<omf>
<resource>
<subject category="Development|Development Tools|Build Tools"/>
<type></type>
<relation seriesid="0c6369a0-48d3-11dc-8895-e0474514a045"/>
<rights type="GNU GPL" license.version="2.0 or later" holder="James Henstridge" />
</resource>
</omf>

0 comments on commit 4269303

Please sign in to comment.