projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
80f033a
)
Use install --target-directory
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 6 Mar 2024 09:22:30 +0000
(10:22 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 6 Mar 2024 09:22:30 +0000
(10:22 +0100)
repackage.mk
patch
|
blob
|
history
diff --git
a/repackage.mk
b/repackage.mk
index 28d5be77bff89dcb0fd340805d35a3b9a66bfddb..01c099363930d1ac8f9c0484f51b20dbdd8f8122 100644
(file)
--- a/
repackage.mk
+++ b/
repackage.mk
@@
-15,18
+15,18
@@
ARGEO_REPACKAGE = $(JVM) -cp $(LOGGER_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)src/
TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage)
BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(category))
TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage)
BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(category))
-INSTALL=install -m644 -D
+INSTALL=install -m644 -D
--target-directory
all: $(BUILD_BASE)/repackaged
install:
all: $(BUILD_BASE)/repackaged
install:
- $(foreach category, $(PORTABLE_CATEGORIES), $(INSTALL) $(
wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category
);$(LF))
+ $(foreach category, $(PORTABLE_CATEGORIES), $(INSTALL) $(
A2_INSTALL_TARGET)/$(category) $(wildcard $(A2_OUTPUT)/$(category)/*.jar
);$(LF))
@echo Installed portable jars '$(PORTABLE_CATEGORIES)' to $(A2_INSTALL_TARGET)
@echo Installed portable jars '$(PORTABLE_CATEGORIES)' to $(A2_INSTALL_TARGET)
- $(foreach category, $(OS_CATEGORIES), $(INSTALL) $(
wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category:$(TARGET_OS_CATEGORY_PREFIX)/%=%
);$(LF))
+ $(foreach category, $(OS_CATEGORIES), $(INSTALL) $(
A2_INSTALL_TARGET)/$(category:$(TARGET_OS_CATEGORY_PREFIX)/%=%) $(wildcard $(A2_OUTPUT)/$(category)/*.jar
);$(LF))
@echo Installed OS-dependent jars '$(OS_CATEGORIES)' to $(A2_INSTALL_TARGET)
@echo Installed OS-dependent jars '$(OS_CATEGORIES)' to $(A2_INSTALL_TARGET)
- $(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(
wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_NATIVE_INSTALL_TARGET)/$(category:$(TARGET_ARCH_CATEGORY_PREFIX)/%=%
);$(LF))
+ $(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(
A2_NATIVE_INSTALL_TARGET)/$(category:$(TARGET_ARCH_CATEGORY_PREFIX)/%=%) $(wildcard $(A2_OUTPUT)/$(category)/*.jar
);$(LF))
@echo Installed arch-dependent jars '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
@echo Installed arch-dependent jars '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
- $(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(
wildcard $(A2_OUTPUT)/$(category)/*.so) $(A2_NATIVE_INSTALL_TARGET
);$(LF))
+ $(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(
A2_NATIVE_INSTALL_TARGET) $(wildcard $(A2_OUTPUT)/$(category)/*.so
);$(LF))
@echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
uninstall:
@echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
uninstall: