Bumped version to 0.9.36

Author: dov

INSTALL

@@ -0,0 +1,130 @@
+# Background
+
+Building giv isn't that easy, due to the large number of of dependencies, including some patches and some obsolete tools. Especially building it for windows is hard because of the cross compiling the dependencies.
+
+It is my goal to simplify this in the future, but currently the goal of this document is to describe how to build.
+
+The building steps below have been tested on Fedora, but they probably work with small modifications under any Linux system.
+
+# Prerequisites
+
+Both the linux and the cross compilation build require the following dependencies:
+
+- https://github.com/dov/gob2/tree/cpp-new - The `cpp-new` branch. 
+- vala - "Any" resent version will do
+- scons 
+
+# Linux
+
+The prefered building system is scons under Linux. automake is currently broken, and I started porting to meson, but I haven't finished it. 
+
+## Prerequisites for giv
+
+### libplis
+
+This is a small c++ string library that I have been using for various projects. To install do:
+
+```
+git clone http://github.com/dov/libplis
+cd libplis
+./autogen.sh --prefix=/usr/local; make -j 8 install
+```
+
+## Prerequisites for the plugins
+
+- cfitsio-devel
+- dcmtk
+- libwebp
+
+These are all available by dnf
+
+## Building giv
+
+Giv may be built:
+
+To build giv do in the top directory
+
+```
+scons -j 8 
+scons -j 8 install
+```
+
+# Windows
+
+The windows build and installer are cross compiled with mingw libraries under Linux. The following are the requirements for building giv under Fedora:
+
+```
+sudo dnf -y install mingw64-filesystem
+sudo dnf -y install mingw64-gcc
+sudo dnf -y install mingw64-gcc-c++
+sudo dnf -y install mingw32-nsis
+sudo dnf -y install mingw64-pcre
+sudo dnf -y install mingw64-gtk3
+sudo dnf -y install mingw64-libzip
+sudo dnf -y install mingw64-libwebp
+```
+
+The following libraries are not available as binary downloads and may be installed from source as follows described below:
+
+## Prerequisites
+
+### libplis
+
+```
+git clone http://github.com/dov/libplis
+# The following is needed to generate the "compile" file
+./autogen.sh --prefix=/usr/local 
+mingw64-configure --prefix=/usr/local/mingw64 --exec_prefix=/usr/local/mingw64 --libdir=/usr/local/mingw64/lib --includedir=/usr/local/mingw64/include
+make install
+```
+
+### dcmtk
+
+- TBD - (I got it to work by tweaking with the CMakeCache.txt file, but I don't have a reproducible method. Mail me for my CMakeCache.txt file if you want)
+
+
+###  cfitsio
+    - Using cmake toolchain
+```
+mkcd /space3/pub-repos/cfitsio-4.2.0/build_mingw64/
+cmake -DCMAKE_TOOLCHAIN_FILE=/home/dov/git/dov-env/cmake/mingw-w64-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr/local/mingw64 ..
+```
+   - This fails because of missing zlibrary
+   - Edit `CMakeCache.txt`
+   - Search for the missing library and change them, e.g.:
+```
+//Path to a file.
+ZLIB_INCLUDE_DIR:PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/include/
+
+//Path to a library.
+ZLIB_LIBRARY_DEBUG:FILEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/libz.a
+
+//Path to a library.
+ZLIB_LIBRARY_RELEASE:FILEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/libz.a
+```
+  - After this change, ~cmake~ may be run again and it worked
+
+### fmt
+    - Compilation:
+```
+unzip  ~/hd/Download/fmt-9.1.0.zip
+cd fmt-9.1.0
+mkdir build_mingw64
+cd build_mingw64
+cmake -DFMT_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=/home/dov/git/dov-env/cmake/mingw-w64-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr/local/mingw64 ..
+```
+
+### glm
+    - Currently the main branch is broken with regards to installation. The following pull request fixes it. Use this glm version:
+    - https://github.com/g-truc/glm/pull/1117
+    - Compilation
+
+```
+wget https://github.com/Tachi107/glm/archive/refs/heads/cmake-install-improvements.zip
+unzip cmake-install-improvements.zip
+cd glm-cmake-install-improvements
+mkdir build_mingw64
+cd build_mingw64
+cmake -DGLM_TEST_ENABLE=OFF -DCMAKE_TOOLCHAIN_FILE=/home/dov/git/dov-env/cmake/mingw-w64-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr/local/mingw64 ..
+make install
+```

INSTALL.md

@@ -1,3 +1,9 @@
+Version 0.9.35:
+
+* Fixed several windows problems with missing plugins etc
+* Giv now contains a -log flag for logging through spdlog. It is recommended to use for diagnostic all failures.
+* There is a rudamentary option to "keep" a measurement and to "clear kept measurements".
+
 Version 0.9.34: 
 
 * Giv now supports the display of Bezier Curves. See the examples/bezier.giv for an example of how to use it.

NEWS

@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
 PACKAGE=givwidget
 GIVWIDGET_API_VERSION=2.0
 
-AM_INIT_AUTOMAKE(giv, 0.9.35)
+AM_INIT_AUTOMAKE(giv, 0.9.36)
 
 dnl Use libtool to get shared libraries
 LT_PREREQ

configure.ac

@@ -53,6 +53,8 @@ File ${SYSROOT}\mingw\bin\libepoxy-0.dll
 File ${SYSROOT}\mingw\bin\libcairo*.dll
 File ${SYSROOT}\mingw\bin\libjasper*.dll
 File ${SYSROOT}\mingw\bin\zlib*.dll
+File ${SYSROOT}\mingw\bin\libzip*.dll
+File ${SYSROOT}\mingw\bin\libwebp*.dll
 File ${SYSROOT}\mingw\bin\libglib*.dll
 File ${SYSROOT}\mingw\bin\libatk*.dll
 File ${SYSROOT}\mingw\bin\libgobject*.dll
@@ -70,7 +72,9 @@ File ${SYSROOT}\mingw\bin\libwinpthread*.dll
 File ${SYSROOT}\mingw\bin\libssp-0.dll
 File ${SYSROOT}\mingw\bin\libfribidi-0.dll
 File ${SYSROOT}\mingw\bin\libharfbuzz-0.dll
+
 #File \usr\local\mingw32\bin\libjson-glib-1.0-0.dll
+File \usr\local\mingw64\bin\libcfitsio.dll
 File ${SYSROOT}\mingw\bin\gdk-pixbuf-query-loaders.exe
 
 # # Not sure that I need this. It doesn't seem to make any difference.

giv.nsi

@@ -36,7 +36,8 @@ def file2c(env, target, source):
     out.close()
     inp.close()
 
-src_giv_image = ['givimage.cc',
+src_giv_image = ['givimagedll.cc',
+                 'givimage.cc',
                  'givplugin.cc',
                  ]
 

src/SConscript

@@ -18,10 +18,6 @@ requires 2.0.0
 
 %{
 #ifdef _WIN32
-#if 0
-#include <windows.h>
-#include <cairo-win32.h>
-#endif
 #endif
 
 #include <gdk/gdkkeysyms.h>
@@ -3250,20 +3246,6 @@ cb_menu_about(GtkAction *action,
     gtk_widget_destroy (about_window);
 }
 
-static void
-cb_menu_manual(GtkAction *action,
-               gpointer data)
-{
-#ifdef WIN32
-    // Fix the path
-    ShellExecute(NULL, "open", "file:///c|/Progra~1/giv/doc/giv.html", NULL, NULL, SW_SHOWNORMAL);
-#else
-    // Linux
-    system(slipprintf("xdg-open %s/giv.html",
-                      PACKAGE_DOC_DIR));
-#endif
-}
-
 static void
 cb_menu_copyright(GtkAction *action,
                   gpointer data)
@@ -4642,5 +4624,23 @@ static void create_remote_commands(GivWin *self)
                                        self);
 }
 
+#ifdef _WIN32
+#include <shellapi.h>
+#endif
+
+static void
+cb_menu_manual(GtkAction *action,
+               gpointer data)
+{
+#ifdef _WIN32
+    // Fix the path
+    ShellExecute(NULL, "open", "file:///c|/Progra~1/giv/doc/giv.html", NULL, NULL, SW_SHOWNORMAL);
+#else
+    // Linux
+    system(slipprintf("xdg-open %s/giv.html",
+                      PACKAGE_DOC_DIR));
+#endif
+}
+
 %}
 

