Skip to content

Commit

Permalink
Print version of libraries and features
Browse files Browse the repository at this point in the history
When reporting the version of Dillo with -v, print also the version of
the libraries it is currently using, as well as the features that were
enabled at build time. Notice the versions are reported by reading them
at runtime, so we can detect the version loaded at run time, regardless
of which version was used at link time.

All features are always printed, but prefixes with + if enabled or - if
disabled. This allows checking if the feature was disabled at configure
time or if it is missing in that version of Dillo.
  • Loading branch information
rodarima committed Nov 24, 2024
1 parent 1baacd4 commit 53fb37a
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dillo-3.2.0 [Not released yet]
- Fix GET requests over HTTPS via a proxy.
- Improve image resize logic to always try to preserve the aspect ratio.
- Reload current page on SIGUSR1 signal
- Print library versions and enabled features with dillo -v.
Patches: Rodrigo Arias Mallo
+- Add primitive support for SVG using the nanosvg.h library.
- Add support for ch, rem, vw, vh, vmin and vmax CSS units.
Expand Down
2 changes: 2 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ dillo_LDADD = \

dillo_SOURCES = \
dillo.cc \
version.cc \
version.hh \
paths.cc \
paths.hh \
tipwin.cc \
Expand Down
3 changes: 2 additions & 1 deletion src/dillo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include "bw.h"
#include "misc.h"
#include "history.h"
#include "version.hh"

#include "dns.h"
#include "web.hh"
Expand Down Expand Up @@ -441,7 +442,7 @@ int main(int argc, char **argv)
}
break;
case DILLO_CLI_VERSION:
puts("Dillo version " VERSION);
a_Version_print_info();
return 0;
case DILLO_CLI_HELP:
printHelp(argv[0], Options);
Expand Down
106 changes: 106 additions & 0 deletions src/version.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
/*
* Dillo web browser
*
* Copyright 2024 Rodrigo Arias Mallo <[email protected]>
*
* 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
*/

#include "config.h"

#include "djpeg.h"
#include "dpng.h"
#include "IO/tls.h"

#include <FL/Fl.H>
#include <zlib.h>

#include <stdio.h>

static void print_libs()
{
char buf[256];

printf("Libraries:");

/* FLTK only offers a single number */
{
int fltkver = Fl::api_version();
int fltk_maj = fltkver / 10000;
int fltk_min = (fltkver / 100) % 100;
int fltk_pat = fltkver % 100;
printf(" fltk/%d.%d.%d", fltk_maj, fltk_min, fltk_pat);
}

printf(" zlib/%s", zlibVersion());

#ifdef ENABLE_JPEG
printf(" jpeg/%s", a_Jpeg_version());
#endif

#ifdef ENABLE_PNG
printf(" png/%s", a_Png_version());
#endif

#ifdef ENABLE_TLS
/* TLS prints the name/version format, as it determines which SSL
* library is in use */
printf(" %s", a_Tls_version(buf, 256));
#endif

printf("\n");
}

static void print_features()
{
printf("Features:"
#ifdef ENABLE_GIF
" +GIF"
#else
" -GIF"
#endif
#ifdef ENABLE_JPEG
" +JPEG"
#else
" -JPEG"
#endif
#ifdef ENABLE_PNG
" +PNG"
#else
" -PNG"
#endif
#ifdef ENABLE_SVG
" +SVG"
#else
" -SVG"
#endif
#if !( defined(DISABLE_XEMBED) || defined(WIN32) || defined(__APPLE__) )
" +XEMBED"
#else
" -XEMBED"
#endif
#ifdef ENABLE_TLS
" +TLS"
#else
" -TLS"
#endif
"\n");
}

void a_Version_print_info(void)
{
printf("Dillo version " VERSION "\n");
print_libs();
print_features();
}
25 changes: 25 additions & 0 deletions src/version.hh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Dillo web browser
*
* Copyright 2024 Rodrigo Arias Mallo <[email protected]>
*
* 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
*/

#ifndef VERSION_HH
#define VERSION_HH

void a_Version_print_info();

#endif /* VERSION_HH */

0 comments on commit 53fb37a

Please sign in to comment.