Release 1.0.27

* Updated build scripts.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.27 ===
+* Updated build scripts.
+
 === 1.0.26 ===
 * Updated build scripts.
 

Makefile

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
-# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
-#           (C) 2020 Vladimir Sadovnikov <[email protected]>
+# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+#           (C) 2024 Vladimir Sadovnikov <[email protected]>
 #
 # This file is part of lsp-test-fw
 #

dependencies.mk

@@ -61,15 +61,30 @@ ifeq ($(PLATFORM),Windows)
   TEST_DEPENDENCIES        += $(WINDOWS_TEST_DEPENDENCIES)
 endif
 
+#------------------------------------------------------------------------------
+# Haiku dependencies
+HAIKU_DEPENDENCIES = \
+  LIBGNU
+
+HAIKU_TEST_DEPENDENCIES = \
+  LIBGNU
+
+ifeq ($(PLATFORM),Haiku)
+  DEPENDENCIES             += $(HAIKU_DEPENDENCIES)
+  TEST_DEPENDENCIES        += $(HAIKU_TEST_DEPENDENCIES)
+endif
+
 #------------------------------------------------------------------------------
 # Overall system dependencies
 ALL_DEPENDENCIES = \
   $(DEPENDENCIES) \
   $(LINUX_DEPENDENCIES) \
   $(BSD_DEPENDENCIES) \
+  $(HAIKU_DEPENDENCIES) \
   $(WINDOWS_DEPENDENCIES) \
   $(TEST_DEPENDENCIES) \
   $(LINUX_TEST_DEPENDENCIES) \
   $(BSD_TEST_DEPENDENCIES) \
+  $(HAIKU_TEST_DEPENDENCIES) \
   $(WINDOWS_TEST_DEPENDENCIES)
 

include/lsp-plug.in/test-fw/types.h

@@ -65,18 +65,23 @@
     #define IF_LSP_TEST_FW_PLATFORM_MACOSX(...)     __VA_ARGS__
 #endif /* __macosx__ */
 
-#if defined(LSP_TEST_FW_PLATFORM_UNIX) || defined(LSP_TEST_FW_PLATFORM_LINUX) || defined(LSP_TEST_FW_PLATFORM_MACOSX) || defined(LSP_TEST_FW_PLATFORM_BSD)
+#if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
+    #define LSP_TEST_FW_PLATFORM_WINDOWS
+    #define IF_LSP_TEST_FW_PLATFORM_WINDOWS(...)    __VA_ARGS__
+#endif /* __WINDOWS__ */
+
+#if defined(__HAIKU__)
+    #define LSP_TEST_FW_PLATFORM_HAIKU
+    #define IF_LSP_TEST_FW_PLATFORM_HAIKU(...)    __VA_ARGS__
+#endif /* __Haiku__ */
+
+#if defined(LSP_TEST_FW_PLATFORM_UNIX) || defined(LSP_TEST_FW_PLATFORM_LINUX) || defined(LSP_TEST_FW_PLATFORM_MACOSX) || defined(LSP_TEST_FW_PLATFORM_BSD) || defined(LSP_TEST_FW_PLATFORM_HAIKU)
     #define LSP_TEST_FW_PLATFORM_UNIX_COMPATIBLE
     #define LSP_TEST_FW_PLATFORM_POSIX
 
     #define IF_LSP_TEST_FW_PLATFORM_POSIX(...)      __VA_ARGS__
 #endif /* unix-compatible platforms */
 
-#if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
-    #define LSP_TEST_FW_PLATFORM_WINDOWS
-    #define IF_LSP_TEST_FW_PLATFORM_WINDOWS(...)    __VA_ARGS__
-#endif /* __WINDOWS__ */
-
 //-----------------------------------------------------------------------------
 // Detect build platform (part 2)
 #ifndef IF_LSP_TEST_FW_PLATFORM_UNIX
@@ -99,6 +104,10 @@
     #define IF_LSP_TEST_FW_PLATFORM_BSD(...)
 #endif /* IF_LSP_TEST_FW_PLATFORM_BSD */
 
