#b6ce087 wip reworking extlib handling

Author: seeduvax

_charm/src/b6ce0872ce6312705d7b7dda4d3f6ead0a903d8106eccab76a0c4c16380779dd.cr

@@ -7,5 +7,5 @@
 <links>
 <link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
 </links>
-<cf v="Sebastien Devaux 2025-06-20T18:30:25+02:00"/>
+<cf v="Sebastien Devaux 2025-07-01T22:34:02+02:00"/>
 </cr>

core/common-extlib.mk

@@ -2,8 +2,6 @@
 ## ------------------------------------------------------------------------
 ## Dependencies management
 ## ------------------------------------------------------------------------
-# replace the | by - in libs specifications.
-USELIB_FOR_PATH=$(subst |,-,$(USELIB))
 
 # MAP to get version of lib with | separator.
 # This permit to correctly identify version even if lib have a '-' in its name
@@ -24,32 +22,13 @@ endef
 define getLibNameFromVersioned
 $(if $(findstring |,$1),$(word 1,$(subst |, ,$1)),$(word 1,$(subst -, ,$1)))
 endef
-
-# macro to get the lib name from lib with version.
-# This macro use libs in list to get the real name of lib
-#  if the list contains the lib with '|'
-# 1: the name of lib with version
-# 2: the list of libs
-define findLibNameFromVersioned
-$(call getLibNameFromVersioned,$(call getLibWithBar,$1,$2))
-endef
-
-# macro to get lib from the name of the archive
-# 1: archive name (ex: cppunit-1.14.0.$(ARCH).tar.gz)
-# return the name of lib (ex: cppunit-1.14.0)
-define getLibFromArchiveName
-$(strip $(patsubst %.$(ARCH).tar.gz,%,$(filter %.$(ARCH).tar.gz,$1))\
-$(patsubst %.noarch.tar.gz,%,$(filter %.noarch.tar.gz,$1)))
-endef
-
-# macro to get lib name from the name of the archive
-# 1: archive name (ex: cppunit-1.14.0.$(ARCH).tar.gz)
-# 2: list of libs
-define getLibNameFromArchiveName
-$(call findLibNameFromVersioned,$(call getLibFromArchiveName,$1),$2)
+# macro to get the lib version from <libname>-<version> or <libname>|<version>
+# 1: the name of lib with version.
+define getLibVersionFromVersioned
+$(if $(findstring |,$1),$(word 2,$(subst |, ,$1)),$(subst $(word 1,$(subst -, ,$1))-,,$1))
 endef
 
-# mecro to get the list from a list using its name.
+# macro to get the list from a list using its name.
 # 1: name of the lib
 # 2: list of libs
 define getLibWithLibName
@@ -138,7 +117,7 @@ ABS_DEPDOWNLOAD_RULE_OVERLOADED:=1
 .PRECIOUS: $(ABSWS_EXTLIBDIR)/%/import.mk $(ABSWS_NDEXTLIBDIR)/%/import.mk $(ABSWS_NA_EXTLIBDIR)/%/import.mk $(ABSWS_NDNA_EXTLIBDIR)/%/import.mk
 
 