src/giv-win.gob

@@ -10,6 +10,7 @@
 #include <string.h>
 #include "gtk/gtk.h"
 #include "giv-win.h"
+#include "givimagedll.h"
 #include "glib-jsonrpc/glib-jsonrpc-json.h"
 #include "glib-jsonrpc/glib-jsonrpc-client.h"
 #include "spdlog/sinks/basic_file_sink.h"
@@ -193,6 +194,9 @@ int main(int argc, char **argv)
   spdlog::info("CommitTime: {}", GIT_COMMIT_TIME);
   spdlog::info("Command line: {}", join(args," "));
 
+  spdlog::info("Calling to register logger in givimagedll");
+  registerLogger(logger);
+
   // Load an image into a remote instance of giv. If this fails,
   // then normal loading should take place.
   if (do_remote)

src/giv.cc

@@ -10,8 +10,7 @@
 #include "givimage.h"
 #include "givplugin.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "spdlog/spdlog.h"
-
+#include <spdlog/spdlog.h>
 
 #define GIV_IMAGE_ERROR g_spawn_error_quark ()
 
@@ -719,3 +718,5 @@ GivImageType giv_image_get_type(GivImage *img)
 {
   return img->img_type;
 }
+
+

src/givimage.cc

@@ -0,0 +1,10 @@
+// A spdlog registration for the givimage dll
+
+#include "givimagedll.h"
+
+void registerLogger(std::shared_ptr<spdlog::logger> logger)
+{
+  spdlog::register_logger(logger);
+  spdlog::set_default_logger(logger);
+  spdlog::info("Registering the logger in the givimage dll");
+}