#b6ce087 debug distinstall of java app

Author: seeduvax

_charm/src/b6ce0872ce6312705d7b7dda4d3f6ead0a903d8106eccab76a0c4c16380779dd.cr

@@ -7,5 +7,5 @@
 <links>
 <link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
 </links>
-<cf v="Sebastien Devaux 2025-07-08T13:17:08+02:00"/>
+<cf v="Sebastien Devaux 2025-07-08T14:13:02+02:00"/>
 </cr>

core/common-extlib.mk

@@ -208,7 +208,8 @@ $(ABS_CACHE)/noarch/%:
 	@mv $@.tmp $@
 	@test -f $@
 	$(eval _local_target_spec:=$(subst /, ,$(patsubst $(ABS_CACHE)/noarch/%,%,$@)))
-	$(if $(filter %.jar,$(@F)),mv $@ $(ABS_CACHE)/noarch/$(word 1,$(_local_target_spec))-$(word 2,$(_local_target_spec)).jar;ln -s $(ABS_CACHE)/noarch/$(word 1,$(_local_target_spec))-$(word 2,$(_local_target_spec)).jar $@,)
+	$(eval _local_jarfile:=$$(word 1,$$(_local_target_spec))-$$(word 2,$(_local_target_spec)).jar)
+	$(if $(filter %.jar,$(@F)),@mv $@ $(ABS_CACHE)/noarch/$(_local_jarfile);ln -sf $(ABS_CACHE)/noarch/$(_local_jarfile) $@,)
 
 
 $(ABS_CACHE)/%:

core/module-java.mk

@@ -59,6 +59,12 @@ JCFLAGS:=$(JFLAGS) -sourcepath "src:$(JARIMGDIR):$(JGENSRCDIR)"
 endif
 RESFILES=$(patsubst src/%,$(JARIMGDIR)/%,$(filter-out %.java src/test/%,$(SRCFILES)))
 
+JAREXTLIBLINKS:=$(foreach entry,$(USEJAR),$(NA_EXTLIBDIR)/$(call getLibNameFromVersioned,$(entry))-$(call getLibVersionFromVersioned,$(entry)).jar)
+
+$(NA_EXTLIBDIR)/%.jar:
+	@mkdir -p $(@D)
+	@ln -sf $(ABS_CACHE)/noarch/$(@F) $@
+
 # ---------------------------------------------------------------------
 # Default target : build target file
 # ---------------------------------------------------------------------
@@ -100,7 +106,7 @@ $(OBJDIR)/$(MODNAME).Manifest: $(JCLASSES)
 	@printf "Class-Path: $(patsubst %, %.jar\n,$(USEJAR))  ../res\n\n\n" >> $@
 
 # Jar archive
-$(TARGETFILE): $(OBJDIR)/$(MODNAME).Manifest $(RESFILES)
+$(TARGETFILE): $(OBJDIR)/$(MODNAME).Manifest $(RESFILES) $(JAREXTLIBLINKS)
 	@$(ABS_PRINT_info) "Building archive $@ ..."
 	@mkdir -p $(TARGETDIR)
 ifeq ($(ISWINDOWS),true)