+#ifndef IF_LSP_TEST_FW_PLATFORM_HAIKU
+    #define IF_LSP_TEST_FW_PLATFORM_HAIKU(...)
+#endif /* IF_LSP_TEST_FW_PLATFORM_HAIKU */
+
 #ifndef IF_LSP_TEST_FW_PLATFORM_MACOSX
     #define IF_LSP_TEST_FW_PLATFORM_MACOSX(...)
 #endif /* IF_LSP_TEST_FW_PLATFORM_MACOSX */

include/lsp-plug.in/test-fw/version.h

@@ -25,7 +25,7 @@
 // Define header version
 #define LSP_TEST_FW_MAJOR           1
 #define LSP_TEST_FW_MINOR           0
-#define LSP_TEST_FW_MICRO           26
+#define LSP_TEST_FW_MICRO           27
 
 #if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
     #define LSP_TEST_FW_EXPORT_MODIFIER     __declspec(dllexport)

make/configure.mk

@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
-#           (C) 2020 Vladimir Sadovnikov <[email protected]>
+# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+#           (C) 2024 Vladimir Sadovnikov <[email protected]>
 #
 # This file is part of lsp-test-fw
 #
@@ -49,7 +49,7 @@ MERGED_DEPENDENCIES        := \
   $(TEST_DEPENDENCIES)
 UNIQ_MERGED_DEPENDENCIES   := $(call uniq, $(MERGED_DEPENDENCIES))
 DEPENDENCIES                = $(UNIQ_MERGED_DEPENDENCIES)