-ABS_REPO_TEMPLATE=$(foreach entry, $(ABS_REPO),$(if $(findstring {,$(entry)),$(entry),$(entry)/{arch}/{name}-{version}.{arch}{ext} $(entry)/{arch}/{name}/{name}-{version}.{arch}{ext} $(entry)/noarch/{name}-{version}{ext}))
+ABS_REPO_TEMPLATE=$(foreach entry, $(ABS_REPO),$(if $(findstring {,$(entry)),$(entry),$(entry)/{arch}/{name}-{version}.{arch}.{ext} $(entry)/{arch}/{name}/{name}-{version}.{arch}.{ext} $(entry)/noarch/{name}-{version}.{ext}))
 
 # fetch package with wget (any URL kind that wget can handle)
 # $1 URL to download from
@@ -182,13 +161,13 @@ endef
 
 
 # Get URL list related to a package
-# $1 package file name. expected format is <name>-<version>.<arch>.<ext>
+# $1 package file name. expected format is <name>/<version>/pck.<ext>
 define GetDownloadURLs
-$(call SubstituteRepoTemplate,$(word 1,$(subst -, ,$1)),$(subst $(word 1,$(subst -, ,$1))-,,$(word 1,$(subst .$(ARCH), ,$1))),$(ARCH),.$(word 2,$(subst $(ARCH)., ,$1)))
+$(call SubstituteRepoTemplate,$(word 1,$(subst /, ,$1)),$(word 2,$(subst /, ,$1)),$(ARCH),$(subst pck.,,$(word 3,$(subst /, ,$1))))
 endef
 
 define GetNoarchDownloadURLs
-$(call SubstituteRepoTemplate,$(word 1,$(subst -, ,$1)),$(subst $(word 1,$(subst -, ,$1))-,,$(word 1,$(subst .$(ARCH), ,$1))),noarch,)
+$(call SubstituteRepoTemplate,$(word 1,$(subst /, ,$1)),$(word 2,$(subst /, ,$1)),noarch,$(subst pck.,,$(word 3,$(subst /, ,$1))))
 endef
 
 # Get URL list related to a raw package package file name
@@ -200,15 +179,14 @@ endef
 $(ABS_CACHE)/noarch/%:
 	@mkdir -p $(@D)
 	@$(ABS_PRINT_info) "Fetching NA $@..."
-	$(call downloadFromURLs,$@,$(call GetNoarchDownloadURLs,$(@F)))
+	$(call downloadFromURLs,$@,$(call GetNoarchDownloadURLs,$(subst $(ABS_CACHE)/noarch/,,$@)))
 	@test -f $@
 
 
 $(ABS_CACHE)/%:
 	@mkdir -p $(@D)
 	@$(ABS_PRINT_info) "Fetching $@..."
-	@$(ABS_PRINT_debug) "Debug on."
-	$(call downloadFromURLs,$@,$(call GetDownloadURLs,$(@F)))
+	$(call downloadFromURLs,$@,$(call GetDownloadURLs,$(subst $(ABS_CACHE)/$(ARCH)/,,$@)))
 	@test -f $@
 
 # extract import.mk at the end to be sure the extraction is complete.
@@ -217,26 +195,25 @@ define unpackArchive
 	@$(ABS_PRINT_debug) "$<"
 	@$(if $(wildcard $(@D)),chmod -R u+w $(@D) && rm -rf $(@D))
 	@mkdir -p $(@D)
-	@tar --exclude=$*/import.mk -xmzf $< -C $1
-	@tar -xmzf $< -C $(1) $*/import.mk
+	@tar -xmzf $< -C $(@D) --strip-components=1
 	@$(if $(filter 1 true,$(EXTLIBDIR_READONLY)),chmod -R a-w $(@D))
 	@touch $@
 endef
 
 # unpack arch specific external lib
-$(ABSWS_EXTLIBDIR)/%/import.mk: $(ABS_CACHE)/$(ARCH)/%.$(ARCH).tar.gz
+$(ABSWS_EXTLIBDIR)/%/import.mk: $(ABS_CACHE)/$(ARCH)/%/pck.tar.gz
 	$(call unpackArchive,$(ABSWS_EXTLIBDIR))
 
 # unpack external lib that should not be forwarded to dist package
-$(ABSWS_NDEXTLIBDIR)/%/import.mk: $(ABS_CACHE)/$(ARCH)/%.$(ARCH).tar.gz
+$(ABSWS_NDEXTLIBDIR)/%/import.mk: $(ABS_CACHE)/$(ARCH)/%/pck.tar.gz
 	$(call unpackArchive,$(ABSWS_NDEXTLIBDIR))
 
 # unpack no arch external lib
-$(ABSWS_NA_EXTLIBDIR)/%/import.mk: $(ABS_CACHE)/noarch/%.tar.gz
+$(ABSWS_NA_EXTLIBDIR)/%/import.mk: $(ABS_CACHE)/noarch/%/pck.tar.gz
 	$(call unpackArchive,$(ABSWS_NA_EXTLIBDIR))
 
 # unpack no arch external lib that should not be forwarded to dist package
-$(ABSWS_NDNA_EXTLIBDIR)/%/import.mk: $(ABS_CACHE)/noarch/%.tar.gz
+$(ABSWS_NDNA_EXTLIBDIR)/%/import.mk: $(ABS_CACHE)/noarch/%/pck.tar.gz
 	$(call unpackArchive,$(ABSWS_NDNA_EXTLIBDIR))
 
 
@@ -316,7 +293,7 @@ $(NDNA_EXTLIBDIR)/%/.dir: $(ABSWS_NDNA_EXTLIBDIR)/%/.dir
 	$(call extlib_linkLibrary)
 
 ifneq ($(BUILDCHAIN),)
-USELIB+=runtime-$(BUILDCHAIN)
+USELIB+=runtime|$(BUILDCHAIN)
 endif
 
 # USELIB / NDUSELIB from modules. (needed for dist)
@@ -382,7 +359,7 @@ endef
 # $5 variable to use to store libs
 define extlib_import2
 $(foreach lib,$3,$(call extlib_import3,$(lib),$1-$2,$4,$5))
-$(eval _app_$1_dir:=$4/$1-$2)
+$(eval _app_$1_dir:=$4/$1/$2)
 $(eval _app_$1_depends+=$(foreach lib,$3,$(call getLibNameFromVersioned,$(lib))))
 $(eval ALL_LIBS_LOADED+=$1)
 endef
@@ -408,15 +385,17 @@ $$(NA_EXTLIBDIR)/%.jar: $$(EXTLIBDIR)/$1-$2/lib/%.jar
 	@mkdir -p $$(@D)
 	@$$(LNFILE) $$< $$@
 endef
+
 # list of import makefile from external libraries declared in module
 # configuration only if not requesting clean or cleanabs target. In this case,
 # we don't care importing the dependencies.
 ifeq ($(filter clean% purgeabs docker% tag,$(MAKECMDGOALS)),)
+EXTLIBMAKES= \
+	$(foreach entry,$(sort $(USELIB) $(MODS_USELIBS)),$(EXTLIBDIR)/$(call getLibNameFromVersioned,$(entry))/$(call getLibVersionFromVersioned,$(entry))/import.mk) \
+	$(foreach entry,$(sort $(NDUSELIB) $(MODS_NDUSELIBS)),$(NDEXTLIBDIR)/$(call getLibNameFromVersioned,$(entry))/$(call getLibVersionFromVersioned,$(entry))/import.mk) \
+	$(foreach entry,$(sort $(NDNA_USELIB)),$(NDNA_EXTLIBDIR)/$(call getLibNameFromVersioned,$(entry))/$(call getLibVersionFromVersioned,$(entry))/import.mk) \
+	$(foreach entry,$(sort $(NA_USELIB)),$(NA_EXTLIBDIR)/$(call getLibNameFromVersioned,$(entry))/$(call getLibVersionFromVersioned,$(entry))/import.mk)
 
-EXTLIBMAKES=$(patsubst %,$(EXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(USELIB) $(MODS_USELIBS)))) \
-	$(patsubst %,$(NDEXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(NDUSELIB) $(MODS_NDUSELIBS)))) \
-	$(patsubst %,$(NDNA_EXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(NDNA_USELIB)))) \
-	$(patsubst %,$(NA_EXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(NA_USELIB))))
 
 DEFAULT_EXTLIBMAKES:=$(EXTLIBMAKES)
 

