#52 Make bugs

[Stéphane Rivière]

Missing operations in make tests

For a linux Debian and derivatives point of view :

user@system: sed -i 's/gtk-3.0/gtk-4.0/g' Makefile
user@system: sed -i 's/gtk-3.0/gtk-4.0/g' ./src/gnoga-application-gtk_window.adb

user@system: cd ./obj ; gcc -c ../src/gnoga_gtk_window.c `pkg-config --cflags webkit2gtk-4.0` ; cd ..

Missing operations in make install

libgnoga_secure.a not installed :

user@system: cp <GNOGA_PATH>/lib/gnoga-server-connection-secure.ali <PREFIX>/lib/gnoga/gnoga ; cp <GNOGA_PATH>/lib/libgnoga_secure.a <PREFIX>/lib/gnoga/gnoga

[Stéphane Rivière]

Disregard the above post and replace it with the diff file below. Modification details:

• For the test build, added native_gtk to the all rule and replaced webkit2gtk-3.0 with webkit2gtk-4.0 ;
• For the documentation build, replaced git: by https: ;
• For the integration of gnoga_secure in the installation and its uninstallation, added two gprinstall commands.

--- Makefile-org    2022-03-06 11:01:02.000000000 +0100
+++ Makefile    2022-08-04 14:43:52.806908453 +0200
@@ -133,7 +133,7 @@
    ZB_OPTIONS=-XBUILD=$(subst Release,Production,${BUILD_MODE}) -XOS=unix
 endif

-all: deps $(BUILD_SQLITE3) basic_components gnoga gnoga_tools demo tutorials
+all: deps $(BUILD_SQLITE3) basic_components gnoga gnoga_tools demo tutorials native_gtk

 basic_components:
    $(MAKE) -C components
@@ -161,7 +161,7 @@
    $(BUILDER) -P deps/uxstrings/lib_uxstrings.gpr

 native_gtk: src/gnoga_gtk_window.c

-   cd obj && gcc -c ../src/gnoga_gtk_window.c `pkg-config --cflags gtk+-3.0,webkit2gtk-3.0`
+   cd obj && gcc -c ../src/gnoga_gtk_window.c `pkg-config --cflags gtk+-3.0,webkit2gtk-4.0`

 native_osx:

    - cd deps && git clone https://github.com/MacGapProject/MacGap2.git
@@ -185,7 +185,7 @@

 .IGNORE: bin/multimarkdown
 bin/multimarkdown:

-   cd deps && git clone git://github.com/fletcher/MultiMarkdown-4.git
+   cd deps && git clone https://github.com/fletcher/MultiMarkdown-4.git
    cd deps/MultiMarkdown-4 && git submodule init
    cd deps/MultiMarkdown-4 && git submodule update
    cd deps/MultiMarkdown-4 && "$(MAKE)"
@@ -215,6 +215,7 @@
 # Install Gnoga without deps
 install_gnoga: basic_components gnoga gnoga_tools
    $(INSTALLER) --prefix="$(PREFIX)" --install-name=gnoga src/gnoga.gpr $(GN_OPTIONS)
+   $(INSTALLER) --prefix="$(PREFIX)" --install-name=gnoga ssl/gnoga_secure.gpr $(GN_OPTIONS)
    $(INSTALLER) --prefix="$(PREFIX)" --install-name=gnoga --mode=usage tools/tools_agg.gpr $(GN_OPTIONS)
    $(MAKE) -C components INSTALL_DIR="$(PREFIX)"/share/gnoga

@@ -232,6 +233,7 @@
    $(INSTALLER) --prefix="$(PREFIX)" --install-name=pragmarc --uninstall pragmarc.gpr
    $(INSTALLER) --prefix="$(PREFIX)" --install-name=uxstrings --uninstall lib_uxstrings.gpr
    $(INSTALLER) --prefix="$(PREFIX)" --install-name=gnoga --uninstall gnoga.gpr

+   $(INSTALLER) --prefix="$(PREFIX)" --install-name=gnoga --uninstall gnoga_secure.gpr
    $(MAKE) -C deps/zanyblue/src INSTALL_DIR="$(PREFIX)" uninstall
    $(RM) -fr "$(PREFIX)"/share/gnoga

[Blady]

Hi Stéphane,
a) native_gtk: it requires webkit2gtk that is not necessarily installed on mostly user configurations (even less version 4.0), thus I prefer to leave as it is
b) doc build: fix, git replaced by https (in this commit)
c) install Gnoga secure: it requires gnutls that is not necessarily installed on mostly user configurations, thus I prefer to leave as it is