diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/UpdateGUI.cpp | 4 | ||||
| -rw-r--r-- | src/UpdateTool.cpp | 49 |
3 files changed, 65 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b70b65b..da699ae 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,10 @@ else HOST_SUFFIX= fi +if command -v git >/dev/null; then + ut_githash="$(command git rev-parse HEAD)" +fi + AM_SILENT_RULES([yes]) AM_INIT_AUTOMAKE AC_PROG_CXX @@ -144,6 +148,14 @@ AC_SUBST([UT_LIBS], [${ut_libs}]) AC_SUBST([WX_CFLAGS], [${wx_cflags}]) AC_SUBST([WX_LIBS], [${wx_libs}]) AC_SUBST([WINDRES], [${windres}]) +AC_DEFINE_UNQUOTED([UT_GITHASH], ["${ut_githash:-unknown}"],[UpdateTool GIT SHA-1 hash]) +AC_DEFINE_UNQUOTED([UT_BUILDGUI],["${ut_buildgui:-disabled}"],[UpdateTool build with GUI]) +AC_DEFINE_UNQUOTED([UT_BUILDWIN],["${ut_use_msw:-disabled}"],[UpdateTool build for Windows]) +AC_DEFINE_UNQUOTED([UT_CFLAGS], ["${ut_cflags}"],[UpdateTool CFLAGS as string]) +AC_DEFINE_UNQUOTED([UT_LIBS], ["${ut_libs}"], [UpdateTool LIBS as string]) +AC_DEFINE_UNQUOTED([WX_CFLAGS], ["${wx_cflags}"],[UpdateTool wxWidgets CFLAGS as string]) +AC_DEFINE_UNQUOTED([WX_LIBS], ["${wx_libs}"], [UpdateTool wxWidgets LIBS as string]) +AC_DEFINE_UNQUOTED([WX_VERSION], ["${wx_version:-unknown}"],[UpdateTool wxWidgets version]) dnl output config headers AC_CONFIG_HEADERS([src/config.h:src/config.h.in]) diff --git a/src/UpdateGUI.cpp b/src/UpdateGUI.cpp index e153d16..3379afe 100644 --- a/src/UpdateGUI.cpp +++ b/src/UpdateGUI.cpp @@ -42,9 +42,13 @@ wxBEGIN_EVENT_TABLE(UpdateGUILicense, wxFrame) EVT_BUTTON(wxID_DECLINE, UpdateGUILicense::OnDecline) wxEND_EVENT_TABLE() +extern void print_build_details(void); + bool UpdateGUI::OnInit() { + print_build_details(); + if (isLicenseAlreadyAccepted()) { UpdateGUIFrame *frame = new UpdateGUIFrame("UpdateTool", wxPoint(50, 50), wxSize(450, 340)); diff --git a/src/UpdateTool.cpp b/src/UpdateTool.cpp index 1f5ccda..1919801 100644 --- a/src/UpdateTool.cpp +++ b/src/UpdateTool.cpp @@ -1,8 +1,51 @@ #include <cstdio> #include <iostream> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "UpdateFactory.hpp" + +extern void print_build_details(void) +{ + std::cout << "[BUILD_DETAILS]" << std::endl + +#ifdef UT_GITHASH + << "git-hash..: " << UT_GITHASH << std::endl +#endif + +#ifdef UT_BUILDGUI + << "with-gui..: " << UT_BUILDGUI << std::endl +#endif + +#ifdef UT_BUILDWIN + << "windows...: " << UT_BUILDWIN << std::endl +#endif + +#ifdef UT_CFLAGS + << "ut-cflags.: " << UT_CFLAGS << std::endl +#endif + +#ifdef UT_LIBS + << "ut-libs...: " << UT_LIBS << std::endl +#endif + +#ifdef WX_CFLAGS + << "wx-cflags.: " << WX_CFLAGS << std::endl +#endif + +#ifdef WX_LIBS + << "wx-libs...: " << WX_LIBS << std::endl +#endif + +#ifdef WX_VERSION + << "wx-version: " << WX_VERSION << std::endl +#endif + + << std::endl; +} + #ifdef USE_GUI #include "UpdateGUI.hpp" @@ -16,6 +59,8 @@ int wmain(int argc, wchar_t* argv[]) int main(int argc, char* argv[]) #endif { + print_build_details(); + wxEntryStart(argc, argv); wxTheApp->CallOnInit(); wxTheApp->OnRun(); @@ -33,6 +78,8 @@ int main(int argc, char *argv[]) std::vector<UpdateFactory*> uf; std::string errstr, hostPorts; + print_build_details(); + if (argc == 0) return 1; if (argc == 3) { @@ -109,6 +156,8 @@ int wmain(int argc, wchar_t* wargv[]) size_t len; static char **argv = new char*[argc]; + print_build_details(); + /* convert wide character argvector to ASCII, dirty .. */ for (int i = 0; i < argc; ++i) { len = wcslen(wargv[i]) * sizeof(wchar_t); |