projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9958f9a
)
Revert "Compatibility with BSD Make"
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 9 Mar 2024 13:40:31 +0000
(14:40 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 9 Mar 2024 13:40:31 +0000
(14:40 +0100)
This reverts commit
9958f9a74edcce1f422207304137ab686ab5d9ff
.
common.mk
patch
|
blob
|
history
osgi.mk
patch
|
blob
|
history
diff --git
a/common.mk
b/common.mk
index b7a0d63613ecaa66c5da5106a88e3443465ccdf8..0328fd5fa56b8fdc1f1900660ca3bd5b8a040e3a 100644
(file)
--- a/
common.mk
+++ b/
common.mk
@@
-51,7
+51,7
@@
RMDIR=$(RM) -r
null :=
space := $(null) #
pathsep := :
null :=
space := $(null) #
pathsep := :
-
#
define LF
-#
-
#
$(null)
-
#
endef
+define LF
+
+$(null)
+endef
diff --git
a/osgi.mk
b/osgi.mk
index 170502cc07499fed9da1be810e828f408cb985f1..334714bf6ad9f6d37ac2c39edfda1ede82e5389e 100644
(file)
--- a/
osgi.mk
+++ b/
osgi.mk
@@
-7,6
+7,7
@@
include $(ARGEO_BUILD_BASE)common.mk
# The following environment variables can change the behaviour of the build
# SOURCE_BUNDLES sources will be packaged separately in Eclipse-compatible source bundles
# The following environment variables can change the behaviour of the build
# SOURCE_BUNDLES sources will be packaged separately in Eclipse-compatible source bundles
+# NO_MANIFEST_COPY generated MANIFESTs won't be copied to the source tree
# The following variables have default values which can be overriden
# DEP_CATEGORIES the a2 categories the compilation depends on
# The following variables have default values which can be overriden
# DEP_CATEGORIES the a2 categories the compilation depends on
@@
-25,9
+26,9
@@
BNDLIB_JAR ?= $(firstword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.arg
# Internal variables
ARGEO_MAKE = $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)src/org/argeo/build/Make.java
JAVADOC_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src)
# Internal variables
ARGEO_MAKE = $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)src/org/argeo/build/Make.java
JAVADOC_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src)
-
#
ifneq ($(NO_MANIFEST_COPY),true)
+ifneq ($(NO_MANIFEST_COPY),true)
MANIFESTS = $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF)
MANIFESTS = $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF)
-
#
endif
+endif
BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
TARGET_BUNDLES = $(abspath $(foreach bundle, $(BUNDLES),$(A2_OUTPUT)/$(shell dirname $(bundle))/$(A2_CATEGORY)/$(shell basename $(bundle)).$(major).$(minor).jar))
TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build)
BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
TARGET_BUNDLES = $(abspath $(foreach bundle, $(BUNDLES),$(A2_OUTPUT)/$(shell dirname $(bundle))/$(A2_CATEGORY)/$(shell basename $(bundle)).$(major).$(minor).jar))
TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build)
@@
-61,15
+62,12
@@
$(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path
@mkdir -p $(dir $@)
@touch $@
@mkdir -p $(dir $@)
@touch $@
-## DISABLED
-# NO_MANIFEST_COPY generated MANIFESTs won't be copied to the source tree
-
# Local manifests
%/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF
# Local manifests
%/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF
-
#
ifneq ($(NO_MANIFEST_COPY),true)
+ifneq ($(NO_MANIFEST_COPY),true)
@mkdir -p $*/META-INF
@cp $< $@
@mkdir -p $*/META-INF
@cp $< $@
-
#
endif
+endif
clean-manifests :
@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
clean-manifests :
@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);