Build jsonschemabuilder for all platforms from source

cmake/modules/buildtools/FindJsonSchemaBuilder.cmake

@@ -12,42 +12,77 @@
 #   JsonSchemaBuilder::JsonSchemaBuilder   - The JsonSchemaBuilder executable
 
 if(NOT TARGET JsonSchemaBuilder::JsonSchemaBuilder)
-  if(KODI_DEPENDSBUILD)
-    get_filename_component(_jsbpath "${NATIVEPREFIX}/bin" ABSOLUTE)
-    find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder
-                                   HINTS ${_jsbpath})
 
-    add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL)
-    set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES
-                                                       IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}")
-  elseif(CORE_SYSTEM_NAME STREQUAL windowsstore)
-    get_filename_component(_jsbpath "${NATIVEPREFIX}/bin/json-rpc" ABSOLUTE)
+  include(cmake/scripts/common/ModuleHelpers.cmake)
+
+  if(WITH_JSONSCHEMABUILDER)
+    get_filename_component(_jsbpath ${WITH_JSONSCHEMABUILDER} ABSOLUTE)
+    get_filename_component(_jsbpath ${_jsbpath} DIRECTORY)
     find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder
+                                                    "${APP_NAME_LC}-JsonSchemaBuilder.exe" JsonSchemaBuilder.exe
                                               HINTS ${_jsbpath})
 
+    if(NOT JSONSCHEMABUILDER_EXECUTABLE)
+      message(FATAL_ERROR "Could not find 'JsonSchemaBuilder' executable in ${_jsbpath} supplied by -DWITH_JSONSCHEMABUILDER")
+    endif()
+  else()
+
+    set(MODULE_LC JsonSchemaBuilder)
+    set(LIB_TYPE native)
+    set(JSONSCHEMABUILDER_DISABLE_VERSION ON)
+    SETUP_BUILD_VARS()
+
+    # Override build type detection and always build as release
+    set(JSONSCHEMABUILDER_BUILD_TYPE Release)
+
+    set(CMAKE_ARGS -DDUMMY_ARG=1)
+
+    if(NATIVEPREFIX)
+      set(INSTALL_DIR "${NATIVEPREFIX}/bin")
+      set(JSONSCHEMABUILDER_INSTALL_PREFIX ${NATIVEPREFIX})
+    else()
+      set(INSTALL_DIR "${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/bin")
+      set(JSONSCHEMABUILDER_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR})
+    endif()
+
+    # Set host build info for buildtool
+    if(EXISTS "${NATIVEPREFIX}/share/Toolchain-Native.cmake")
+      set(JSONSCHEMABUILDER_TOOLCHAIN_FILE "${NATIVEPREFIX}/share/Toolchain-Native.cmake")
+    endif()
+
+    if(WIN32 OR WINDOWS_STORE)
+      # Make sure we generate for host arch, not target
+      set(JSONSCHEMABUILDER_GENERATOR_PLATFORM CMAKE_GENERATOR_PLATFORM WIN32)
+      set(WIN_DISABLE_PROJECT_FLAGS 1)
+      set(APP_EXTENSION ".exe")
+    endif()
+
+    set(JSONSCHEMABUILDER_SOURCE_DIR ${CMAKE_SOURCE_DIR}/tools/depends/native/JsonSchemaBuilder/src)
+    set(JSONSCHEMABUILDER_EXECUTABLE ${INSTALL_DIR}/JsonSchemaBuilder${APP_EXTENSION})
+
+    set(BUILD_BYPRODUCTS ${JSONSCHEMABUILDER_EXECUTABLE})
+
+    BUILD_DEP_TARGET()
+
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(JsonSchemaBuilder
+                                    REQUIRED_VARS JSONSCHEMABUILDER_EXECUTABLE)
+
+  if(JSONSCHEMABUILDER_FOUND)
     add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL)
     set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES
-                                                       IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}")
+                                                               IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}")
+
+    if(TARGET JsonSchemaBuilder)
+      add_dependencies(JsonSchemaBuilder::JsonSchemaBuilder JsonSchemaBuilder)
+    endif()
   else()
