[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-438
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-438-gd43d993 |
|
Date: |
Sat, 26 Mar 2011 16:23:29 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via d43d99348dacaf75cd659a7dbc3bfad826e62442 (commit)
via 4410223951f813987fd67a3e57610ac051d1c5a7 (commit)
via 1d1cdfb9b06214fd9f0a6f89f7cdaf37d589941c (commit)
from e4a24e26a040e3e8bc597ffb5391e91b61850797 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d43d99348dacaf75cd659a7dbc3bfad826e62442
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Mar 26 17:16:51 2011 +0100
Do not `sync' at shutdown.
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 12939c2..cd75834 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -66,7 +66,6 @@ void registerSignals ();
void Sig_Quit (int signal)
{
Server::getInstance ()->log ("Exiting...");
- sync ();
Server::getInstance ()->stop ();
registerSignals ();
}
commit 4410223951f813987fd67a3e57610ac051d1c5a7
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Mar 26 17:16:20 2011 +0100
Simplify time functions using `strftime' instead of `asctime'.
diff --git a/myserver/include/base/string/stringutils.h
b/myserver/include/base/string/stringutils.h
index 82bf044..295698c 100644
--- a/myserver/include/base/string/stringutils.h
+++ b/myserver/include/base/string/stringutils.h
@@ -40,14 +40,10 @@ const char *getRFC822LocalTime (const time_t, string &out);
int getCharInString (const char*,const char*,int max);
const char* getLocalLogFormatDate (const time_t t, char* out);
-const char* getGMTLogFormatDate (const time_t t, char* out);
const char* getLocalLogFormatDate (char* out);
-const char* getGMTLogFormatDate (char* out);
const char* getLocalLogFormatDate (const time_t t, string& out);
-const char* getGMTLogFormatDate (const time_t t, string& out);
const char* getLocalLogFormatDate (string& out);
-const char* getGMTLogFormatDate (string& out);
time_t getTime (const char* str);
inline time_t getTime (string const& str){ return getTime (str.c_str ()); }
diff --git a/myserver/src/base/string/stringutils.cpp
b/myserver/src/base/string/stringutils.cpp
index 11cf580..8944511 100644
--- a/myserver/src/base/string/stringutils.cpp
+++ b/myserver/src/base/string/stringutils.cpp
@@ -88,7 +88,7 @@ const char *getRFC822LocalTime (const time_t t, string &out)
/*!
This function format current time to the RFC 822 format.
*/
-const char *getRFC822GMTTime (char* out)
+const char *getRFC822GMTTime (char *out)
{
time_t ltime;
time (<ime);
@@ -98,49 +98,10 @@ const char *getRFC822GMTTime (char* out)
/*!
This function formats a time to the RFC 822 format.
*/
-const char *getRFC822GMTTime (const time_t ltime, char* out)
+const char *getRFC822GMTTime (const time_t ltime, char *out)
{
- char *asct;
- char buffer[32];
- u_long ind = 0;
tm* gmTime = gmtime (<ime);
- gmTime->tm_year += 1900;
- asct = asctime_r (gmTime, buffer);
- out[ind++]= asct[0];
- out[ind++]= asct[1];
- out[ind++]= asct[2];
- out[ind++] = ',';
-
- if (asct[8] != ' ')
- out[ind++] = ' ';
-
- out[ind++] = asct[8];
- out[ind++] = asct[9];
- out[ind++] = ' ';
- out[ind++]= asct[4];
- out[ind++]= asct[5];
- out[ind++]= asct[6];
- out[ind++] = ' ';
-
- sprintf (&out[ind], "%i", gmTime->tm_year);
- ind += 4;
-
- out[ind++] = ' ';
- out[ind++]= asct[11];
- out[ind++]= asct[12];
- out[ind++] = ':';
- out[ind++]= asct[14];
- out[ind++]= asct[15];
- out[ind++] = ':';
- out[ind++]= asct[17];
- out[ind++]= asct[18];
- out[ind++] = ' ';
- out[ind++] = 'G';
- out[ind++] = 'M';
- out[ind++] = 'T';
- out[ind++] = '\0';
- out[ind++] = '\0';
- out[ind++] = '\0';
+ strftime (out, 32, "%a, %d %b %Y %H:%M:%S GMT", gmTime);
return out;
}
@@ -319,7 +280,7 @@ time_t getTime (const char* str)
/*!
This function format current time to the RFC 822 format.
*/
-const char *getRFC822LocalTime (char* out)
+const char *getRFC822LocalTime (char *out)
{
time_t ltime;
time (<ime);
@@ -328,59 +289,21 @@ const char *getRFC822LocalTime (char* out)
/*!
This function formats a time to the RFC 822 format.
*/
-const char *getRFC822LocalTime (const time_t ltime, char* out)
+const char *getRFC822LocalTime (const time_t ltime, char *out)
{
char *asct;
tm result;
- u_long ind = 0;
- char buffer[32];
myserver_localtime (<ime, &result);
+ strftime (out, 32, "%a, %d %b %Y %H:%M:%S %z", &result);
- result.tm_year += 1900;
- asct = asctime_r (&result, buffer);
- out[ind++] = asct[0];
- out[ind++] = asct[1];
- out[ind++] = asct[2];
- out[ind++] = ',';
-
- if (asct[8] != ' ')
- out[ind++] = ' ';
-
- out[ind++] = asct[8];
- out[ind++] = asct[9];
- out[ind++] = ' ';
- out[ind++] = asct[4];
- out[ind++] = asct[5];
- out[ind++] = asct[6];
- out[ind++] = ' ';
-
- sprintf (&out[ind], "%i", result.tm_year);
- ind += 4;
-
- out[ind++] = ' ';
- out[ind++] = asct[11];
- out[ind++] = asct[12];
- out[ind++] = ':';
- out[ind++] = asct[14];
- out[ind++] = asct[15];
- out[ind++] = ':';
- out[ind++] = asct[17];
- out[ind++] = asct[18];
- out[ind++] = ' ';
- out[ind++] = '\0';
- out[ind++] = '\0';
- out[ind++] = '\0';
- out[ind++] = '\0';
- out[ind++] = '\0';
- out[ind++] = '\0';
return out;
}
/*!
Get the local time string.
*/
-const char* getLocalLogFormatDate (char* out)
+const char* getLocalLogFormatDate (char *out)
{
time_t ltime;
time (<ime);
@@ -388,17 +311,6 @@ const char* getLocalLogFormatDate (char* out)
}
/*!
- Get the GMT time string.
- */
-const char* getGMTLogFormatDate (char* out)
-{
- time_t ltime;
- time (<ime);
- return getGMTLogFormatDate (ltime, out);
-}
-
-
-/*!
Get the local time string.
*/
const char* getLocalLogFormatDate (const time_t t, string& out)
@@ -410,16 +322,6 @@ const char* getLocalLogFormatDate (const time_t t, string&
out)
}
/*!
- Get the GMT time string.
- */
-const char* getGMTLogFormatDate (const time_t t, string& out)
-{
- char buff[32];
- getGMTLogFormatDate (t, buff);
- out.assign (buff);
- return out.c_str ();
-}
-/*!
Get the local time string.
*/
const char* getLocalLogFormatDate (string& out)
@@ -431,51 +333,20 @@ const char* getLocalLogFormatDate (string& out)
}
/*!
- Get the GMT time string.
- */
-const char* getGMTLogFormatDate (string& out)
-{
- char buff[32];
- getGMTLogFormatDate (buff);
- out.assign (buff);
- return out.c_str ();
-}
-
-/*!
Get a string in the format "day/month/year:hour:minute:second offset"
for the local zone.
*/
-const char* getLocalLogFormatDate (const time_t t, char* out)
+const char* getLocalLogFormatDate (const time_t t, char *out)
{
int offset = 0;
time_t ltime;
- time (<ime);
char *asct;
- tm gmTime;
+ tm localTime;
char buffer[32];
- myserver_localtime (<ime, &gmTime);
-
- gmTime.tm_year += 1900;
- asct = asctime_r (&gmTime, buffer);
- out[0] = asct[8] != ' ' ? asct[8] : '0';
- out[1] = asct[9];
- out[2] = '/';
- out[3] = asct[4];
- out[4]= asct[5];
- out[5] = asct[6];
- out[6] = '/';
- sprintf (&out[7], "%i", gmTime.tm_year);
- out[11] = ':';
- out[12] = asct[11];
- out[13] = asct[12];
- out[14] = ':';
- out[15] = asct[14];
- out[16] = asct[15];
- out[17] = ':';
- out[18] = asct[17];
- out[19] = asct[18];
- out[20] = ' ';
+ time (<ime);
+
+ myserver_localtime (<ime, &localTime);
#ifndef WIN32
extern long timezone;
@@ -488,7 +359,6 @@ const char* getLocalLogFormatDate (const time_t t, char*
out)
gettimeofday (&tv, &tz);
offset = -tz.tz_minuteswest * 60;
-
# else
TIME_ZONE_INFORMATION tzi;
GetTimeZoneInformation (&tzi);
@@ -497,6 +367,9 @@ const char* getLocalLogFormatDate (const time_t t, char*
out)
#endif
+ strftime (out, 32, "%d/%b/%Y:%H:%M:%S", &localTime);
+ out[20] = ' ';
+
if (offset < 0)
{
offset = -offset;
@@ -504,51 +377,9 @@ const char* getLocalLogFormatDate (const time_t t, char*
out)
}
else
out[21] = '+';
- sprintf (&out[22], "%.2i%.2i", offset / (60 * 60), offset % (60 * 60) / 60);
- out[26] = '\0';
- return out;
-}
+ sprintf (&out[22], "%.2i%.2i", offset / (60 * 60), offset % (60 * 60) / 60);
-/*!
- Get a string in the format "day/month/year:hour:minute:second offset"
- for the GMT zone.
- */
-const char* getGMTLogFormatDate (const time_t t, char* out)
-{
- time_t ltime;
- time (<ime);
- char *asct;
- tm result;
- char buffer[32];
-
- myserver_localtime ( <ime, &result );
-
- result.tm_year += 1900;
- asct = asctime_r (&result, buffer);
- out[0] = asct[8] != ' ' ? asct[8] : '0';
- out[1] = asct[9];
- out[2] = '/';
- out[3] = asct[4];
- out[4] = asct[5];
- out[5] = asct[6];
- out[6] = '/';
- sprintf (&out[7], "%i", result.tm_year);
- out[11] = ':';
- out[12] = asct[11];
- out[13] = asct[12];
- out[14] = ':';
- out[15] = asct[14];
- out[16] = asct[15];
- out[17] = ':';
- out[18] = asct[17];
- out[19] = asct[18];
- out[20] = ' ';
- out[21] = '+';
- out[22] = '0';
- out[23] = '0';
- out[24] = '0';
- out[25] = '0';
out[26] = '\0';
return out;
}
diff --git a/myserver/tests/test_stringutils.cpp
b/myserver/tests/test_stringutils.cpp
index 100dee8..cb9b14b 100644
--- a/myserver/tests/test_stringutils.cpp
+++ b/myserver/tests/test_stringutils.cpp
@@ -93,12 +93,12 @@ public:
time_t epoch = 0;
string out;
const char* ret = getRFC822GMTTime (epoch, out);
- CPPUNIT_ASSERT (! strcasecmp (ret, "Thu, 1 Jan 1970 00:00:00 GMT"));
- CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Thu, 1 Jan 1970 00:00:00
GMT"));
+ CPPUNIT_ASSERT (! strcasecmp (ret, "Thu, 01 Jan 1970 00:00:00 GMT"));
+ CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Thu, 01 Jan 1970 00:00:00
GMT"));
ret = getRFC822GMTTime (1009972800, out);
- CPPUNIT_ASSERT (! strcasecmp (ret, "Wed, 2 Jan 2002 12:00:00 GMT"));
- CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Wed, 2 Jan 2002 12:00:00
GMT"));
+ CPPUNIT_ASSERT (! strcasecmp (ret, "Wed, 02 Jan 2002 12:00:00 GMT"));
+ CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Wed, 02 Jan 2002 12:00:00
GMT"));
}
void testGetTime ()
commit 1d1cdfb9b06214fd9f0a6f89f7cdaf37d589941c
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Mar 26 14:32:17 2011 +0100
Update `bootstrap' from upstream.
diff --git a/myserver/bootstrap b/myserver/bootstrap
index 1ffaaa9..f004ad3 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -1,11 +1,10 @@
#! /bin/sh
# Print a version string.
-scriptversion=2010-05-14.09; # UTC
+scriptversion=2011-03-03.12; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 2003-2011 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
@@ -43,24 +42,32 @@ local_gl_dir=gl
bt='._bootmp'
bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
bt2=${bt}2
+me=$0
usage() {
cat <<EOF
-Usage: $0 [OPTION]...
+Usage: $me [OPTION]...
Bootstrap this package from the checked-out sources.
Options:
- --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
+ --gnulib-srcdir=DIRNAME specify the local directory where gnulib
sources reside. Use this if you already
have gnulib sources on your machine, and
do not want to waste your bandwidth downloading
- them again. Defaults to \$GNULIB_SRCDIR.
- --copy Copy files instead of creating symbolic links.
- --force Attempt to bootstrap even if the sources seem
- not to have been checked out.
- --skip-po Do not download po files.
-
-If the file $0.conf exists in the same directory as this script, its
+ them again. Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync if this bootstrap script is not identical to
+ the version in the local gnulib sources,
+ update this script, and then restart it with
+ /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync do not check whether bootstrap is out of sync
+ --copy copy files instead of creating symbolic links
+ --force attempt to bootstrap even if the sources seem
+ not to have been checked out
+ --no-git do not use git to update gnulib. Requires that
+ --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
contents are read as shell variables to configure the bootstrap.
For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
@@ -81,6 +88,10 @@ gnulib_modules=
# Any gnulib files needed that are not in modules.
gnulib_files=
+# A function to be called to edit gnulib.mk right after it's created.
+# Override it via your own definition in bootstrap.conf.
+gnulib_mk_hook() { :; }
+
# A function to be called after everything else in this script.
# Override it via your own definition in bootstrap.conf.
bootstrap_epilogue() { :; }
@@ -91,7 +102,8 @@ bootstrap_epilogue() { :; }
# options because the latest/%s directory and the .po files within are
# all symlinks.
po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
extract_package_name='
/^AC_INIT(/{
@@ -164,6 +176,13 @@ copy=false
# on which version control system (if any) is used in the source directory.
vc_ignore=auto
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
# find_tool ENVVAR NAMES...
# -------------------------
# Search for a required program. Use the value of ENVVAR, if set,
@@ -188,11 +207,11 @@ find_tool ()
find_tool_error_prefix="\$$find_tool_envvar: "
fi
if test x"$find_tool_res" = x; then
- echo >&2 "$0: one of these is required: $find_tool_names"
+ echo >&2 "$me: one of these is required: $find_tool_names"
exit 1
fi
($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
- echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+ echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res
--version"
exit 1
}
eval "$find_tool_envvar=\$find_tool_res"
@@ -235,12 +254,25 @@ do
checkout_only_file=;;
--copy)
copy=true;;
+ --bootstrap-sync)
+ bootstrap_sync=true;;
+ --no-bootstrap-sync)
+ bootstrap_sync=false;;
+ --no-git)
+ use_git=false;;
*)
echo >&2 "$0: $option: unknown option"
exit 1;;
esac
done
+if $use_git || test -d "$GNULIB_SRCDIR"; then
+ :
+else
+ echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
+ exit 1
+fi
+
if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
exit 1
@@ -257,6 +289,21 @@ insert_sorted_if_absent() {
|| exit 1
}
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_sorted_if_absent.
+insert_vc_ignore() {
+ vc_ignore_file="$1"
+ pattern="$2"
+ case $vc_ignore_file in
+ *.gitignore)
+ # A .gitignore entry that does not start with `/' applies
+ # recursively to subdirectories, so prepend `/' to every
+ # .gitignore entry.
+ pattern=`echo "$pattern" | sed s,^,/,`;;
+ esac
+ insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+}
+
# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
found_aux_dir=no
grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
@@ -275,7 +322,7 @@ if test ! -d $build_aux; then
mkdir $build_aux
for dot_ig in x $vc_ignore; do
test $dot_ig = x && continue
- insert_sorted_if_absent $dot_ig $build_aux
+ insert_vc_ignore $dot_ig $build_aux
done
fi
@@ -325,17 +372,18 @@ get_version() {
$app --version >/dev/null 2>&1 || return 1
$app --version 2>&1 |
- sed -n '# extract version within line
- s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
- t done
+ sed -n '# Move version to start of line.
+ s/.*[v ]\([0-9]\)/\1/
+
+ # Skip lines that do not start with version.
+ /^[0-9]/!d
- # extract version at start of line
- s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
- t done
+ # Remove characters after the version.
+ s/[^.a-z0-9-].*//
- d
+ # The first component must be digits only.
+ s/^\([0-9]*\)[a-z-].*/\1/
- :done
#the following essentially does s/5.005/5.5/
s/\.0*\([1-9]\)/.\1/g
p
@@ -346,18 +394,26 @@ check_versions() {
ret=0
while read app req_ver; do
+ # We only need libtoolize from the libtool package.
+ if test "$app" = libtool; then
+ app=libtoolize
+ fi
+ # Exempt git if --no-git is in effect.
+ if test "$app" = git; then
+ $use_git || continue
+ fi
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
- appvar=`echo $app | tr '[a-z]' '[A-Z]'`
+ appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
test "$appvar" = TAR && appvar=AMTAR
eval "app=\${$appvar-$app}"
inst_ver=$(get_version $app)
if [ ! "$inst_ver" ]; then
- echo "Error: '$app' not found" >&2
+ echo "$me: Error: '$app' not found" >&2
ret=1
elif [ ! "$req_ver" = "-" ]; then
latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
if [ ! "$latest_ver" = "$inst_ver" ]; then
- echo "Error: '$app' version == $inst_ver is too old" >&2
+ echo "$me: Error: '$app' version == $inst_ver is too old" >&2
echo " '$app' version >= $req_ver is required" >&2
ret=1
fi
@@ -370,16 +426,30 @@ check_versions() {
print_versions() {
echo "Program Min_version"
echo "----------------------"
- printf "$buildreq"
+ printf %s "$buildreq"
echo "----------------------"
# can't depend on column -t
}
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+ && use_libtool=1
+grep '^[ ]*LT_INIT' configure.ac >/dev/null \
+ && use_libtool=1
+if test $use_libtool = 1; then
+ find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
if ! printf "$buildreq" | check_versions; then
- test -f README-prereq &&
- echo "See README-prereq for notes on obtaining these prerequisite programs:"
>&2
- echo
- print_versions
+ echo >&2
+ if test -f README-prereq; then
+ echo "$0: See README-prereq for how to get the prerequisite programs" >&2
+ else
+ echo "$0: Please install the prerequisite programs" >&2
+ fi
exit 1
fi
@@ -390,11 +460,11 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null
; then
if git config merge.merge-changelog.driver >/dev/null ; then
:
elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
- echo "initializing git-merge-changelog driver"
+ echo "$0: initializing git-merge-changelog driver"
git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
else
- echo "consider installing git-merge-changelog from gnulib"
+ echo "$0: consider installing git-merge-changelog from gnulib"
fi
fi
@@ -410,7 +480,7 @@ git_modules_config () {
}
gnulib_path=`git_modules_config submodule.gnulib.path`
-test -n "$gnulib_path" || gnulib_path="gnulib"
+test -z "$gnulib_path" && gnulib_path=gnulib
# Get gnulib files.
@@ -426,8 +496,8 @@ case ${GNULIB_SRCDIR--} in
trap cleanup_gnulib 1 2 13 15
- git clone 2>&1 -h|grep -- --depth > /dev/null \
- && shallow='--depth 2'|| shallow=
+ shallow=
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
cleanup_gnulib
@@ -463,6 +533,16 @@ case ${GNULIB_SRCDIR--} in
;;
esac
+if $bootstrap_sync; then
+ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+ echo "$0: updating bootstrap and restarting..."
+ exec sh -c \
+ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+ -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ "$0" "$@" --no-bootstrap-sync
+ }
+fi
+
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
<$gnulib_tool || exit
@@ -471,20 +551,22 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
download_po_files() {
subdir=$1
domain=$2
- echo "$0: getting translations into $subdir for $domain..."
+ echo "$me: getting translations into $subdir for $domain..."
cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
eval "$cmd"
}
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
# or modified ones into $po_dir. Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
update_po_files() {
# Directory containing primary .po files.
# Overwrite them only when we're sure a .po file is new.
po_dir=$1
domain=$2
- # Download *.po files into this dir.
+ # Mirror *.po files into this dir.
# Usually contains *.s1 checksum files.
ref_po_dir="$po_dir/.reference"
@@ -503,7 +585,7 @@ update_po_files() {
! test -f "$po_dir/$po.po" ||
! $SHA1SUM -c --status "$cksum_file" \
< "$new_po" > /dev/null; then
- echo "updated $po_dir/$po.po..."
+ echo "$me: updated $po_dir/$po.po..."
cp "$new_po" "$po_dir/$po.po" \
&& $SHA1SUM < "$new_po" > "$cksum_file"
fi
@@ -541,20 +623,20 @@ symlink_to_dir()
for dot_ig in x $vc_ignore; do
test $dot_ig = x && continue
ig=$parent/$dot_ig
- insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+ insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
done
fi
if $copy; then
{
test ! -h "$dst" || {
- echo "$0: rm -f $dst" &&
+ echo "$me: rm -f $dst" &&
rm -f "$dst"
}
} &&
test -f "$dst" &&
cmp -s "$src" "$dst" || {
- echo "$0: cp -fp $src $dst" &&
+ echo "$me: cp -fp $src $dst" &&
cp -fp "$src" "$dst"
}
else
@@ -568,7 +650,7 @@ symlink_to_dir()
*)
case /$dst/ in
*//* | */../* | */./* | /*/*/*/*/*/)
- echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+ echo >&2 "$me: invalid symlink calculation: $src -> $dst"
exit 1;;
/*/*/*/*/) dot_dots=../../../;;
/*/*/*/) dot_dots=../../;;
@@ -576,7 +658,7 @@ symlink_to_dir()
esac;;
esac
- echo "$0: ln -fs $dot_dots$src $dst" &&
+ echo "$me: ln -fs $dot_dots$src $dst" &&
ln -fs "$dot_dots$src" "$dst"
}
fi
@@ -609,7 +691,7 @@ cp_mark_as_generated()
cmp -s "$cp_src" "$cp_dst" || {
# Copy the file first to get proper permissions if it
# doesn't already exist. Then overwrite the copy.
- echo "$0: cp -f $cp_src $cp_dst" &&
+ echo "$me: cp -f $cp_src $cp_dst" &&
rm -f "$cp_dst" &&
cp "$cp_src" "$cp_dst-t" &&
sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
@@ -627,7 +709,7 @@ cp_mark_as_generated()
if cmp -s "$cp_dst-t" "$cp_dst"; then
rm -f "$cp_dst-t"
else
- echo "$0: cp $cp_src $cp_dst # with edits" &&
+ echo "$me: cp $cp_src $cp_dst # with edits" &&
mv -f "$cp_dst-t" "$cp_dst"
fi
fi
@@ -646,7 +728,7 @@ version_controlled_file() {
elif test -d .svn; then
svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
else
- echo "$0: no version control for $dir/$file?" >&2
+ echo "$me: no version control for $dir/$file?" >&2
fi
test $found = yes
}
@@ -658,7 +740,8 @@ slurp() {
for file in `ls -a $1/$dir`; do
case $file in
.|..) continue;;
- .*) continue;; # FIXME: should all file names starting with "." be
ignored?
+ # FIXME: should all file names starting with "." be ignored?
+ .*) continue;;
esac
test -d $1/$dir/$file && continue
for excluded_file in $excluded_files; do
@@ -667,18 +750,20 @@ slurp() {
if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
copied=$copied${sep}$gnulib_mk; sep=$nl
remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
- sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null
|| {
- echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+ sed "$remove_intl" $1/$dir/$file |
+ cmp - $dir/$gnulib_mk > /dev/null || {
+ echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
rm -f $dir/$gnulib_mk &&
- sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+ sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
+ gnulib_mk_hook $dir/$gnulib_mk
}
elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
version_controlled_file $dir $file; then
- echo "$0: $dir/$file overrides $1/$dir/$file"
+ echo "$me: $dir/$file overrides $1/$dir/$file"
else
copied=$copied$sep$file; sep=$nl
if test $file = gettext.m4; then
- echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
+ echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
rm -f $dir/$file
sed '
/^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
@@ -698,18 +783,25 @@ slurp() {
test $dot_ig = x && continue
ig=$dir/$dot_ig
if test -n "$copied"; then
- insert_sorted_if_absent $ig "$copied"
+ insert_vc_ignore $ig "$copied"
# If an ignored file name ends with .in.h, then also add
# the name with just ".h". Many gnulib headers are generated,
# e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
# Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
- f=`echo "$copied"|sed
's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
- insert_sorted_if_absent $ig "$f"
+ f=`echo "$copied" |
+ sed '
+ s/\.in\.h$/.h/
+ s/\.sin$/.sed/
+ s/\.y$/.c/
+ s/\.gperf$/.h/
+ '
+ `
+ insert_vc_ignore $ig "$f"
# For files like sys_stat.in.h and sys_time.in.h, record as
# ignorable the directory we might eventually create: sys/.
f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
- insert_sorted_if_absent $ig "$f"
+ insert_vc_ignore $ig "$f"
fi
done
done
@@ -734,6 +826,12 @@ gnulib_tool_options="\
--local-dir $local_gl_dir\
$gnulib_tool_option_extras\
"
+if test $use_libtool = 1; then
+ case "$gnulib_tool_options " in
+ *' --libtool '*) ;;
+ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+ esac
+fi
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
slurp $bt || exit
@@ -776,26 +874,18 @@ grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac
>/dev/null ||
for command in \
libtool \
- "${ACLOCAL-aclocal} --force -I m4" \
+ "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \
"${AUTOCONF-autoconf} --force" \
"${AUTOHEADER-autoheader} --force" \
"${AUTOMAKE-automake} --add-missing --copy --force-missing"
do
if test "$command" = libtool; then
- use_libtool=0
- # We'd like to use grep -E, to see if any of LT_INIT,
- # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
- # but that's not portable enough (e.g., for Solaris).
- grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
- && use_libtool=1
- grep '^[ ]*LT_INIT' configure.ac >/dev/null \
- && use_libtool=1
test $use_libtool = 0 \
&& continue
command="${LIBTOOLIZE-libtoolize} -c -f"
fi
echo "$0: $command ..."
- $command || exit
+ eval "$command" || exit
done
-----------------------------------------------------------------------
Summary of changes:
myserver/bootstrap | 228 +++++++++++++++++++---------
myserver/include/base/string/stringutils.h | 4 -
myserver/src/base/string/stringutils.cpp | 201 ++----------------------
myserver/src/myserver.cpp | 1 -
myserver/tests/test_stringutils.cpp | 8 +-
5 files changed, 179 insertions(+), 263 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-438-gd43d993,
Giuseppe Scrivano <=