DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved error handling

Browse Source
This commit is contained in:
Pierre Pronchery 2014-01-23 12:12:14 -06:00
parent 32d6c406c3
commit f3814eaafa
5 changed files with 96 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/scripts/docbook.sh
View File

@ -26,7 +26,7 @@
#variables
PREFIX="/usr/local"
. "../config.sh"
[ -f "../config.sh" ] && . "../config.sh"
#executables
DEBUG="_debug"
INSTALL="install -m 0644"
@ -44,6 +44,14 @@ _debug()
}
#error
_error()
{
echo "docbook.sh: $@" 1>&2
return 2
}
#usage
_usage()
{
@ -84,6 +92,12 @@ if [ $# -eq 0 ]; then
exit $?
fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
[ -z "$DATADIR" ] && DATADIR="$PREFIX/share"
[ -z "$MANDIR" ] && MANDIR="$DATADIR/man"

18
doc/scripts/gettext.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
#$Id$
#Copyright (c) 2010-2013 Pierre Pronchery <khorben@defora.org>
#Copyright (c) 2010-2014 Pierre Pronchery <khorben@defora.org>
#
#Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met:
@ -26,7 +26,7 @@
#variables
PREFIX="/usr/local"
. "../config.sh"
[ -f "../config.sh" ] && . "../config.sh"
LOCALEDIR="$PREFIX/share/locale"
POTFILES="POTFILES"
#executables
@ -49,6 +49,14 @@ _debug()
}
#error
_error()
{
echo "gettext.sh: $@" 1>&2
return 2
}
#usage
_usage()
{
@ -125,6 +133,12 @@ if [ $# -eq 0 ]; then
exit $?
fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
LOCALEDIR="$PREFIX/share/locale"
while [ $# -gt 0 ]; do
target="$1"

20
doc/scripts/gtkdoc.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
#$Id$
#Copyright (c) 2012-2013 Pierre Pronchery <khorben@defora.org>
#Copyright (c) 2012-2014 Pierre Pronchery <khorben@defora.org>
#
#Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met:
@ -26,8 +26,7 @@
#variables
PREFIX="/usr/local"
. "../config.sh"
MODULE="$PACKAGE"
[ -f "../config.sh" ] && . "../config.sh"
#executables
DEBUG="_debug"
GTKDOC_FIXXREF="gtkdoc-fixxref"
@ -50,6 +49,14 @@ _debug()
}
#error
_error()
{
echo "gtkdoc.sh: $@" 1>&2
return 2
}
#usage
_usage()
{
@ -90,6 +97,13 @@ if [ $# -eq 0 ]; then
exit $?
fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
MODULE="$PACKAGE"
[ -z "$DATADIR" ] && DATADIR="$PREFIX/share"
instdir="$DATADIR/gtk-doc/html"

28
doc/scripts/pkgconfig.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
#$Id$
#Copyright (c) 2011-2013 Pierre Pronchery <khorben@defora.org>
#Copyright (c) 2011-2014 Pierre Pronchery <khorben@defora.org>
#
#Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met:
@ -26,7 +26,7 @@
#variables
PREFIX="/usr/local"
. "../config.sh"
[ -f "../config.sh" ] && . "../config.sh"
DEBUG="_debug"
DEVNULL="/dev/null"
#executables
@ -45,6 +45,14 @@ _debug()
}
#error
_error()
{
echo "pkgconfig.sh: $@" 1>&2
return 2
}
#usage
_usage()
{
@ -85,6 +93,16 @@ if [ $# -eq 0 ]; then
exit $?
fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
if [ -z "$VERSION" ]; then
_error "The VERSION variable needs to be set"
exit $?
fi
PKGCONFIG="$PREFIX/lib/pkgconfig"
while [ $# -gt 0 ]; do
target="$1"
@ -118,9 +136,11 @@ while [ $# -gt 0 ]; do
fi
#create
$DEBUG $SED -e "s;@PREFIX@;$PREFIX;" \
$DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;" \
-e "s;@VERSION@;$VERSION;" \
-e "s;@RPATH@;$RPATH;" -- "$target.in" > "$target"
-e "s;@PREFIX@;$PREFIX;" \
-e "s;@RPATH@;$RPATH;" \
-- "$target.in" > "$target"
if [ $? -ne 0 ]; then
$DEBUG $RM -- "$target"
exit 2

27
doc/scripts/subst.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
#$Id$
#Copyright (c) 2012-2013 Pierre Pronchery <khorben@defora.org>
#Copyright (c) 2012-2014 Pierre Pronchery <khorben@defora.org>
#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, version 3 of the License.
@ -36,6 +36,14 @@ _debug()
}
#error
_error()
{
echo "subst.sh: $@" 1>&2
return 2
}
#usage
_usage()
{
@ -76,6 +84,16 @@ if [ $# -eq 0 ]; then
exit $?
fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
if [ -z "$VERSION" ]; then
_error "The VERSION variable needs to be set"
exit $?
fi
while [ $# -gt 0 ]; do
target="$1"
shift
@ -100,8 +118,11 @@ while [ $# -gt 0 ]; do
fi
#create
$DEBUG $SED -e "s,@PREFIX@,$PREFIX," \
-e "s,@VERSION@,$VERSION," "$target.in" > "$target"
$DEBUG $SED -e "s,@PACKAGE@,$PACKAGE," \
-e "s,@VERSION@,$VERSION," \
-e "s,@PREFIX@,$PREFIX," \
-e "s,@PWD@,$PWD," \
-- "$target.in" > "$target"
if [ $? -ne 0 ]; then
$RM -- "$target" 2> "$DEVNULL"
exit 2