-FEATURES                   := $(call uniq, $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
+FEATURES                   := $(sort $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
 
 # Determine versions
 ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -123,6 +123,10 @@ define _modconfig =
   $(if $($(name)_OBJ_TEST),,     $(eval $(name)_OBJ_TEST     := "$($(name)_BIN)/$($(name)_NAME)-test.o"))
   $(if $($(name)_MFLAGS),,       $(eval $(name)_MFLAGS       := $(if $(publisher),,"-D$(name)_BUILTIN -fvisibility=hidden")))
 
+  $(if $(HOST_$(name)_NAME),,    $(eval HOST_$(name)_NAME    := $($(name)_NAME)))
+  $(if $(HOST_$(name)_DESC),,    $(eval HOST_$(name)_DESC    := $($(name)_DESC)))
+  $(if $(HOST_$(name)_URL),,     $(eval HOST_$(name)_URL     := $($(name)_URL$(X_URL_SUFFIX))))
+  
   $(if $(HOST_$(name)_PATH),,    $(eval HOST_$(name)_PATH    := $(MODULES)/$($(name)_NAME)))
   $(if $(HOST_$(name)_INC),,     $(eval HOST_$(name)_INC     := $(HOST_$(name)_PATH)/include))
   $(if $(HOST_$(name)_SRC),,     $(eval HOST_$(name)_SRC     := $(HOST_$(name)_PATH)/src))
@@ -160,6 +164,10 @@ define hdrconfig =
   $(if $($(name)_TESTING),,      $(eval $(name)_TESTING      := 0))
   $(if $($(name)_CFLAGS),,       $(eval $(name)_CFLAGS       := "$(if $($(name)_INC_OPT),$($(name)_INC_OPT) ,-I )\"$($(name)_INC)\""$(if $(publisher), "-D$(name)_PUBLISHER")))
   $(if $($(name)_MFLAGS),,       $(eval $(name)_MFLAGS       := "-D$(name)_BUILTIN -fvisibility=hidden"))
+
+  $(if $(HOST_$(name)_NAME),,    $(eval HOST_$(name)_NAME    := $($(name)_NAME)))
+  $(if $(HOST_$(name)_DESC),,    $(eval HOST_$(name)_DESC    := $($(name)_DESC)))
+  $(if $(HOST_$(name)_URL),,     $(eval HOST_$(name)_URL     := $($(name)_URL$(X_URL_SUFFIX))))
 
   $(if $(HOST_$(name)_PATH),,    $(eval HOST_$(name)_PATH    := $(MODULES)/$($(name)_NAME)))
   $(if $(HOST_$(name)_INC),,     $(eval HOST_$(name)_INC     := $(HOST_$(name)_PATH)/include))
@@ -233,6 +241,8 @@ CONFIG_VARS = \
     $(name)_OBJ \
     $(name)_OBJ_TEST \
     \
+    HOST_$(name)_NAME \
+    HOST_$(name)_DESC \
     HOST_$(name)_PATH \
     HOST_$(name)_INC \
     HOST_$(name)_SRC \
@@ -258,8 +268,9 @@ $(CONFIG_VARS): prepare
 	echo "$(@)=$($(@))" >> "$(CONFIG)"
 
 config: $(CONFIG_VARS)
-	echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
-	echo "Features:     $(FEATURES)"
+	echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
+	echo "Architecture:      $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
+	echo "Features:          $(FEATURES)"
 	echo "Configured OK"
 
 help: | pathvars toolvars sysvars

make/functions.mk

@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
-#           (C) 2020 Vladimir Sadovnikov <[email protected]>
+# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+#           (C) 2024 Vladimir Sadovnikov <[email protected]>
 #
 # This file is part of lsp-test-fw
 #

make/modules.mk

@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
-#           (C) 2020 Vladimir Sadovnikov <[email protected]>
+# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+#           (C) 2024 Vladimir Sadovnikov <[email protected]>
 #
 # This file is part of lsp-test-fw
 #
@@ -45,9 +45,15 @@ UNIQ_ALL_DEPENDENCIES      := $(filter-out $(ARTIFACT_ID),$(call uniq, $(ALL_DEP
 MODULES                    ?= $(BASEDIR)/modules
 GIT                        ?= git
 
+ifeq ($(DEVEL),1)
+  X_URL_SUFFIX                = _RW
+else
+  X_URL_SUFFIX                = _RO
+endif
+
 ifeq ($(TREE),1)
   $(foreach dep,$(UNIQ_ALL_DEPENDENCIES), \
-    $(eval $(dep)_URL=$($(dep)_URL_RO)) \
+    $(eval $(dep)_URL=$($(dep)_URL$(X_URL_SUFFIX))) \
   )
 
   ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)

make/paths.mk

@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
-#           (C) 2020 Vladimir Sadovnikov <[email protected]>
+# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+#           (C) 2024 Vladimir Sadovnikov <[email protected]>
 #
 # This file is part of lsp-test-fw
 #
@@ -22,6 +22,8 @@
 ifndef PREFIX
   ifeq ($(PLATFORM),Windows)
     PREFIX                     := $(BASEDIR)/INSTALL
+  else ifeq ($(CROSS_COMPILE),1)
+    PREFIX                     := $(BASEDIR)/INSTALL
   else
     PREFIX                     := /usr/local
   endif
@@ -38,11 +40,14 @@ endif
 
 LIBDIR                     := $(PREFIX)/lib
 BINDIR                     := $(PREFIX)/bin
-SHAREDDIR                  := $(PREFIX)/share
 INCDIR                     := $(PREFIX)/include
 BUILDDIR                   := $(BASEDIR)/.build
 TARGET_BUILDDIR            := $(BUILDDIR)/target
-HOST_BUILDDIR              := $(BUILDDIR)/host
+ifeq ($(CROSS_COMPILE),1)
+  HOST_BUILDDIR              := $(BUILDDIR)/host
+else
+  HOST_BUILDDIR              := $(TARGET_BUILDDIR)
+endif
 MODULES                    := $(BASEDIR)/modules
 CONFIG                     := $(BASEDIR)/.config.mk
 
@@ -61,6 +66,15 @@ ifndef INCDIR
   INCDIR                   := $(PREFIX)/include
 endif
 
+# Shared resources
+ifndef SHAREDDIR
+  ifeq ($(PLATFORM),Haiku)
+    SHAREDDIR                     := $(PREFIX)/data
+  else
+    SHAREDDIR                     := $(PREFIX)/share
+  endif
+endif
+
 # Temporary directory
 ifndef TEMPDIR
   ifeq ($(PLATFORM),Windows)