core/module-test.mk

@@ -18,10 +18,10 @@
 ifeq ($(filter %-win32 %-posix,$(CC_VERSION)),)
 CC_VERSION_GE6:=$(shell [ `echo "$(CC_VERSION)" | cut -f1 -d.` -ge 6 ] && echo true || echo false)
 ifeq ($(CC_VERSION_GE6),false)
-CPPUNIT?=cppunit-1.12.1
+CPPUNIT?=cppunit|1.12.1
 endif
 endif
-CPPUNIT?=cppunit-1.14.0
+CPPUNIT?=cppunit|1.14.0
 
 TESTRUNNER=ctrunner$(BINEXT)
 TXTXSL=xunit2txt.xsl
@@ -33,7 +33,7 @@ else
 TIMEOUTCMD:=timeout $(TIMEOUT)
 endif
 
-CPPUNIT_DIR=$(NDEXTLIBDIR)/$(CPPUNIT)
+CPPUNIT_DIR=$(NDEXTLIBDIR)/$(word 1,$(subst |, ,$(CPPUNIT)))/$(word 2,$(subst |, ,$(CPPUNIT)))
 TCFLAGS+=-I$(CPPUNIT_DIR)/include
 TLDFLAGS+=-L$(CPPUNIT_DIR)/$(SODIR)
 TLINKLIB+=cppunit

doc/main.mk

@@ -24,9 +24,9 @@ HEMLARGS:=-param app $(APPNAME) -param version $(VERSION) -param date "`date --r
 
 PUMLVERSION?=1.2021.6
 LUAJVERSION?=3.0.1
-PUMLJAR?=$(NDNA_EXTLIBDIR)/plantuml.$(PUMLVERSION).jar
-LUAJJAR?=$(NDNA_EXTLIBDIR)/luaj-jse-$(LUAJVERSION).jar
-HEMLJAR?=$(NDNA_EXTLIBDIR)/heml-$(HEMLVERSION).jar
+PUMLJAR?=$(NDNA_EXTLIBDIR)/plantuml/$(PUMLVERSION)/pck.jar
+LUAJJAR?=$(NDNA_EXTLIBDIR)/luaj-jse/$(LUAJVERSION)/pck.jar
+HEMLJAR?=$(NDNA_EXTLIBDIR)/heml/$(HEMLVERSION)/pck.jar
 HEMLCMD?=$(JAVACMD) -jar $(call absGetPath,$(HEMLJAR))
 PUMLCMD?=$(JAVACMD) -jar $(call absGetPath,$(PUMLJAR))
 