-    if(WITH_JSONSCHEMABUILDER)
-      get_filename_component(_jsbpath ${WITH_JSONSCHEMABUILDER} ABSOLUTE)
-      get_filename_component(_jsbpath ${_jsbpath} DIRECTORY)
-      find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder
-                                                HINTS ${_jsbpath})
-
-      include(FindPackageHandleStandardArgs)
-      find_package_handle_standard_args(JsonSchemaBuilder "Could not find '${APP_NAME_LC}-JsonSchemaBuilder' or 'JsonSchemaBuilder' executable in ${_jsbpath} supplied by -DWITH_JSONSCHEMABUILDER. Make sure the executable file name matches these names!"
-                                        JSONSCHEMABUILDER_EXECUTABLE)
-      if(JSONSCHEMABUILDER_FOUND)
-        add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL)
-        set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES
-                                                           IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}")
-      endif()
-      mark_as_advanced(JSONSCHEMABUILDER)
-    else()
-      add_subdirectory(${CMAKE_SOURCE_DIR}/tools/depends/native/JsonSchemaBuilder build/jsonschemabuilder)
-      add_executable(JsonSchemaBuilder::JsonSchemaBuilder ALIAS JsonSchemaBuilder)
-      set_target_properties(JsonSchemaBuilder PROPERTIES FOLDER Tools)
+    if(JSONSCHEMABUILDER_FIND_REQUIRED)
+      message(FATAL_ERROR "JsonSchemaBuilder not found.")
     endif()
   endif()
+
+  mark_as_advanced(JSONSCHEMABUILDER_EXECUTABLE)
 endif()

cmake/scripts/common/ModuleHelpers.cmake

@@ -141,8 +141,10 @@ macro(SETUP_BUILD_VARS)
     set(PROJECTSOURCE ${CMAKE_SOURCE_DIR})
   endif()
 
-  # populate variables of data from VERSION file for MODULE
-  get_versionfile_data()
+  if(NOT ${MODULE}_DISABLE_VERSION)
+    # populate variables of data from VERSION file for MODULE
+    get_versionfile_data()
+  endif()
 
   # allow user to override the download URL with a local tarball
   # needed for offline build envs

project/BuildDependencies/scripts/0_package.native-win32.list

@@ -6,7 +6,6 @@
 ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
 ; -> ...
 ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
-JsonSchemaBuilder-win32-v141-20200105.7z
 swig-4.0.1-win32-v141-20200105.7z
 TexturePacker-win32-v141-20200105.7z
 vswhere-2.2.11-win32.7z

tools/depends/native/JsonSchemaBuilder/Makefile

@@ -1,37 +1,28 @@
-ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 include ../../Makefile.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
 DEPS =../../Makefile.include Makefile
 
-SOURCE=$(ROOT_DIR)/src
-
-CONFIGURE=./configure --prefix=$(PREFIX)
-APP=$(PLATFORM)/JsonSchemaBuilder
-APPBIN=$(PREFIX)/bin/JsonSchemaBuilder
+APP=$(PLATFORM)/build/JsonSchemaBuilder
 
 all: .installed-$(PLATFORM)
 
 download:
 
 $(PLATFORM): $(DEPS)
-	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); cp -a $(SOURCE)/* .
-	cd $(PLATFORM); ./autogen.sh
-	cd $(PLATFORM); $(CONFIGURE)
-
+	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)/build
+	cd $(PLATFORM); cp -a ../src/* .
+	cd $(PLATFORM)/build; $(CMAKE_FOR_BUILD) ..
 
 $(APP): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
-
+	$(MAKE) -C $(PLATFORM)/build
 
 .installed-$(PLATFORM): $(APP)
-	$(MAKE) -C $(PLATFORM) install
+	$(MAKE) -C $(PLATFORM)/build install
 	touch $@
 
 clean:
-	$(MAKE) -C $(PLATFORM) clean
+	$(MAKE) -C $(PLATFORM)/build clean
 
 distclean::
 	rm -rf $(PLATFORM) .installed-$(PLATFORM)
-	-rm -rf bin

tools/depends/native/JsonSchemaBuilder/CMakeLists.txt → tools/depends/native/JsonSchemaBuilder/src/CMakeLists.txt

@@ -1,8 +1,9 @@
+cmake_minimum_required(VERSION 3.15)
 project(JsonSchemaBuilder)
 
-set(SOURCES src/JsonSchemaBuilder.cpp)
+set(SOURCES JsonSchemaBuilder.cpp)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 add_executable(JsonSchemaBuilder ${SOURCES})
 

tools/depends/native/Makefile

@@ -14,7 +14,6 @@ NATIVE= \
   gettext \
   giflib \
   heimdal \
-  JsonSchemaBuilder \
   libjpeg-turbo \
   liblzo2 \
   libpng \
@@ -68,7 +67,7 @@ autoconf: m4
 automake: autoconf
 dpkg: automake gettext libtool pkg-config tar
 heimdal: libtool
-JsonSchemaBuilder: automake
+JsonSchemaBuilder: cmake
 libjpeg-turbo: cmake nasm
 libpng: zlib automake
 libtool: automake