Commit 141d393c authored by Barak A. Pearlmutter's avatar Barak A. Pearlmutter

Import Upstream version 4.7

parent 8be2b93e
Main author: Denis Auroux (auroux@math.mit.edu, auroux@math.berkeley.edu)
Main author: Denis Auroux (auroux@math.berkeley.edu)
The source code includes contributions by the following people:
Eduardo de Barros Lima, Mathieu Bouchard, Ole Joergen Broenner,
Vincenzo Ciancia, Luca de Cicco, Michele Codutti, Robert Gerlach,
Lukasz Kaiser, Danny Kukawka, Stefan Lembach, Bob McElrath, Andy Neitzke,
David Planella, Marco Poletti, Alex Ray, Jean-Baptiste Rouquier,
Mike Ter Louw, Uwe Winter, Lu Zhihe.
Alvaro, Kit Barnes, Eduardo de Barros Lima, Mathieu Bouchard,
Ole Joergen Broenner, Robert Buchholz, Vincenzo Ciancia, Luca de Cicco,
Michele Codutti, Robert Gerlach, Daniel German, Dirk Gerrits, Simon Guest,
Lukasz Kaiser, Ian Woo Kim, Timo Kluck, David Kolibac, Danny Kukawka,
Stefan Lembach, Bob McElrath, Andy Neitzke, David Planella, Marco Poletti,
Alex Ray, Jean-Baptiste Rouquier, Victor Saase, Marco Souza, Mike Ter Louw,
Uwe Winter, Lu Zhihe.
(Let me know if you are missing from this list or if your name is
mis-spelled)
This version:
Version 0.4.7 (July 4, 2012):
- insert image tool (based on patches by Victor Saase and Simon Guest)
- renamed "Journal" menu to "Page"
- paste images and text directly from and to other applications
- lasso tool (based on patch by Ian Woo Kim)
Version 0.4.6 (May 22, 2012):
- win32 portability code (contributed by Dirk Gerrits)
- fix bug in PDF export code on 64-bit systems (patch by Robert Buchholz)
- fix hand tool bug when exiting canvas (#2905711)
......@@ -10,6 +16,10 @@ This version:
- change close dialog box default to "save" (patch by Kit Barnes)
- option to force PDF background rendering via cairo (slower but nicer)
- wrapper for missing GdkPixbuf rendering function in newest poppler
- disable GTK+ XInput bugfix by default (#3429416)
- fix linker flags (#3208984); evdev coordinate fix (#3244118) (Timo Kluck)
- specify license version: GPL v2 or later
- fix 1.#J coordinates from win32 xoj files
Version 0.4.5 (Oct 2, 2009):
- bugfixes for GTK+ 2.16/2.17 issues with xinput events
......
# Makefile.in generated by automake 1.11 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -153,9 +153,12 @@ PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
......@@ -286,7 +289,7 @@ distclean-hdr:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -311,7 +314,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -478,7 +481,8 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
......@@ -522,17 +526,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
Version 0.4.5 (October 2, 2009)
Version 0.4.7 (July 4, 2012)
Installation: see INSTALL
User's manual: see html-doc/manual.html
......
Version 0.4.5 (October 2, 2009)
Version 0.4.7 (July 4, 2012)
Installation: see INSTALL
Latest changes: see ChangeLog
User's manual: see html-doc/manual.html
Updates: see http://xournal.sourceforge.net/
Installation: see INSTALL
User's manual: see html-doc/manual.html
Updates: see http://xournal.sourceforge.net/
See also: http://sourceforge.net/projects/xournal
# generated automatically by aclocal 1.11 -*- Autoconf -*-
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
[m4_warning([this file was generated for autoconf 2.63.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......@@ -260,6 +260,10 @@ msgstr ""
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
*-*-openbsd*)
CATOBJEXT=.mo
DATADIRNAME=share
;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
......@@ -301,7 +305,7 @@ msgstr ""
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs
dnl in configure.in.
dnl in configure.ac.
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
......@@ -430,7 +434,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
dnl
dnl Now the definitions that aclocal will find
dnl
ifdef(glib_configure_in,[],[
ifdef(glib_configure_ac,[],[
AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
......@@ -453,6 +457,7 @@ fi])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
......@@ -480,7 +485,10 @@ fi])
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
......@@ -493,7 +501,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
......@@ -502,21 +509,20 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
#
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
# this or PKG_CHECK_MODULES is called, or make sure to call
# PKG_CHECK_EXISTS manually
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
# only at the first occurence in configure.ac, so if the first place
# it's called might be skipped (such as if it is within an "if", you
# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:])
m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
......@@ -569,6 +575,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
......@@ -578,7 +585,7 @@ if test $pkg_failed = yes; then
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
......@@ -586,25 +593,24 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT
])],
[AC_MSG_RESULT([no])
$4])
_PKG_TEXT])
])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
$3
fi[]dnl
])# PKG_CHECK_MODULES
......@@ -623,7 +629,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11], [],
m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -639,7 +645,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11])dnl
[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
This diff is collapsed.
......@@ -63,6 +63,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
......
This diff is collapsed.
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(xournal, 0.4.5)
AM_INIT_AUTOMAKE(xournal, 0.4.7)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
......@@ -11,14 +11,16 @@ AM_PROG_CC_STDC
AC_PROG_RANLIB
AC_HEADER_STDC
pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0"
LDFLAGS="$LDFLAGS -lz -lm"
pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0 x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
dnl detect Win32 environment...
dnl detect Windows environment...
AC_CANONICAL_HOST
AC_MSG_CHECKING([for Win32 environment])
AC_MSG_CHECKING([for Windows environment])
case "$host" in
*-*-mingw*)
os_win32=yes;;
......
......@@ -24,7 +24,7 @@
Xournal User's Manual
</h2>
<p style="font-size: 0.95em; text-align: center; color: rgb(0,0,0)">
Version 0.4.5
Version 0.4.7
</p>
<hr />
<p>
......@@ -148,6 +148,15 @@ the Tools menu):
that the typesetting of the text may be slightly different in the
printout.
</p>
<h3 class="subsub"> The image tool</h3>
<p>
To insert a new image (from a file on disk), click at the location
where the upper-left corner is to be located. A file selection dialog
box pops up. Alternatively, images can be pasted directly from the
clipboard (without having to select the image tool). In both cases,
the newly inserted image is selected, and can be easily moved or resized
as with any selection.
</p>
<h3 class="subsub"><img src="pixmaps/ruler.png"> The ruler</h3>
<p>
The ruler is not a tool by itself, but rather a special operating mode
......@@ -217,6 +226,13 @@ the Tools menu):
or to a different journal) using the copy-paste toolbar buttons or the
corresponding entries of the Edit menu.
</p>
<h3 class="subsub"><img src="pixmaps/lasso.png"> Lasso selection</h3>
<p>
This tool lets you select an irregular shaped region of the current layer.
All the items which are entirely contained within the given region
are selected. As with the rectangle selection tool, the selection can be moved,
resized, copied and pasted.
</p>
<h3 class="subsub"><img src="pixmaps/stretch.png"> Vertical space</h3>
<p>
This tool lets you insert or remove vertical space within the page:
......@@ -696,21 +712,23 @@ the name and point size of the default text font.</li>
<h2 class="subtitle">Author information, license, bug-reports</h2>
<p>
Xournal is written by Denis Auroux
(aur<!--despam-->oux<span>&#x40;</span><span>math</span>&#x2e;<span>mit&#x2e;edu,
aur<!--despam-->oux<span>&#x40;</span><span>math</span>&#x2e;<span>berkeley&#x2e;edu).
(aur<!--despam-->oux<span>&#x40;</span><span>math</span>&#x2e;<span>berkeley&#x2e;edu).
</p>
<p>
The source code includes contributions by the following people:
Eduardo de Barros Lima, Mathieu Bouchard, Ole J&oslash;rgen Br&oslash;nner,
Vincenzo Ciancia, Luca de Cicco, Michele Codutti,
Robert Gerlach, Lukasz Kaiser, Danny Kukawka, Bob McElrath,
Andy Neitzke, David Planella, Alex Ray, Jean-Baptiste Rouquier,
Mike Ter Louw, Uwe Winter, Lu Zhihe.
Alvaro, Kit Barnes, Eduardo de Barros Lima, Mathieu Bouchard,
Ole J&oslash;rgen Br&oslash;nner, Robert Buchholz, Vincenzo Ciancia, Luca de Cicco,
Michele Codutti, Robert Gerlach, Daniel German, Dirk Gerrits, Simon Guest,
Lukasz Kaiser, Ian Woo Kim, Timo Kluck, David Kolibac, Danny Kukawka,
Stefan Lembach, Bob McElrath, Andy Neitzke, David Planella, Marco Poletti,
Alex Ray, Jean-Baptiste Rouquier, Victor Saase, Marco Souza, Mike Ter Louw,
Uwe Winter, Lu Zhihe.
</p>
<p style="font-size:0.9em">(Let me know if you are missing from this list or
if your name is mis-spelled)</p>
<p>
Xournal is distributed under the GNU General Public License.
Xournal is distributed under the GNU General Public License (version 2, or
at your option any later version).
</p>
<p style="font-size: 0.9em; font-style: italic">
<b>Note:</b> most of the code of version 0.4.2.1
......@@ -733,6 +751,36 @@ Bug reports and suggestions can also be submitted on Xournal's
<a name="changelog"></a>
<h2 class="subtitle">Version history</h2>
<p>
Version 0.4.7 (July 4, 2012):
<ul>
<li>insert image tool (based on patches by Victor Saase and Simon Guest)
</li><li>renamed "Journal" menu to "Page"
</li><li>paste images and text directly from and to other applications
</li><li>lasso tool (based on patch by Ian Woo Kim)
</ul>
</p>
<p>
Version 0.4.6 (May 22, 2012):
<ul>
<li>win32 portability code (contributed by Dirk Gerrits)
</li><li>fix bug in PDF export code on 64-bit systems (patch by Robert Buchholz)
</li><li>fix hand tool bug when exiting canvas (#2905711)
</li><li>Italian translation (Marco Poletti), German translation (Stefan Lembach)
</li><li>Spanish translation (Alvaro), Brazil Portuguese translation (Marco Souza)
</li><li>fix save bug with text boxes containing &gt; 4095 characters
</li><li>Czech translation (David Kolibac), Dutch translation (Timo Kluck)
</li><li>fix crash upon unplugging input devices
</li><li>change close dialog box default to "save" (patch by Kit Barnes)
</li><li>option to force PDF background rendering via cairo (slower but nicer)
</li><li>wrapper for missing GdkPixbuf rendering function in newest poppler
</li><li>disable GTK+ XInput bugfix by default (#3429416)
</li><li>fix linker flags (#3208984); evdev coordinate fix (#3244118) (Timo Kluck)
</li><li>specify license version: GPL v2 or later
</li><li>fix 1.#J coordinates from win32 xoj files
</li>
</ul>
</p>
<p>
Version 0.4.5 (Oct 2, 2009):
<ul>
<li>bugfixes for GTK+ 2.16/2.17 issues with xinput events
......@@ -1058,6 +1106,15 @@ The contents of the text are encoded in UTF-8, with the characters
no extraneous whitespace should be inserted between the enclosing tags
and the text itself).
</p>
<p>Starting with version 0.4.7, layers can also contain image items.
The format of an image item is:
<pre>&lt;image left="..." top="..." right="..." bottom="..."&gt;... data ...&lt;/image&gt;
</pre>
The <i>left</i>, <i>top</i>, <i>right</i> and <i>bottom</i> attributes
specify the bounding box to which the image is scaled, in page coordinates
(measured in points from the top-left corner). The data is in base64-encoded
PNG format (though any other base64-encoded format that can be loaded by
gdk-pixbuf is currently accepted).
<hr />
<a name="installation"></a>
<h2 class="subtitle">Installation issues</h2>
......@@ -1094,7 +1151,7 @@ Download the Xournal distribution tar.gz file, and any needed dependencies.
<p>
<b>Compilation and installation in /usr/local:</b>
<pre>
./configure
./autogen.sh
make
(as root) make install
(as root) make desktop-install
......@@ -1103,6 +1160,7 @@ make
<p>
<b>Compilation and installation in $HOME:</b>
<pre>
./autogen.sh
./configure --prefix=$HOME
make
make install
......@@ -1278,15 +1336,12 @@ Options menu), at a price of a severe loss of resolution (and the eraser tip
won't be detected anymore).
</p>
<p>
I have also had a report that one of the workarounds used by Xournal to
bypass a calibration bug in GTK+ can actually entirely prevent strokes
from being drawn. If you are being unsuccessful at drawing in Xournal
with XInput enabled, try recompiling after commenting out the line
One of the workarounds used by Xournal to
bypass a calibration bug in old versions of GTK+ seems to be more harmful
than helpful with modern distributions. If you miss the old behavior or
are having XInput issues, try recompiling after uncommenting the line
<pre>#define ENABLE_XINPUT_BUGFIX</pre>
near the beginning of <tt>src/xournal.h</tt>.
If this modification does improve things for you, and if you have a bit
of spare time to help investigate the causes of this problem, please
contact me.
</p>
<h3 class="subsub">On-the-fly display rotation</h3>
<p>
......@@ -1307,7 +1362,8 @@ To return to landscape mode:
</pre>
<b>Note #1:</b> you should not rotate the display while Xournal is running,
otherwise the tablet calibration in Xournal may (and most likely will)
become incorrect.
become incorrect. (Less likely to occur with modern distributions and
ENABLE_XINPUT_BUGFIX disabled).
Exit Xournal and restart it after the display has been rotated.
</p>
<p>
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
scriptversion=2009-04-28.21; # UTC
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
IFS=" "" $nl"
errstatus=0
dirmode=""
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage" 1>&2
exit 0
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
......@@ -23,6 +38,10 @@ while test $# -gt 0 ; do
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
......@@ -50,30 +69,58 @@ case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p -- . 2>/dev/null; then
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
pathcomp=
for d
do
pathcomp="$pathcomp$d"
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
......@@ -84,21 +131,21 @@ do
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=""
chmod "$dirmode" "$pathcomp" || lasterr=$?
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp="$pathcomp/"
pathcomp=$pathcomp/
done
done
......@@ -107,5 +154,9 @@ exit $errstatus
# 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-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
# mkinstalldirs ends here
Version 0.4.6:
- added Italian translation (by Marco Poletti)
- added German translation (by Stefan Lembach)
- added Spanish translation (by Alvaro)
......
......@@ -79,7 +79,7 @@ INSTOBJEXT = @INSTOBJEXT@
$(MSGFMT) -o $@ $<
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
$(AM_V_GEN) file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
.po.cat:
......@@ -93,8 +93,18 @@ all-yes: $(CATALOGS)
all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \
--msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \
--add-comments --keyword=_ --keyword=N_ \
--keyword=C_:1c,2 \
--keyword=NC_:1c,2 \
--keyword=g_dcgettext:2 \
--keyword=g_dngettext:2,3 \