sampleprj/Makefile

@@ -44,38 +44,28 @@ include $(ABSROOT)/core/main.mk
 # Default and minimal rule download files from repository
 # May be overloaded by dependencies download rules for more features
 ifeq ($(ABS_DEPDOWNLOAD_RULE_OVERLOADED),)
-ABS_REPO_1ST=$(word 1,$(ABS_REPO))
-ifeq ($(findstring %,$(ABS_REPO_1ST)),)
-ABS_REPO_PATTERN_1ST:=$(ABS_REPO_1ST)/$(ARCH)/%
-ABS_REPO_NA_PATTERN_1ST:=$(ABS_REPO_1ST)/noarch/%
-else
-$(eval ABS_REPO_PATTERN_1ST:=$(ABS_REPO_1ST))
-$(eval ABS_REPO_NA_PATTERN_1ST:=$(subst $$(ARCH),noarch,$(ABS_REPO_1ST)))
-endif
+ABS_REPO_TEMPLATE=$(foreach entry, $(ABS_REPO),$(if $(findstring {,$(entry)),$(entry),$(entry)/{arch}/{name}-{version}.{arch}{ext} $(entry)/{arch}/{name}/{name}-{version}.{arch}{ext} $(entry)/noarch/{name}-{version}{ext}))
+# CAUTION: empty line before endef into the next 3 macro define is needed
+define GetFileWget
+	@test -f $2 || ( echo "Downloading $1..." ; wget -q $(WGETFLAGS) $1 -O $2 || rm -f $2 )
 
-$(ABS_CACHE)/noarch/%:
-	@mkdir -p $(@D)
-ifeq ($(findstring file://,$(ABS_REPO_NA_PATTERN_1ST)),file://)
-	@test -r $(patsubst file://%,%,$(patsubst %,$(ABS_REPO_NA_PATTERN_1ST),$(@F))) || exit 1
-	@echo "Linking $(@F) from $(ABS_REPO_NA_PATTERN_1ST)"
-	@ln -sf $(patsubst file://%,%,$(patsubst %,$(ABS_REPO_NA_PATTERN_1ST),$(@F))) $@
-else
-	@echo "Fetching $(@F) from $(ABS_REPO_NA_PATTERN_1ST)"
-	@wget -q $(WGETFLAGS) $(patsubst %,$(ABS_REPO_NA_PATTERN_1ST),$(@F)) -O [email protected]
-	@mv [email protected] $@
-endif
+endef
+define GetFileScp
+	@test -f $2 || ( echo "Downloading $1..." ; scp $(SCPFLAGS) $(patsubst scp:%,%,$1) $2 || : )
 
-$(ABS_CACHE)/%:
+endef
+define GetFileLink
+	@test -f $2 || ( echo "Linking $1..." ; ln -sf $(patsubst file://%,%,$1) $2 ; test -r $2 || rm -f $2 )
+
+endef
+define downloadFromURLs
+$(foreach entry,$2,$(if $(filter file://%,$(entry),),$(call GetFileLink,$(entry),$1))$(if $(filter scp:%,$(entry),),$(call GetFileScp,$(entry),$1))$(if $(filter-out file://% scp:%,$(entry)),$(call GetFileWget,$(entry),$1)))
+endef
+
+$(ABS_CACHE)/noarch/abs.%-$(VABS).tar.gz:
 	@mkdir -p $(@D)
-ifeq ($(findstring file://,$(ABS_REPO_PATTERN_1ST)),file://)
-	@test -r $(patsubst file://%,%,$(patsubst %,$(ABS_REPO_PATTERN_1ST),$(@F))) || exit 1
-	@echo "Linking $(@F) from $(ABS_REPO_PATTERN_1ST)"
-	@ln -sf $(patsubst file://%,%,$(patsubst %,$(ABS_REPO_PATTERN_1ST),$(@F))) $@
-else
-	@echo "Fetching $(@F) from $(ABS_REPO_PATTERN_1ST)"
-	@wget -q $(WGETFLAGS) $(patsubst %,$(ABS_REPO_PATTERN_1ST),$(@F)) -O [email protected]
-	@mv [email protected] $@
-endif
+	$(call downloadFromURLs,$@,$(subst {name},abs.core,$(subst {version},$(VABS),$(subst {ext},.tar.gz,$(subst {arch},noarch,$(ABS_REPO_TEMPLATE))))))
+	@test -f $@
 
 endif