projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be1c3de
)
Reduce verbosity
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 16 Mar 2023 08:46:45 +0000
(09:46 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 16 Mar 2023 08:46:45 +0000
(09:46 +0100)
osgi.mk
patch
|
blob
|
history
diff --git
a/osgi.mk
b/osgi.mk
index b4f2ce0becc1dc245bf7a45cd70dd3b7c4eda634..15f44757ebbf143ce962bd7b058887f8897dcceb 100644
(file)
--- a/
osgi.mk
+++ b/
osgi.mk
@@
-48,9
+48,10
@@
osgi: $(BUILD_BASE)/built $(MANIFESTS)
# Actual build (compilation + bundle packaging)
$(BUILD_BASE)/built : BUNDLES_TO_BUILD = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?))
$(BUILD_BASE)/built : $(TODOS)
# Actual build (compilation + bundle packaging)
$(BUILD_BASE)/built : BUNDLES_TO_BUILD = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?))
$(BUILD_BASE)/built : $(TODOS)
- $(ARGEO_MAKE) all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
+ $(ARGEO_MAKE) \
+ all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
--category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD)
--category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD)
- touch $(BUILD_BASE)/built
+
@
touch $(BUILD_BASE)/built
$(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path '*/MANIFEST.MF' | sed 's/ /\\ /g')
@rm -rf $(dir $@)
$(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path '*/MANIFEST.MF' | sed 's/ /\\ /g')
@rm -rf $(dir $@)
@@
-60,7
+61,7
@@
$(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path
# Local manifests
%/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF
@mkdir -p $*
# Local manifests
%/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF
@mkdir -p $*
- cp $< $@
+
@
cp $< $@
clean-manifests :
@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
clean-manifests :
@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);