Update version output

pull/2/head
Stelios Bounanos 2009-04-17 19:17:56 +01:00
rodzic 77bc96640b
commit 9e060b8681
16 zmienionych plików z 911 dodań i 382 usunięć

Wyświetl plik

@ -22,6 +22,8 @@ AC_DEFINE([FLDIGI_VERSION_MAJOR], [FLDIGI_MAJOR], [Major version number])
AC_DEFINE([FLDIGI_VERSION_MINOR], [FLDIGI_MINOR], [Minor version number])
AC_DEFINE([FLDIGI_VERSION_PATCH], ["FLDIGI_PATCH"], [Patch/alpha version string])
AC_SUBST([AC_CONFIG_ARGS], [$ac_configure_args])
AC_CONFIG_AUX_DIR([build-aux])
# define build, build_cpu, build_vendor, build_os
@ -237,6 +239,10 @@ AC_FLDIGI_INTL
# set HAVE_ASCIIDOC Makefile conditional
AC_FLDIGI_DOCS
### build info
# Define various build variables in config.h
AC_FLDIGI_BUILD_INFO
### output
AH_TOP([

Wyświetl plik

@ -78,6 +78,9 @@ support.
*--version*::
Print version information and exit.
*--build-info*::
Print build information and exit.
*--help*::
Print options summary and exit.

62
m4/build.m4 100644
Wyświetl plik

@ -0,0 +1,62 @@
AC_DEFUN([AC_FLDIGI_SH_DQ], [
ac_sh_dq="\"`$1 | sed 's/"/\\\\"/g'`\""
])
AC_DEFUN([AC_FLDIGI_BUILD_INFO], [
# define build flags and substitute in Makefile.in
BUILD_CPPFLAGS="$BUILD_CPPFLAGS -I$srcdir -I$srcdir/include -I$srcdir/irrxml \
-I$srcdir/fileselector $BOOST_CPPFLAGS"
AC_SUBST([BUILD_CPPFLAGS])
BUILD_CXXFLAGS="$PORTAUDIO_CFLAGS $FLTK_CFLAGS $SNDFILE_CFLAGS $SAMPLERATE_CFLAGS \
$PULSEAUDIO_CFLAGS $HAMLIB_CFLAGS $IMAGE_CFLAGS $XMLRPC_CFLAGS $MAC_UNIVERSAL_CFLAGS \
$INTL_CFLAGS $PTW32_CFLAGS $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEBUG_CFLAGS"
BUILD_LDFLAGS="$MAC_UNIVERSAL_LDFLAGS"
if test "x$ac_cv_debug" != "x"; then
BUILD_CXXFLAGS="$BUILD_CXXFLAGS -UNDEBUG"
BUILD_LDFLAGS="$BUILD_LDFLAGS $RDYNAMIC"
else
BUILD_CXXFLAGS="$BUILD_CXXFLAGS -DNDEBUG"
fi
AC_SUBST([BUILD_CXXFLAGS])
AC_SUBST([BUILD_LDFLAGS])
BUILD_LDADD="$PORTAUDIO_LIBS $BOOST_LDFLAGS $FLTK_LIBS $SNDFILE_LIBS $SAMPLERATE_LIBS \
$PULSEAUDIO_LIBS $HAMLIB_LIBS $IMAGE_LIBS $XMLRPC_LIBS $INTL_LIBS $PTW32_LIBS $BFD_LIBS $EXTRA_LIBS"
AC_SUBST([BUILD_LDADD])
#define build variables for config.h
AC_DEFINE_UNQUOTED([BUILD_BUILD_PLATFORM], ["$build"], [Build platform])
AC_DEFINE_UNQUOTED([BUILD_HOST_PLATFORM], ["$host"], [Host platform])
AC_DEFINE_UNQUOTED([BUILD_TARGET_PLATFORM], ["$target"], [Target platform])
test "x$LC_ALL" != "x" && LC_ALL_saved="$LC_ALL"
LC_ALL=C
export LC_ALL
AC_FLDIGI_SH_DQ([echo $ac_configure_args])
AC_DEFINE_UNQUOTED([BUILD_CONFIGURE_ARGS], [$ac_sh_dq], [Configure arguments])
AC_FLDIGI_SH_DQ([date])
AC_DEFINE_UNQUOTED([BUILD_DATE], [$ac_sh_dq], [Build date])
AC_FLDIGI_SH_DQ([whoami])
AC_DEFINE_UNQUOTED([BUILD_USER], [$ac_sh_dq], [Build user])
AC_FLDIGI_SH_DQ([hostname])
AC_DEFINE_UNQUOTED([BUILD_HOST], [$ac_sh_dq], [Build host])
AC_FLDIGI_SH_DQ([$CXX -v 2>&1 | tail -1])
AC_DEFINE_UNQUOTED([BUILD_COMPILER], [$ac_sh_dq], [Compiler])
AC_FLDIGI_SH_DQ([echo $BUILD_CPPFLAGS $BUILD_CXXFLAGS])
AC_DEFINE_UNQUOTED([BUILD_CXXFLAGS], [$ac_sh_dq], [Compiler flags])
AC_FLDIGI_SH_DQ([echo $BUILD_LDFLAGS $BUILD_LDADD])
AC_DEFINE_UNQUOTED([BUILD_LDFLAGS], [$ac_sh_dq], [Linker flags])
if test "x$LC_ALL_saved" != "x"; then
LC_ALL="$LC_ALL_saved"
export LC_ALL
fi
])

Wyświetl plik

@ -74,7 +74,7 @@ AC_DEFUN([AC_FLDIGI_DEBUG], [
gflag="-g"
fi
AC_MSG_RESULT([$gflag])
DEBUG_CFLAGS="-O0 $gflag -Wall"
DEBUG_CFLAGS="-O0 -fno-inline-functions -fno-omit-frame-pointer $gflag -Wall"
AC_FLDIGI_RDYNAMIC
if test "x$ac_cv_rdynamic" = "xyes"; then

Wyświetl plik

@ -42,6 +42,7 @@ AC_DEFUN([AC_FLDIGI_FLTK], [
fi
AC_SUBST([FLTK_CFLAGS])
AC_SUBST([FLTK_LIBS])
AC_DEFINE_UNQUOTED([FLTK_BUILD_VERSION], ["`$FLTK_CONFIG --version`"], [FLTK version])
AC_ARG_VAR([FLUID], [Fast Light User-Interface Designer])
AC_CHECK_PROG([FLUID], [fluid], [fluid])

Wyświetl plik

@ -37,6 +37,7 @@ fi
AC_SUBST(PKG_NAME_UC[_CFLAGS])
AC_SUBST(PKG_NAME_UC[_LIBS])
AC_DEFINE_UNQUOTED(PKG_NAME_UC[_BUILD_VERSION], ["$pkg_[]$1_version"], [$1 version])
m4_ifval([$6], [ AM_CONDITIONAL([$6], [test "x$ac_cv_[]$1" = "xyes"]) ], [:])
])

Wyświetl plik

@ -52,5 +52,6 @@ AC_DEFUN([AC_FLDIGI_XMLRPC], [
fi
fi
AC_DEFINE_UNQUOTED([XMLRPC_BUILD_VERSION], ["`$XMLRPC_C_CONFIG --version`"], [XMLRPC-C version])
AM_CONDITIONAL([ENABLE_XMLRPC], [test "x$ac_cv_xmlrpc" = "xyes"])
])

Wyświetl plik

@ -1,22 +0,0 @@
#!/bin/sh
[ $# -eq 2 ] || exit 1
in="$1"
out="$2"
export LC_ALL=C
COMMENT="This file is generated at compile time. Do not include in source tarballs."
COMPILE_CFG="FIXME"
COMPILE_DATE=`date`
COMPILE_USER=`whoami`
COMPILE_HOST=`hostname`
COMPILER=`$CXX -v 2>&1 | tail -n 1 | tr -d \'\"`
CFLAGS=`echo "$AM_CPPFLAGS $AM_CXXFLAGS $CXXFLAGS" | sed -e 's!"!\\\\"!g'`
LDFLAGS="$LDADD"
sed -e "s!%%COMMENT%%!${COMMENT}!g; s!%%COMPILE_CFG%%!${COMPILE_CFG}!g;\
s!%%COMPILE_DATE%%!${COMPILE_DATE}!g; s!%%COMPILE_USER%%!${COMPILE_USER}!g; \
s!%%COMPILE_HOST%%!${COMPILE_HOST}!g; s!%%COMPILER%%!${COMPILER}!g; \
s!%%CFLAGS%%!${CFLAGS}!g; s!%%LDFLAGS%%!${LDFLAGS}!g; s!%%HAVE_VERSIONS_H%%!1!g" < "$in" > "$out"

Wyświetl plik

@ -3,34 +3,12 @@
bin_PROGRAMS = fldigi
AM_CPPFLAGS =
if USE_NLS
AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
endif
AM_CPPFLAGS += -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/irrxml \
-I$(srcdir)/fileselector @BOOST_CPPFLAGS@
AM_CXXFLAGS = @PORTAUDIO_CFLAGS@ @FLTK_CFLAGS@ @SNDFILE_CFLAGS@ \
@SAMPLERATE_CFLAGS@ @PULSEAUDIO_CFLAGS@ @HAMLIB_CFLAGS@ \
@IMAGE_CFLAGS@ @XMLRPC_CFLAGS@ @MAC_UNIVERSAL_CFLAGS@ \
@INTL_CFLAGS@ @PTW32_CFLAGS@ @BFD_CFLAGS@ \
-pipe -Wall -fexceptions @OPT_CFLAGS@ @DEBUG_CFLAGS@
# The BUILD_* variables are defined in build.m4
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @BUILD_CPPFLAGS@
AM_CXXFLAGS = @BUILD_CXXFLAGS@
AM_CFLAGS = $(AM_CXXFLAGS)
AM_LDFLAGS = @MAC_UNIVERSAL_LDFLAGS@
LDADD = @PORTAUDIO_LIBS@ @BOOST_LDFLAGS@ @FLTK_LIBS@ @SNDFILE_LIBS@ \
@SAMPLERATE_LIBS@ @PULSEAUDIO_LIBS@ @HAMLIB_LIBS@ @IMAGE_LIBS@ \
@XMLRPC_LIBS@ @INTL_LIBS@ @PTW32_LIBS@ @BFD_LIBS@ @EXTRA_LIBS@
if ENABLE_DEBUG
AM_CPPFLAGS += -UNDEBUG
AM_LDFLAGS += @RDYNAMIC@
else
AM_CPPFLAGS += -DNDEBUG
endif
AM_LDFLAGS = @BUILD_LDFLAGS@
LDADD = @BUILD_LDADD@
HAMLIB_SRC = include/hamlib.h rigcontrol/hamlib.cxx include/rigclass.h rigcontrol/rigclass.cxx
XMLRPC_SRC = include/xmlrpc.h misc/xmlrpc.cxx
@ -81,13 +59,10 @@ FLDIGI_VERSION_MAJOR = @FLDIGI_VERSION_MAJOR@
FLDIGI_VERSION_MINOR = @FLDIGI_VERSION_MINOR@
FLDIGI_VERSION_PATCH = @FLDIGI_VERSION_PATCH@
.EXPORT_ALL_VARIABLES: versions.h appbundle hamlib-static
versions.h: $(srcdir)/include/versions.h.in
sh $(srcdir)/../scripts/mkversions.sh $^ $@ || echo > $@
.EXPORT_ALL_VARIABLES: appbundle hamlib-static
# Sources that are generated,
BUILT_SOURCES = versions.h
BUILT_SOURCES =
# not distributed,
nodist_fldigi_SOURCES = $(BUILT_SOURCES)
# and deleted by the clean targets
@ -298,7 +273,6 @@ fldigi_SOURCES += \
include/timeops.h \
include/trx.h \
include/util.h \
include/versions.h.in \
include/Viewer.h \
include/viterbi.h \
include/waterfall.h \
@ -443,7 +417,6 @@ EXTRA_fldigi_SOURCES += \
# Additional non-source files that we distribute
EXTRA_DIST = \
$(srcdir)/../scripts/mkversions.sh \
$(srcdir)/../scripts/mkappbundle.sh \
$(srcdir)/../scripts/mkhamlibstatic.sh \
$(srcdir)/../scripts/fldigi-shell \

Wyświetl plik

@ -1095,6 +1095,7 @@ void cb_mnuAboutURL(Fl_Widget*, void*)
if (!help_dialog)
help_dialog = new Fl_Help_Dialog;
help_dialog->value(szAbout);
help_dialog->resize(help_dialog->x(), help_dialog->y(), help_dialog->w(), 440);
help_dialog->show();
restoreFocus();
}
@ -1140,8 +1141,8 @@ void cb_mnuCmdLineHelp(Fl_Widget*, void*)
void cb_mnuBuildInfo(Fl_Widget*, void*)
{
extern string version_text;
fldigi_help(version_text);
extern string build_text;
fldigi_help(build_text);
restoreFocus();
}

Plik diff jest za duży Load Diff

Wyświetl plik

@ -51,6 +51,8 @@ const char* szAbout =
&nbsp; &nbsp; &nbsp;Murray Greenman, ZL1BPU<br>\n\
<br>\n\
<P>\n\
Copyright \251 2008, 2009 Dave Freese, Stelios Bounanos, Leigh Klotz, and others.\n\
<P>\n\
Distributed under the GNU General Public License version 2 or later.<br>\n\
This is free software: you are free to change and redistribute it.<br>\n\
There is NO WARRANTY, to the extent permitted by law.\n\

Wyświetl plik

@ -40,6 +40,7 @@
#if USE_PULSEAUDIO
#include <pulse/simple.h>
#include <pulse/error.h>
extern "C" { const char* pa_get_library_version(void); };
#endif
#include <samplerate.h>
#include <semaphore.h>

Wyświetl plik

@ -1,17 +0,0 @@
// %%COMMENT%%
#ifndef VERSIONS_H
#define VERSIONS_H
#define HAVE_VERSIONS_H %%HAVE_VERSIONS_H%%
#define COMPILE_CFG "%%COMPILE_CFG%%"
#define COMPILE_DATE "%%COMPILE_DATE%%"
#define COMPILE_USER "%%COMPILE_USER%%"
#define COMPILE_HOST "%%COMPILE_HOST%%"
#define COMPILER "%%COMPILER%%"
#define CFLAGS "%%CFLAGS%%"
#define LDFLAGS "%%LDFLAGS%%"
#endif // VERSIONS_H

Wyświetl plik

@ -146,7 +146,7 @@ int rxmsgid = -1;
TXMSGSTRUC txmsgst;
int txmsgid = -1;
string option_help, version_text;
string option_help, version_text, build_text;
qrunner *cbq[NUM_QRUNNER_THREADS];
@ -451,6 +451,9 @@ void generate_option_help(void) {
<< " --version\n"
<< " Print version information\n\n"
<< " --build-info\n"
<< " Print build information\n\n"
<< " --help\n"
<< " Print this option help\n\n";
@ -536,7 +539,7 @@ int parse_args(int argc, char **argv, int& idx)
#endif
OPT_DEBUG_LEVEL,
OPT_EXIT_AFTER,
OPT_DEPRECATED, OPT_HELP, OPT_VERSION };
OPT_DEPRECATED, OPT_HELP, OPT_VERSION, OPT_BUILD_INFO };
const char shortopts[] = "+";
static struct option longopts[] = {
@ -588,6 +591,7 @@ int parse_args(int argc, char **argv, int& idx)
{ "help", 0, 0, OPT_HELP },
{ "version", 0, 0, OPT_VERSION },
{ "build-info", 0, 0, OPT_BUILD_INFO },
{ 0 }
};
@ -760,6 +764,10 @@ int parse_args(int argc, char **argv, int& idx)
cout << version_text;
exit(EXIT_SUCCESS);
case OPT_BUILD_INFO:
cout << build_text;
exit(EXIT_SUCCESS);
case '?': default:
cerr << "Try `" << PACKAGE_NAME << " --help' for more information.\n";
exit(EXIT_FAILURE);
@ -781,52 +789,64 @@ int parse_args(int argc, char **argv, int& idx)
void generate_version_text(void)
{
ostringstream s;
s << PACKAGE_STRING << '\n'
<< "Copyright (c) 2008 " PACKAGE_AUTHORS "\n" <<
_("License GPLv2+: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n");
version_text.assign(PACKAGE_STRING "\nCopyright (C) 2008, 2009 " PACKAGE_AUTHORS ".\n");
version_text.append(_("License GPLv2+: GNU GPL version 2 or later "
"<http://www.gnu.org/licenses/gpl-2.0.html>\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"));
s << _("\nSystem: ");
ostringstream s;
s << "Build information:\n";
s << " built : " << BUILD_DATE << " by " << BUILD_USER
<< '@' << BUILD_HOST << " on " << BUILD_BUILD_PLATFORM
<< " for " << BUILD_TARGET_PLATFORM << "\n\n"
<< " configure flags: " << BUILD_CONFIGURE_ARGS << "\n\n"
<< " compiler : " << BUILD_COMPILER << "\n\n"
<< " compiler flags : " << BUILD_CXXFLAGS << "\n\n"
<< " linker flags : " << BUILD_LDFLAGS << "\n\n"
<< " libraries : " "FLTK " FLTK_BUILD_VERSION "\n"
<< " " "libsamplerate " << SAMPLERATE_BUILD_VERSION "\n";
#if USE_SNDFILE
s << " " "libsndfile " << SNDFILE_BUILD_VERSION "\n";
#endif
#if USE_PORTAUDIO
s << " " "PortAudio " << PORTAUDIO_BUILD_VERSION "\n";
#endif
#if USE_PULSEAUDIO
s << " " "PulseAudio " << PULSEAUDIO_BUILD_VERSION "\n";
#endif
#if USE_HAMLIB
s << " " "Hamlib " << HAMLIB_BUILD_VERSION "\n";
#endif
#if USE_XMLRPC
s << " " "XMLRPC-C " << XMLRPC_BUILD_VERSION "\n\n";
#endif
s << "\nRuntime information:\n";
struct utsname u;
if (uname(&u) != -1) {
s << u.sysname << ' ' << u.nodename
<< ' ' << u.release << ' ' << u.version << ' '
<< u.machine << '\n';
s << " system : " << u.sysname << ' ' << u.nodename
<< ' ' << u.release << ' ' << u.version << ' ' << u.machine << "\n\n";
}
#include "versions.h"
#ifdef HAVE_VERSIONS_H
s /*<< "\nConfigured with: " << COMPILE_CFG*/ << '\n'
<< "Built on " << COMPILE_DATE << " by " << COMPILE_USER
<< '@' << COMPILE_HOST << " with:\n"
<< COMPILER << '\n'
<< "CFLAGS=" << CFLAGS << '\n'
<< "LDFLAGS=" << LDFLAGS << '\n';
#endif // HAVE_VERSIONS_H
s << "Libraries:\n"
<< "FLTK " << FL_MAJOR_VERSION << '.' << FL_MINOR_VERSION << '.'
<< FL_PATCH_VERSION << '\n';
s << src_get_version() << '\n';
#if USE_HAMLIB
s << hamlib_version << '\n';
#endif
#if USE_PORTAUDIO
s << Pa_GetVersionText() << ' ' << Pa_GetVersion() << '\n';
#endif
s << " libraries : " << src_get_version() << '\n';
#if USE_SNDFILE
char sndfile_version[32];
sf_command(NULL, SFC_GET_LIB_VERSION, sndfile_version, sizeof(sndfile_version));
s << sndfile_version << '\n';
s << " " << sndfile_version << '\n';
#endif
#if USE_PORTAUDIO
s << " " << Pa_GetVersionText() << ' ' << Pa_GetVersion() << '\n';
#endif
#if USE_PULSEAUDIO
s << " " << "Pulseaudio " << pa_get_library_version() << '\n';
#endif
#if USE_HAMLIB
s << " " << hamlib_version << '\n';
#endif
version_text = s.str();
build_text = s.str();
}
// When debugging is enabled, reexec with malloc debugging hooks enabled, unless

Wyświetl plik

@ -13,7 +13,6 @@
#include "status.h"
#include "configuration.h"
#include "fl_digi.h"
#include "versions.h"
#include "waterfall.h"