[cairo-commit]
cairo .cvsignore, 1.6, 1.7 Makefile, NONE, 1.1 README,
1.22, 1.23 README_OBSOLETE, NONE, 1.1 autogen.sh, 1.16,
1.17 autogen.sh.stale, NONE, 1.1 configure, NONE, 1.1
Carl Worth
commit at pdx.freedesktop.org
Tue Apr 25 11:48:28 PDT 2006
Committed by: cworth
Update of /cvs/cairo/cairo
In directory kemper:/tmp/cvs-serv30881
Modified Files:
.cvsignore README autogen.sh
Added Files:
Makefile README_OBSOLETE autogen.sh.stale configure
Log Message:
Make it very clear that the CVS tree is stale and obsolete
Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- .cvsignore 27 Oct 2004 20:13:39 -0000 1.6
+++ .cvsignore 25 Apr 2006 18:48:26 -0000 1.7
@@ -1,4 +1,3 @@
-Makefile
Makefile.in
aclocal.m4
autom4te.cache
@@ -10,7 +9,6 @@
config.log
config.status
config.sub
-configure
libtool
ltmain.sh
releases
--- NEW FILE: Makefile ---
all:
@echo "*********************"
@echo "****** WARNING ******"
@echo "*********************"
@echo ""
@echo "You are attempting to compile an obsolete checkout of the cairo"
@echo "source code. The current cairo source code is no longer maintained"
@echo "with CVS, but instead with the git content tracker."
@echo ""
@echo "To use git to checkout the cairo library, use the following command:"
@echo ""
@echo " git clone git://git.cairographics.org/git/cairo"
@echo ""
@echo "followed by periodic updates:"
@echo ""
@echo " git pull origin"
@echo ""
@echo "Once you have a clone this way, you can browse it locally with"
@echo "graphical tools such as gitk or gitview. You may also commit changes"
@echo "locally with "git commit -a". These local commits will be"
@echo "automatically merged with upstream changes when you cg-update, and you"
@echo "can also generate patches from them for submitting to the cairo"
@echo "mailing list with "git format-patch origin"."
@echo ""
@echo "Note: If you can't find git packages from your distribution, you can"
@echo "get tar files from:"
@echo ""
@echo " http://www.kernel.org/pub/software/scm/git/ "
@echo ""
@echo "For the most up-to-date information on obtaining the latest cairo"
@echo "sources, see:"
@echo ""
@echo " http://cairographics.org/download"
@echo ""
@echo "I apologize for any inconvenience or confusion the switch from CVS to"
@echo "git may have caused. So thank you for your patience, and please"
@echo "continue to have fun with cairo!"
@echo ""
@echo "-Carl"
@echo ""
@echo "PS. If you insist on using this stale version you may run"
@echo "autogen.sh.stale instead of autogen.sh."
@false
Index: README
===================================================================
RCS file: /cvs/cairo/cairo/README,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- README 19 Dec 2005 01:20:06 -0000 1.22
+++ README 25 Apr 2006 18:48:26 -0000 1.23
@@ -1,3 +1,45 @@
+*********************
+****** WARNING ******
+*********************
+
+This is an obsolete checkout of the cairo source code. The current
+cairo source code is no longer maintained with CVS, but instead with
+the git content tracker.
+
+To use git to checkout the cairo library, use the following command:
+
+ git clone git://git.cairographics.org/git/cairo
+
+followed by periodic updates:
+
+ git pull origin
+
+Once you have a clone this way, you can browse it locally with
+graphical tools such as gitk or gitview. You may also commit changes
+locally with "git commit -a". These local commits will be
+automatically merged with upstream changes when you cg-update, and you
+can also generate patches from them for submitting to the cairo
+mailing list with "git format-patch origin".
+
+Note: If you can't find git packages from your distribution, you can
+get tar files from:
+
+ http://www.kernel.org/pub/software/scm/git/
+
+For the most up-to-date information on obtaining the latest cairo
+sources, see:
+
+ http://cairographics.org/download
+
+I apologize for any inconvenience or confusion the switch from CVS to
+git may have caused. So thank you for your patience, and please
+continue to have fun with cairo!
+
+-Carl
+
+PS. If you insist on using this stale version you may run
+autogen.sh.stale instead of autogen.sh.
+
Cairo - Multi-platform 2D graphics library
http://cairographics.org
--- NEW FILE: README_OBSOLETE ---
*********************
****** WARNING ******
*********************
This is an obsolete checkout of the cairo source code. The current
cairo source code is no longer maintained with CVS, but instead with
the git content tracker.
To use git to checkout the cairo library, use the following command:
git clone git://git.cairographics.org/git/cairo
followed by periodic updates:
git pull origin
Once you have a clone this way, you can browse it locally with
graphical tools such as gitk or gitview. You may also commit changes
locally with "git commit -a". These local commits will be
automatically merged with upstream changes when you cg-update, and you
can also generate patches from them for submitting to the cairo
mailing list with "git format-patch origin".
Note: If you can't find git packages from your distribution, you can
get tar files from:
http://www.kernel.org/pub/software/scm/git/
For the most up-to-date information on obtaining the latest cairo
sources, see:
http://cairographics.org/download
I apologize for any inconvenience or confusion the switch from CVS to
git may have caused. So thank you for your patience, and please
continue to have fun with cairo!
-Carl
Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo/autogen.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- autogen.sh 22 Aug 2005 15:33:54 -0000 1.16
+++ autogen.sh 25 Apr 2006 18:48:26 -0000 1.17
@@ -1,173 +1,48 @@
#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-set -e
-
-PACKAGE=cairo
-
-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
-LIBTOOLIZE_FLAGS="--copy --force"
-AUTOHEADER=${AUTOHEADER-autoheader}
-AUTOMAKE_FLAGS="--add-missing"
-AUTOCONF=${AUTOCONF-autoconf}
-
-# automake 1.8 requires autoconf 2.58
-# automake 1.7 requires autoconf 2.54
-automake_min_vers=1.7
-aclocal_min_vers=$automake_min_vers
-autoconf_min_vers=2.54
-libtoolize_min_vers=1.4
-
-# The awk-based string->number conversion we use needs a C locale to work
-# as expected. Setting LC_ALL overrides whether the user set LC_ALL,
-# LC_NUMERIC, or LANG.
-LC_ALL=C
-
-ARGV0=$0
-# Allow invocation from a separate build directory; in that case, we change
-# to the source directory to run the auto*, then change back before running configure
-srcdir=`dirname $ARGV0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-
-cd $srcdir
-
-if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
- if ($AUTOCONF --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
- exit 1; exit 0; }');
- then
- echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
- $AUTOCONF --version
- echo " (version $autoconf_min_vers or newer is required)"
- DIE="yes"
- fi
-else
- echo $AUTOCONF: command not found
- echo
- echo "$ARGV0: ERROR: You must have \`autoconf' installed to compile $PACKAGE."
- echo " (version $autoconf_min_vers or newer is required)"
- DIE="yes"
-fi
+cat <<EOF
+*********************
+****** WARNING ******
+*********************
-#
-# Hunt for an appropriate version of automake and aclocal; we can't
-# assume that 'automake' is necessarily the most recent installed version
-#
-# We check automake first to allow it to be a newer version than we know about.
-#
-if test x"$AUTOMAKE" = x || test x"$ACLOCAL" = x ; then
- am_ver=""
- for ver in "" "-1.9" "-1.8" "-1.7" ; do
- am="automake$ver"
- if ($am --version) < /dev/null > /dev/null 2>&1 ; then
- if ($am --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
- exit 1; exit 0; }'); then : ; else
- am_ver=$ver
- break;
- fi
- fi
- done
-
- AUTOMAKE=${AUTOMAKE-automake$am_ver}
- ACLOCAL=${ACLOCAL-aclocal$am_ver}
-fi
+You are attempting to configure an obsolete checkout of the cairo
+source code. The current cairo source code is no longer maintained
+with CVS, but instead with the git content tracker.
-#
-# Now repeat the tests with the copies we decided upon and error out if they
-# aren't sufficiently new.
-#
-if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
- if ($AUTOMAKE --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
- exit 1; exit 0; }');
- then
- echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
- $AUTOMAKE --version
- echo " (version $automake_min_vers or newer is required)"
- DIE="yes"
- fi
- if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
- if ($ACLOCAL --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$aclocal_min_vers' ) \
- exit 1; exit 0; }' );
- then
- echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
- $ACLOCAL --version
- echo " (version $aclocal_min_vers or newer is required)"
- DIE="yes"
- fi
- else
- echo $ACLOCAL: command not found
- echo
- echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
- echo " The version of $AUTOMAKE installed doesn't appear recent enough."
- DIE="yes"
- fi
-else
- echo $AUTOMAKE: command not found
- echo
- echo "$ARGV0: ERROR: You must have \`automake' installed to compile $PACKAGE."
- echo " (version $automake_min_vers or newer is required)"
- DIE="yes"
-fi
+To use git to checkout the cairo library, use the following command:
-if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 ; then
- if ($LIBTOOLIZE --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
- exit 1; exit 0; }');
- then
- echo "$ARGV0: ERROR: \`$LIBTOOLIZE' is too old."
- echo " (version $libtoolize_min_vers or newer is required)"
- DIE="yes"
- fi
-else
- echo $LIBTOOLIZE: command not found
- echo
- echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
- echo " (version $libtoolize_min_vers or newer is required)"
- DIE="yes"
-fi
+ git clone git://git.cairographics.org/git/cairo
-if test -z "$ACLOCAL_FLAGS"; then
- acdir=`$ACLOCAL --print-ac-dir`
- if [ ! -f $acdir/pkg.m4 ]; then
- echo "$ARGV0: Error: Could not find pkg-config macros."
- echo " (Looked in $acdir/pkg.m4)"
- echo " If pkg.m4 is available in /another/directory, please set"
- echo " ACLOCAL_FLAGS=\"-I /another/directory\""
- echo " Otherwise, please install pkg-config."
- echo ""
- echo "pkg-config is available from:"
- echo "http://www.freedesktop.org/software/pkgconfig/"
- DIE=yes
- fi
-fi
+followed by periodic updates:
-if test "X$DIE" != X; then
- exit 1
-fi
+ git pull origin
+Once you have a clone this way, you can browse it locally with
+graphical tools such as gitk or gitview. You may also commit changes
+locally with "git commit -a". These local commits will be
+automatically merged with upstream changes when you cg-update, and you
+can also generate patches from them for submitting to the cairo
+mailing list with "git format-patch origin".
-if test -z "$*"; then
- echo "$ARGV0: Note: \`./configure' will be run with no arguments."
- echo " If you wish to pass any to it, please specify them on the"
- echo " \`$0' command line."
- echo
-fi
+Note: If you can't find git packages from your distribution, you can
+get tar files from:
-do_cmd() {
- echo "$ARGV0: running \`$@'"
- $@
-}
+ http://www.kernel.org/pub/software/scm/git/
-do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
+For the most up-to-date information on obtaining the latest cairo
+sources, see:
-do_cmd $ACLOCAL $ACLOCAL_FLAGS
+ http://cairographics.org/download
-do_cmd $AUTOHEADER
+I apologize for any inconvenience or confusion the switch from CVS to
+git may have caused. So thank you for your patience, and please
+continue to have fun with cairo!
-do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
+-Carl
-do_cmd $AUTOCONF
+PS. If you insist on using this stale version you may run
+autogen.sh.stale instead of autogen.sh.
-cd $ORIGDIR || exit 1
+EOF
-do_cmd $srcdir/configure --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+exit 1
--- NEW FILE: autogen.sh.stale ---
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
set -e
PACKAGE=cairo
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
LIBTOOLIZE_FLAGS="--copy --force"
AUTOHEADER=${AUTOHEADER-autoheader}
AUTOMAKE_FLAGS="--add-missing"
AUTOCONF=${AUTOCONF-autoconf}
# automake 1.8 requires autoconf 2.58
# automake 1.7 requires autoconf 2.54
automake_min_vers=1.7
aclocal_min_vers=$automake_min_vers
autoconf_min_vers=2.54
libtoolize_min_vers=1.4
# The awk-based string->number conversion we use needs a C locale to work
# as expected. Setting LC_ALL overrides whether the user set LC_ALL,
# LC_NUMERIC, or LANG.
LC_ALL=C
ARGV0=$0
# Allow invocation from a separate build directory; in that case, we change
# to the source directory to run the auto*, then change back before running configure
srcdir=`dirname $ARGV0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
if ($AUTOCONF --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
exit 1; exit 0; }');
then
echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
$AUTOCONF --version
echo " (version $autoconf_min_vers or newer is required)"
DIE="yes"
fi
else
echo $AUTOCONF: command not found
echo
echo "$ARGV0: ERROR: You must have \`autoconf' installed to compile $PACKAGE."
echo " (version $autoconf_min_vers or newer is required)"
DIE="yes"
fi
#
# Hunt for an appropriate version of automake and aclocal; we can't
# assume that 'automake' is necessarily the most recent installed version
#
# We check automake first to allow it to be a newer version than we know about.
#
if test x"$AUTOMAKE" = x || test x"$ACLOCAL" = x ; then
am_ver=""
for ver in "" "-1.9" "-1.8" "-1.7" ; do
am="automake$ver"
if ($am --version) < /dev/null > /dev/null 2>&1 ; then
if ($am --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
exit 1; exit 0; }'); then : ; else
am_ver=$ver
break;
fi
fi
done
AUTOMAKE=${AUTOMAKE-automake$am_ver}
ACLOCAL=${ACLOCAL-aclocal$am_ver}
fi
#
# Now repeat the tests with the copies we decided upon and error out if they
# aren't sufficiently new.
#
if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
if ($AUTOMAKE --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
exit 1; exit 0; }');
then
echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
$AUTOMAKE --version
echo " (version $automake_min_vers or newer is required)"
DIE="yes"
fi
if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
if ($ACLOCAL --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$aclocal_min_vers' ) \
exit 1; exit 0; }' );
then
echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
$ACLOCAL --version
echo " (version $aclocal_min_vers or newer is required)"
DIE="yes"
fi
else
echo $ACLOCAL: command not found
echo
echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
echo " The version of $AUTOMAKE installed doesn't appear recent enough."
DIE="yes"
fi
else
echo $AUTOMAKE: command not found
echo
echo "$ARGV0: ERROR: You must have \`automake' installed to compile $PACKAGE."
echo " (version $automake_min_vers or newer is required)"
DIE="yes"
fi
if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 ; then
if ($LIBTOOLIZE --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
exit 1; exit 0; }');
then
echo "$ARGV0: ERROR: \`$LIBTOOLIZE' is too old."
echo " (version $libtoolize_min_vers or newer is required)"
DIE="yes"
fi
else
echo $LIBTOOLIZE: command not found
echo
echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
echo " (version $libtoolize_min_vers or newer is required)"
DIE="yes"
fi
if test -z "$ACLOCAL_FLAGS"; then
acdir=`$ACLOCAL --print-ac-dir`
if [ ! -f $acdir/pkg.m4 ]; then
echo "$ARGV0: Error: Could not find pkg-config macros."
echo " (Looked in $acdir/pkg.m4)"
echo " If pkg.m4 is available in /another/directory, please set"
echo " ACLOCAL_FLAGS=\"-I /another/directory\""
echo " Otherwise, please install pkg-config."
echo ""
echo "pkg-config is available from:"
echo "http://www.freedesktop.org/software/pkgconfig/"
DIE=yes
fi
fi
if test "X$DIE" != X; then
exit 1
fi
if test -z "$*"; then
echo "$ARGV0: Note: \`./configure' will be run with no arguments."
echo " If you wish to pass any to it, please specify them on the"
echo " \`$0' command line."
echo
fi
do_cmd() {
echo "$ARGV0: running \`$@'"
$@
}
do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
do_cmd $ACLOCAL $ACLOCAL_FLAGS
do_cmd $AUTOHEADER
do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
do_cmd $AUTOCONF
cd $ORIGDIR || exit 1
do_cmd $srcdir/configure --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
--- NEW FILE: configure ---
#!/bin/sh
cat <<EOF
*********************
****** WARNING ******
*********************
You are attempting to configure an obsolete checkout of the cairo
source code. The current cairo source code is no longer maintained
with CVS, but instead with the git content tracker.
To use git to checkout the cairo library, use the following command:
git clone git://git.cairographics.org/git/cairo
followed by periodic updates:
git pull origin
Once you have a clone this way, you can browse it locally with
graphical tools such as gitk or gitview. You may also commit changes
locally with "git commit -a". These local commits will be
automatically merged with upstream changes when you cg-update, and you
can also generate patches from them for submitting to the cairo
mailing list with "git format-patch origin".
Note: If you can't find git packages from your distribution, you can
get tar files from:
http://www.kernel.org/pub/software/scm/git/
For the most up-to-date information on obtaining the latest cairo
sources, see:
http://cairographics.org/download
I apologize for any inconvenience or confusion the switch from CVS to
git may have caused. So thank you for your patience, and please
continue to have fun with cairo!
-Carl
PS. If you insist on using this stale version you may run
autogen.sh.stale instead of autogen.sh.
EOF
exit 1
More information about the cairo-commit
mailing list