head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.4 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.2 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.2.0.2 pkgsrc-2025Q3-base:1.2; locks; strict; comment @# @; 1.3 date 2025.10.07.20.45.10; author dkazankov; state Exp; branches; next 1.2; commitid EBysylHjpPyMbGdG; 1.2 date 2025.09.13.05.25.01; author dkazankov; state Exp; branches; next 1.1; commitid drHDbAZQebmWRvaG; 1.1 date 2025.07.10.18.52.41; author dkazankov; state Exp; branches; next ; commitid T8LamLLurvEyqe2G; desc @@ 1.3 log @ada-gnatcoll-core-25: bug fixing * Add tests support * Many (not all) NetBSD port bugs fixed after tests: PASS 431 FAIL 16 SKIP 1 @ text @$NetBSD: patch-Makefile,v 1.2 2025/09/13 05:25:01 dkazankov Exp $ Fix target calculation Add necessary parameters for pkgsrc build Fix gnatcoll.gpr installation Fix destdir building in rsync absence Make test target --- Makefile.orig 2024-09-24 12:28:32.000000000 +0300 +++ Makefile @@@@ -61,7 +61,7 @@@@ GNATCOLL_GPR=$(SOURCE_DIR)/gnatcoll.gpr TARGET := $(shell gcc -dumpmachine) -NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig --config=ada --target=$(TARGET) --mi-show-compilers))) +NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:'))) ifeq ($(NORMALIZED_TARGET),) $(error No toolchain found for target "$(TARGET)") endif @@@@ -75,6 +75,7 @@@@ ENABLE_SHARED = yes INTEGRATED = no GNATCOV = +TESTSUITE_DIR := $(shell pwd)/testsuite all: build @@@@ -98,8 +99,13 @@@@ --build=$(BUILD) \ --target=$(NORMALIZED_TARGET) \ --prefix=local-install \ - --install \ - --enable-shared=$(ENABLE_SHARED) + --enable-shared=$(ENABLE_SHARED) \ + --add-gpr-path='./minimal,./core,./projects' \ + --gpr-opts $(GPRBUILD_OPTIONS) + +INSTALL_ARGS= \ + --prefix=local-install \ + --gpr-opts $(GPRINSTALL_OPTIONS) build: rm -rf local-install @@@@ -112,18 +118,28 @@@@ endif $(PYTHON) $(SOURCE_DIR)/minimal/gnatcoll_minimal.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS) + $(PYTHON) $(SOURCE_DIR)/minimal/gnatcoll_minimal.gpr.py install $(INSTALL_ARGS) ifeq ($(GNATCOLL_MINIMAL_ONLY), no) $(PYTHON) $(SOURCE_DIR)/core/gnatcoll_core.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS) + $(PYTHON) $(SOURCE_DIR)/core/gnatcoll_core.gpr.py install $(INSTALL_ARGS) endif ifeq ($(GNATCOLL_PROJECTS), yes) $(PYTHON) $(SOURCE_DIR)/projects/gnatcoll_projects.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS) + $(PYTHON) $(SOURCE_DIR)/projects/gnatcoll_projects.gpr.py install $(INSTALL_ARGS) endif + gprinstall -f -P local-install/share/gpr/gnatcoll.gpr -p --prefix=local-install/ + install: @@echo "Installing gnatcoll into $(prefix)" - rsync -av ./local-install/ $(prefix)$(integrated_install) + cp -r ./local-install/* $(prefix)$(integrated_install) + +test: + $(PYTHON) testsuite/run-tests --recompile \ + -t $(TESTSUITE_DIR)/temp -d $(TESTSUITE_DIR)/dest -o $(TESTSUITE_DIR)/out \ + --no-random-temp-subdir --cleanup-mode none --show-error-output ########### # Cleanup # @ 1.2 log @ada-gnatcoll-core-25: add missing manifest file @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.1 2025/07/10 18:52:41 dkazankov Exp $ d7 1 d20 9 a28 1 @@@@ -98,8 +98,13 @@@@ d44 1 a44 1 @@@@ -112,18 +117,23 @@@@ d66 5 @ 1.1 log @devel/ada-gnatcoll-core-25: Add new package version 25.0.0 The GNAT Components Collection (GNATcoll) - Core packages, release 25 @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.0 2024/11/27 11:00:00 dkazankov Exp $ d5 1 d35 1 a35 1 @@@@ -112,18 +117,21 @@@@ d51 2 @