Revision: 981
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=981&view=rev
Author: frlan
Date: 2009-10-11 20:00:45 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Update of GeanyLipsum's documentation
Modified Paths:
--------------
trunk/geany-plugins/geanylipsum/README
Modified: trunk/geany-plugins/geanylipsum/README
===================================================================
--- trunk/geany-plugins/geanylipsum/README 2009-10-11 19:59:59 UTC (rev 980)
+++ trunk/geany-plugins/geanylipsum/README 2009-10-11 20:00:45 UTC (rev 981)
@@ -1,7 +1,6 @@
GeanyLipsum Plugin v0.1.1
-----------
-
About
------
@@ -9,42 +8,13 @@
generator to insert placeholder text into your document.
-Requirements
-------------
-
-For compiling the plugin yourself, you will need the GTK (>= 2.6.0)
-libraries and header files. You will also need its dependency
-libraries and header files, such as Pango, Glib and ATK. All these
-files are available at http://www.gtk.org.
-
-And obviously, you will need to have Geany installed. If you have Geany
-installed from the sources, you should be ready to go. If you used a
-prepared package e.g. from your distribution you probably need to
-install an additional package, this might be called geany-dev or
-geany-devel. Please note that in order to compile and use this plugin,
-you need Geany 0.16 or later (Geany Plugin API v130 or higher).
-
-Furthermore you need, of course, a C compiler and the Make tool. The
-GNU versions of these tools are recommended.
-
-
Installation
------------
-Compiling and installing the code is done by the following three
-commands:
+This version of the plugin is installed with the combined
+geany-plugins release. Please check README of this package
-$ ./configure
-$ make
-$ make install
-For more configuration details run
-$ ./configure --help
-
-If there are any errors during compilation, check your build environment
-and try to find the error, otherwise contact one of the authors. (See below)
-
-
Usage
-----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 980
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=980&view=rev
Author: frlan
Date: 2009-10-11 19:59:59 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
GeanySendMail: Use waf instead of autotools for compiling plugin
Modified Paths:
--------------
trunk/geanysendmail/ChangeLog
trunk/geanysendmail/INSTALL
trunk/geanysendmail/NEWS
trunk/geanysendmail/README
Added Paths:
-----------
trunk/geanysendmail/waf
trunk/geanysendmail/wscript
Removed Paths:
-------------
trunk/geanysendmail/Makefile.am
trunk/geanysendmail/autogen.sh
trunk/geanysendmail/configure.in
trunk/geanysendmail/depcomp
trunk/geanysendmail/indent-all.sh
trunk/geanysendmail/install-sh
trunk/geanysendmail/makefile.win32
trunk/geanysendmail/missing
Modified: trunk/geanysendmail/ChangeLog
===================================================================
--- trunk/geanysendmail/ChangeLog 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/ChangeLog 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,3 +1,8 @@
+2009-10-08 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * Use waf for building plugin in faovr of autotools.
+
+
2009-07-18 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* Update to Geany plugin API v147 and make usage of single header includes.
Modified: trunk/geanysendmail/INSTALL
===================================================================
--- trunk/geanysendmail/INSTALL 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/INSTALL 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,16 +1,18 @@
These installation instructions are written for a Linux system.
At the time of this writing, building the plugin requires a recent SVN checkout
-of the Geany sources (API version 104, Geany v0.16svn+).
+of the Geany sources (API version 149, Geany v0.19svn+).
To compile and install just follow the typical three steps:
- % configure
- % make
- % make install
+ % ./waf configure
+ % ./waf build
+ % ./waf install
The plugin will be installed into your $prefix/lib/geany of your Geany
-installation. This should be in most cases /usr/ or /usr/local. So you will
-need in most cases to run make install under root. If you don't want to
-install it global, but on your own home dir, just --prefix option for configure.
+installation. This should be in most cases /usr/ or /usr/local. So you
+will need in most cases to run make install under root. If you don't
+want to install it global, but on your own home dir, just --prefix
+option for ./waf configure.
+
Please check README for more detailed information.
Deleted: trunk/geanysendmail/Makefile.am
===================================================================
--- trunk/geanysendmail/Makefile.am 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/Makefile.am 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,17 +0,0 @@
-SUBDIRS = src po
-
-EXTRA_DIST = \
- autogen.sh \
- makefile.win32 \
- po/LINGUAS
-
-dist-bzip2: distdir
- BZIP2=$(BZIP2_ENV) $(AMTAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir)
- -rm -rf $(distdir)
-
-sign:
- if test -f $(PACKAGE)-$(VERSION).tar.gz; then \
- gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.gz; fi
- if test -f $(PACKAGE)-$(VERSION).tar.bz2; then \
- gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.bz2; fi
-
Modified: trunk/geanysendmail/NEWS
===================================================================
--- trunk/geanysendmail/NEWS 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/NEWS 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,4 +1,4 @@
-GeanySendMail 0.4.2 (26. May 2009=:
+GeanySendMail 0.4.2 (26. May 2009):
* Added cancel button to recipient's address dialog
* Some minor code cleanup
Modified: trunk/geanysendmail/README
===================================================================
--- trunk/geanysendmail/README 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/README 2009-10-11 19:59:59 UTC (rev 980)
@@ -26,8 +26,8 @@
geany-devel. Please note that in order to compile and use this plugin,
you need Geany 0.18 or later (Geany Plugin API v147 or higher).
-Furthermore you need, of course, a C compiler and the Make tool. The
-GNU versions of these tools are recommended.
+Furthermore you need, of course, a C compiler and Python
+installed. The GNU versions of C compiler is recommended.
Installation
@@ -36,12 +36,12 @@
Compiling and installing the code is done by the following three
commands:
-$ ./configure
-$ make
-$ make install
+$ ./waf configure
+$ ./waf build
+$ ./waf install
For more configuration details run
-$ ./configure --help
+$ ./waf --help
If there are any errors during compilation, check your build environment
and try to find the error, otherwise contact one of the authors. (See below)
Deleted: trunk/geanysendmail/autogen.sh
===================================================================
--- trunk/geanysendmail/autogen.sh 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/autogen.sh 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,159 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
- PATH="$GNOME2_DIR/bin:$PATH"
- export PATH
- export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.in) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level package directory"
- exit 1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`autoconf' installed."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltool' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
- (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`xml-i18n-toolize' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
- (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
- (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`glib' installed."
- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
- DIE=1
- }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`automake' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
- echo "installed doesn't appear recent enough."
- echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-if test -z "$*"; then
- echo "**Warning**: I am going to run \`configure' with no arguments."
- echo "If you wish to pass any to it, please specify them on the"
- echo \`$0\'" command line."
- echo
-fi
-
-case $CC in
-xlc )
- am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
-do
- dr=`dirname $coin`
- if test -f $dr/NO-AUTO-GEN; then
- echo skipping $dr -- flagged as no auto-gen
- else
- echo processing $dr
- ( cd $dr
-
- aclocalinclude="$ACLOCAL_FLAGS"
-
- if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running glib-gettextize... Ignore non-fatal messages."
- echo "no" | glib-gettextize --force --copy
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
- echo "Running intltoolize..."
- intltoolize --copy --force --automake
- fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
- echo "Running xml-i18n-toolize..."
- xml-i18n-toolize --copy --force --automake
- fi
- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
- libtoolize --force --copy
- fi
- fi
- echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
- echo "Running autoheader..."
- autoheader
- fi
- echo "Running automake --gnu $am_opt ..."
- automake --add-missing --gnu $am_opt
- echo "Running autoconf ..."
- autoconf
- )
- fi
-done
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
- echo Running $srcdir/configure $conf_flags "$@" ...
- $srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile. || exit 1
-else
- echo Skipping configure process.
-fi
Deleted: trunk/geanysendmail/configure.in
===================================================================
--- trunk/geanysendmail/configure.in 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/configure.in 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,61 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(geanysendmail, 0.4.2)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --silent"
-
-AC_PROG_INSTALL
-
-# checking for Geany
-PKG_CHECK_MODULES(GEANY, [geany >= 0.18])
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-GEANY_VERSION=`$PKG_CONFIG --modversion geany`
-GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
-
-# i18n
-GETTEXT_PACKAGE=geanysendmail
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS
-
-AM_GLIB_GNU_GETTEXT
-# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845)
-if test "x$MSGFMT" = "xno"; then
- AC_MSG_ERROR([msgfmt not found. Please install the gettext package.])
-fi
-
-# intltool hack to define install_sh on Debian/Ubuntu systems
-if test "x$install_sh" = "x"; then
- install_sh="`pwd`/install-sh"
- AC_SUBST(install_sh)
-fi
-
-# get the plugin installed at the correct location for Geany
-# TODO find a way to NOT override --libdir command line option if given
-libdir="`$PKG_CONFIG --variable=libdir geany`/geany"
-
-
-AC_OUTPUT([
-Makefile
-src/Makefile
-po/Makefile.in
-])
-
-echo "----------------------------------------"
-echo "Install geanysendmail plugin binary in : ${libdir}"
-echo "Install geanysendmail in : ${prefix}"
-echo "Using Geany version : ${GEANY_VERSION}"
-echo "Using GTK version : ${GTK_VERSION}"
-echo ""
-echo "Configuration is done OK."
-echo ""
Deleted: trunk/geanysendmail/depcomp
===================================================================
--- trunk/geanysendmail/depcomp 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/depcomp 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,584 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2006-10-15.18
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
-
-# 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, 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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva(a)dcc.unicamp.br>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake(a)gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> $depfile
- echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
- stat=$?
-
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-
- if test -f "$tmpdepfile"; then
- outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
- "$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- "$@" || exit $?
- IFS=" "
- for arg
- do
- case "$arg" in
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
- esac
- done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Deleted: trunk/geanysendmail/indent-all.sh
===================================================================
--- trunk/geanysendmail/indent-all.sh 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/indent-all.sh 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,4 +0,0 @@
-#!/bin/sh
-indent -bli0 -i8 -cli8 -npcs -l100 *.c
-rm *~
-
Deleted: trunk/geanysendmail/install-sh
===================================================================
--- trunk/geanysendmail/install-sh 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/install-sh 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,507 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-10-14.15
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" "" $nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-posix_glob=
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chmodcmd=$chmodprog
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
- or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
- or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
-
-Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
- case $1 in
- -c) shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- --help) echo "$usage"; exit $?;;
-
- -m) mode=$2
- shift
- shift
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t) dstarg=$2
- shift
- shift
- continue;;
-
- -T) no_target_directory=true
- shift
- continue;;
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
- --) shift
- break;;
-
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
-
- *) break;;
- esac
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
-fi
-
-if test $# -eq 0; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
- fi
- # It's OK to call `install-sh -d' without argument.
- # This can happen when creating conditional directories.
- exit 0
-fi
-
-if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
-
- # Set umask so as not to create temps with too-generous modes.
- # However, 'strip' requires both read and write access to temps.
- case $mode in
- # Optimize common cases.
- *644) cp_umask=133;;
- *755) cp_umask=22;;
-
- *[0-7])
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw='% 200'
- fi
- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
- *)
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw=,u+rw
- fi
- cp_umask=$mode$u_plus_rw;;
- esac
-fi
-
-for src
-do
- # Protect names starting with `-'.
- case $src in
- -*) src=./$src ;;
- esac
-
- if test -n "$dir_arg"; then
- dst=$src
- dstdir=$dst
- test -d "$dstdir"
- dstdir_status=$?
- else
-
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
- if test ! -f "$src" && test ! -d "$src"; then
- echo "$0: $src does not exist." >&2
- exit 1
- fi
-
- if test -z "$dstarg"; then
- echo "$0: no destination specified." >&2
- exit 1
- fi
-
- dst=$dstarg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst ;;
- esac
-
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
- if test -d "$dst"; then
- if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
- exit 1
- fi
- dstdir=$dst
- dst=$dstdir/`basename "$src"`
- dstdir_status=0
- else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
- test -d "$dstdir"
- dstdir_status=$?
- fi
- fi
-
- obsolete_mkdir_used=false
-
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
- esac
-
- if
- $posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
- )
- then :
- else
-
- # The umask is ridiculous, or mkdir does not conform to POSIX,
- # or it failed possibly due to a race condition. Create the
- # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
- esac
-
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
-
- oIFS=$IFS
- IFS=/
- $posix_glob && set -f
- set fnord $dstdir
- shift
- $posix_glob && set +f
- IFS=$oIFS
-
- prefixes=
-
- for d
- do
- test -z "$d" && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
- done
-
- if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
- fi
- fi
- fi
-
- if test -n "$dir_arg"; then
- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
- else
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
- # Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
- # If any of these fail, we abort the whole thing. If we want to
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $cpprog $src $dsttmp" command.
- #
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
-
- trap '' 0
- fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Deleted: trunk/geanysendmail/makefile.win32
===================================================================
--- trunk/geanysendmail/makefile.win32 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/makefile.win32 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,60 +0,0 @@
-#
-# localwin32.mk is an optional file to override make variables.
-# Use localwin32.mk instead of editing variables as it is included in sub
-# makefiles.
-# localwin32.mk to set PREFIX instead of the default C:\libs
-# For MSYS use localwin32.mk to set CP and RM.
-# By default this will work in a Windows command prompt.
-
-CC = gcc
-CP = copy
-RM = del
-PREFIX = C:\libs
-
-GEANY_SRC = c:\geany_svn
-TARGET = geanysendmail.dll
-.SUFFIXES: .c .o
--include localwin32.mk
-
-
-OBJS = geanysendmail.o
-INCLUDEDIRS= -I. \
- -I$(GEANY_SRC) \
- -I$(GEANY_SRC)\src \
- -I$(GEANY_SRC)\plugins \
- -I$(GEANY_SRC)\tagmanager\include \
- -I$(GEANY_SRC)\scintilla\include \
- -I$(PREFIX)/include/gtk-2.0 \
- -I$(PREFIX)/lib/gtk-2.0/include \
- -I$(PREFIX)/include/atk-1.0 \
- -I$(PREFIX)/include/pango-1.0 \
- -I$(PREFIX)/include/cairo \
- -I$(PREFIX)/include/glib-2.0 \
- -I$(PREFIX)/lib/glib-2.0/include \
- -I$(PREFIX)/include/gettext \
- -I$(PREFIX)/include \
- -I$(ASPELL_PREFIX)/interfaces/cc
-
-ALL_GTK_LIBS= \
- -L"$(PREFIX)/lib" \
- -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
- -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv
-CCFLAGS=-Wall -O2 -mms-bitfields -DHAVE_CONFIG_H -DLOCALEDIR=\"share\"
-
-
-all: $(TARGET)
-
-deps.mak:
- $(CC) -MM $(CCFLAGS) $(INCLUDEDIRS) src/*.c >deps.mak
-
-geanysendmail.o:
- $(CC) $(CCFLAGS) $(INCLUDEDIRS) -c $<
-
-$(TARGET): deps.mak $(OBJS)
- $(CC) -shared $(OBJS) $(ALL_GTK_LIBS) -o $(TARGET)
-
-clean:
- -$(RM) deps.mak *.o *.dll
-
-# Generate header dependencies with "make deps.mak"
-include deps.mak
Deleted: trunk/geanysendmail/missing
===================================================================
--- trunk/geanysendmail/missing 2009-10-11 19:58:40 UTC (rev 979)
+++ trunk/geanysendmail/missing 2009-10-11 19:59:59 UTC (rev 980)
@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
-
-# 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, 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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
- exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
-
- -h|--h|--he|--hel|--help)
- echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
- -h, --help display this help and exit
- -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake(a)gnu.org>."
- exit $?
- ;;
-
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
- exit $?
- ;;
-
- -*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
- exit 1
- ;;
-
-esac
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison|yacc)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex|flex)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit 1
- fi
- ;;
-
- makeinfo)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Added: trunk/geanysendmail/waf
===================================================================
--- trunk/geanysendmail/waf (rev 0)
+++ trunk/geanysendmail/waf 2009-10-11 19:59:59 UTC (rev 980)
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+# encoding: utf-8
+# Thomas Nagy, 2005-2009
+
+"""
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+"""
+
+import os, sys
+if sys.hexversion<0x203000f: raise ImportError("Waf requires Python >= 2.3")
+
+if 'PSYCOWAF' in os.environ:
+ try:import psyco;psyco.full()
+ except:pass
+
+VERSION="1.5.7"
+REVISION="8edda22ed216daab7aed3d430dc291cf"
+INSTALL=''
+C1='#+'
+C2='#)'
+cwd = os.getcwd()
+join = os.path.join
+
+WAF='waf'
+def b(x):
+ return x
+
+if sys.hexversion>0x300000f:
+ WAF='waf3'
+ def b(x):
+ return x.encode()
+
+def err(m):
+ print(('\033[91mError: %s\033[0m' % m))
+ sys.exit(1)
+
+def unpack_wafdir(dir):
+ f = open(sys.argv[0],'rb')
+ c = "corrupted waf (%d)"
+ while 1:
+ line = f.readline()
+ if not line: err("run waf-light from a folder containing wafadmin")
+ if line == b('#==>\n'):
+ txt = f.readline()
+ if not txt: err(c % 1)
+ if f.readline()!=b('#<==\n'): err(c % 2)
+ break
+ if not txt: err(c % 3)
+ txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r'))
+
+ import shutil, tarfile
+ try: shutil.rmtree(dir)
+ except OSError: pass
+ try: os.makedirs(join(dir, 'wafadmin', 'Tools'))
+ except OSError: err("Cannot unpack waf lib into %s\nMove waf into a writeable directory" % dir)
+
+ os.chdir(dir)
+ tmp = 't.tbz2'
+ t = open(tmp,'wb')
+ t.write(txt)
+ t.close()
+
+ try:
+ t = tarfile.open(tmp)
+ for x in t: t.extract(x)
+ t.close()
+ except:
+ os.chdir(cwd)
+ try: shutil.rmtree(dir)
+ except OSError: pass
+ err("Waf cannot be unpacked, check that bzip2 support is present")
+
+ os.chmod(join('wafadmin','Tools'), 493)
+
+ os.unlink(tmp)
+
+ if sys.hexversion>0x300000f:
+ sys.path = [join(dir, 'wafadmin')] + sys.path
+ import py3kfixes
+ py3kfixes.fixdir(dir)
+
+ os.chdir(cwd)
+
+def test(dir):
+ try: os.stat(join(dir, 'wafadmin')); return os.path.abspath(dir)
+ except OSError: pass
+
+def find_lib():
+ name = sys.argv[0]
+ base = os.path.dirname(os.path.abspath(name))
+
+ #devs use $WAFDIR
+ w=test(os.environ.get('WAFDIR', ''))
+ if w: return w
+
+ #waf-light
+ if name.endswith('waf-light'):
+ w = test(base)
+ if w: return w
+ err("waf-light requires wafadmin -> export WAFDIR=/folder")
+
+ dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
+ for i in [INSTALL,'/usr','/usr/local','/opt']:
+ w = test(i+dir)
+ if w: return w
+
+ #waf-local
+ s = '.%s-%s-%s'
+ if sys.platform == 'win32': s = s[1:]
+ dir = join(base, s % (WAF, VERSION, REVISION))
+ w = test(dir)
+ if w: return w
+
+ #unpack
+ unpack_wafdir(dir)
+ return dir
+
+wafdir = find_lib()
+w = join(wafdir, 'wafadmin')
+t = join(w, 'Tools')
+sys.path = [w, t] + sys.path
+
+import Scripting
+Scripting.prepare(t, cwd, VERSION, wafdir)
+sys.exit(0)
+
+#==>
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 979
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=979&view=rev
Author: frlan
Date: 2009-10-11 19:58:40 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Update of documentation
Modified Paths:
--------------
trunk/geany-plugins/geanysendmail/INSTALL
trunk/geany-plugins/geanysendmail/NEWS
trunk/geany-plugins/geanysendmail/README
trunk/geany-plugins/geanysendmail/TODO
Modified: trunk/geany-plugins/geanysendmail/INSTALL
===================================================================
--- trunk/geany-plugins/geanysendmail/INSTALL 2009-10-07 21:06:33 UTC (rev 978)
+++ trunk/geany-plugins/geanysendmail/INSTALL 2009-10-11 19:58:40 UTC (rev 979)
@@ -1,16 +1,3 @@
-These installation instructions are written for a Linux system.
-
-At the time of this writing, building the plugin requires a recent SVN checkout
-of the Geany sources (API version 104, Geany v0.16svn+).
-
-To compile and install just follow the typical three steps:
-
- % configure
- % make
- % make install
-
-The plugin will be installed into your $prefix/lib/geany of your Geany
-installation. This should be in most cases /usr/ or /usr/local. So you will
-need in most cases to run make install under root. If you don't want to
-install it global, but on your own home dir, just --prefix option for configure.
-Please check README for more detailed information.
+GeanySendMail as distributed within the geany-plugins package doesn't
+have a own build system for its own. Please check documentation of
+geany-plugins release instead.
Modified: trunk/geany-plugins/geanysendmail/NEWS
===================================================================
--- trunk/geany-plugins/geanysendmail/NEWS 2009-10-07 21:06:33 UTC (rev 978)
+++ trunk/geany-plugins/geanysendmail/NEWS 2009-10-11 19:58:40 UTC (rev 979)
@@ -1,4 +1,4 @@
-GeanySendMail 0.4.2 (26. May 2009=:
+GeanySendMail 0.4.2 (26. May 2009):
* Added cancel button to recipient's address dialog
* Some minor code cleanup
Modified: trunk/geany-plugins/geanysendmail/README
===================================================================
--- trunk/geany-plugins/geanysendmail/README 2009-10-07 21:06:33 UTC (rev 978)
+++ trunk/geany-plugins/geanysendmail/README 2009-10-11 19:58:40 UTC (rev 979)
@@ -1,5 +1,5 @@
GeanySendMail Plugin
-(0.4.2)
+(0.4.2 - Geany-plugins 0.19)
About
@@ -14,7 +14,7 @@
Requirements
------------
-For compiling the plugin yourself, you will need the GTK (>= 2.6.0)
+For compiling the plugin yourself, you will need the GTK (>= 2.8.0)
libraries and header files. You will also need its dependency
libraries and header files, such as Pango, Glib and ATK. All these
files are available at http://www.gtk.org.
@@ -33,80 +33,87 @@
Installation
------------
-Compiling and installing the code is done by the following three
-commands:
+This version of the plugin is installed with the combined
+geany-plugins release. Please check README of this package or download
+stand alone version of plugin from
+http://frank.uvena.de/en/Geany/geanysendmail/
-$ ./configure
-$ make
-$ make install
-For more configuration details run
-$ ./configure --help
-
-If there are any errors during compilation, check your build environment
-and try to find the error, otherwise contact one of the authors. (See below)
-
-
Usage
-----
-After installed successfully, load the plugin in Geany's plugin manager
-and a new menu item in the Tools menu will appear. Before you can start
-you need to configure your mail client. This can be done in the
-configuration dialog (details on it later). You can also assign a
+After installed successfully, load the plugin in Geany's plugin
+manager and a new menu item in the Tools menu will appear. Before you
+can start you need to configure your mail client. This can be done in
+the configuration dialog (details on it later). You can also assign a
keyboard shortcut in Geany's preferences dialog to send your document.
Configuration
-------------
-In the configuration dialog you can set up a command that is called by the
-plugin to communicate with your mail client. Depending on what's
-your favorite mailer, the command will differ. A number of placeholders
-are available for doing this:
+In the configuration dialog you can set up a command that is called by
+the plugin to communicate with your mail client. Depending on what's
+your favorite mailer, the command will differ. A number of
+placeholders are available for doing this:
-* %s: Will be replaced by the complete path of the file that should be send.
-* %r: Will be replaced by one or more recipient's email address that can
-be entered inside a separate dialog. (Please remember during input,
-what your mail client is expecting here)
-* %b: Will be replace by the file name. For a file /tmp/foo.baa it will
-be replaced by foo.baa.
+* %s: Will be replaced by the complete path of the file that should be
+send.
+* %r: Will be replaced by one or more recipient's email address that
+can be entered inside a separate dialog. (Please remember during
+input, what your mail client is expecting here)
+* %b: Will be replace by the file name. For a file /tmp/foo.baa it
+will be replaced by foo.baa.
-Depending on how you like to use, you can combine all of the placeholders
-to build up your command. It is possible to use one placeholder
-several times. Examples could be:
+Depending on how you like to use, you can combine all of the
+placeholders to build up your command. It is possible to use one
+placeholder several times. When using keep care, as the placeholders
+are replace step by step, so a filename containing %b might have some
+funny outcome. However, examples could be:
+
+Sylpheed:
sylpheed --attach "%f" --compose "%r"
+mutt:
mutt -s "Sending '%b'" -a "%f" "%r"
+Mozilla Thunderbird at Windows:
"C:\Program Files\Mozilla Thunderbird\thunderbird.exe" \
-compose to="%r",subject="%b",attachment="%f"
+In theory it should also work together with tools like Microsoft
+Outlook - Unfortunately the authoer wasn't able to bring it up
+running. Input for the correct commandline is highly welcome.
+
Development
-----------
-You can checkout the current source code from the Subversion repository at
-Sourceforge.net. Get the code from:
+You can checkout the current source code from the Subversion
+repository at Sourceforge.net. Get the code from:
svn checkout
http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanys…
-If you want to create a patch, please respect the license of GeanySendMail
-as well as intellectual property of third. Patches that should be
-included to the default distribution must be licensed under the same conditions
-as GeanySendMail by the copyright owner.
+As this plugin is part of the combined geany-plugins release, you may
+also like to check its Subversion repository by checking ou
+svn checkout
+http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins/
+
+If you want to create a patch, please respect the license of
+GeanySendMail (GPLv2 or above) as well as intellectual property of
+third. Patches that should be included to the default distribution
+must be licensed under the same conditions as GeanySendMail by the
+copyright owner.
+
+
Known issues
-----------
-During installation it might happen, that the plugin wants to install the
-files for localization to /usr/local as a prefix. This can be avoided by
-adding --prefix="/new/path" when running configure/autogen.sh.
-
In case you are working with white spaces either in your path names,
-file names or at mail addresses (e.g. for separating two addresses) you
-should keep care of proper quoting since %s, %b and %r will be replaced
-without any quotes.
+file names or at mail addresses (e.g. for separating two addresses)
+you should keep care of proper quoting since %s, %b and %r will be
+replaced without any quotes.
For more recent information all reported issues will be tracked at
http://sourceforge.net/tracker/?group_id=222729
Modified: trunk/geany-plugins/geanysendmail/TODO
===================================================================
--- trunk/geany-plugins/geanysendmail/TODO 2009-10-07 21:06:33 UTC (rev 978)
+++ trunk/geany-plugins/geanysendmail/TODO 2009-10-11 19:58:40 UTC (rev 979)
@@ -1,6 +1,5 @@
TODO
----
- * Buildsupport for Win32 (Needs some testing)
* Support for Inline-mailing (embedded text inside mail)
* Send mail directly (only UNIX like systems)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Revision: 978
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=978&view=rev
Author: frlan
Date: 2009-10-07 21:06:33 +0000 (Wed, 07 Oct 2009)
Log Message:
-----------
Update of Spanish translation
Modified Paths:
--------------
trunk/geany-plugins/po/ChangeLog
trunk/geany-plugins/po/es.po
Modified: trunk/geany-plugins/po/ChangeLog
===================================================================
--- trunk/geany-plugins/po/ChangeLog 2009-10-04 21:18:09 UTC (rev 977)
+++ trunk/geany-plugins/po/ChangeLog 2009-10-07 21:06:33 UTC (rev 978)
@@ -1,6 +1,12 @@
-2009-10-03
+2009-10-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
-* *.po, geany-plugins.pot:
+ * es.po: Update of Spanish translation mostly for addons
+ plugin. Thanks to Lucas Vieites.
+
+
+2009-10-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * *.po, geany-plugins.pot:
Update of translation files and catalog with current strings.
Modified: trunk/geany-plugins/po/es.po
===================================================================
--- trunk/geany-plugins/po/es.po 2009-10-04 21:18:09 UTC (rev 977)
+++ trunk/geany-plugins/po/es.po 2009-10-07 21:06:33 UTC (rev 978)
@@ -2,15 +2,15 @@
# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the geany-plugins package.
# Andrew Janke <a.janke(a)gmail.com>, 2009
+# Lucas Vieites <lucas(a)codexion.com>, 2009
#
-#: ../geanyprj/src/menu.c:167
msgid ""
msgstr ""
-"Project-Id-Version: geany-plugins 0.17\n"
+"Project-Id-Version: geany-plugins 0.19\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-02 21:51+0200\n"
-"PO-Revision-Date: 2009-06-11 10:15+0200\n"
-"Last-Translator: Andrew L Janke <a.janke(a)gmail.com>\n"
+"POT-Creation-Date: 2009-10-07 22:59+0200\n"
+"PO-Revision-Date: 2009-10-07 22:57+0200\n"
+"Last-Translator: Lucas Vieites <lucas(a)codexion.com>\n"
"Language-Team: Spanish <geany-i18n(a)uvena.de>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,59 +19,61 @@
#: ../addons/src/tasks.c:298
msgid "Tasks"
-msgstr ""
+msgstr "Tareas"
#: ../addons/src/ao_openuri.c:162
msgid "Open URI"
-msgstr ""
+msgstr "Abrir URI"
#: ../addons/src/ao_openuri.c:168
msgid "Copy URI"
-msgstr ""
+msgstr "Copiar URI"
#: ../addons/src/addons.c:40
msgid "Addons"
-msgstr ""
+msgstr "A??adidos"
#: ../addons/src/addons.c:40
msgid "Various small addons for Geany."
-msgstr ""
+msgstr "Varios peque??os a??adidos para Geany."
#: ../addons/src/addons.c:161 ../codenav/src/codenavigation.c:518
#: ../geanylatex/src/geanylatex.c:181 ../geanysendmail/src/geanysendmail.c:151
#: ../geanysendmail/src/geanysendmail.c:312 ../geanyvc/src/geanyvc.c:1776
#: ../spellcheck/src/scplugin.c:126
msgid "Plugin configuration directory could not be created."
-msgstr ""
+msgstr "No se ha podido crear el directorio de configuraci??n del plugin."
#: ../addons/src/addons.c:183
+#, fuzzy
msgid "Show toolbar item to show a list of currently open documents"
msgstr ""
+"Mostrar un bot??n en la barra para mostrar un listado de documentos abiertos"
#. TODO fix the string
#: ../addons/src/addons.c:190
msgid "Show a 'Open URI' menu item in the editor menu"
-msgstr ""
+msgstr "Mostrar un elemento ??Abrir URI?? en el men?? ??Editar??"
#: ../addons/src/addons.c:196
msgid "Show available tasks in the Message Window"
-msgstr ""
+msgstr "Mostrar tareas disponibles en la ventana de mensajes"
#: ../addons/src/addons.c:202
msgid "Show status icon in the Notification Area"
-msgstr ""
+msgstr "Mostrar icono de estado en el ??rea de notificaci??n"
#: ../addons/src/ao_doclist.c:209
msgid "Close Ot_her Documents"
-msgstr ""
+msgstr "Cerrar los _dem??s documentos"
#: ../addons/src/ao_doclist.c:214
msgid "C_lose All"
-msgstr ""
+msgstr "_Cerrar todos"
#: ../addons/src/ao_doclist.c:244
msgid "Show Document List"
-msgstr ""
+msgstr "Mostrar lista de documentos"
#. All plugins must set name, description, version and author.
#: ../codenav/src/codenavigation.c:69
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/