projects
/
gpl
/
argeo-tp.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6259e1
)
Improve local install
author
Mathieu Baudier <mbaudier@argeo.org>
Fri, 8 Dec 2023 16:22:06 +0000
(17:22 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Fri, 8 Dec 2023 16:22:06 +0000
(17:22 +0100)
rebuild/org.argeo.tp.utils/Makefile
patch
|
blob
|
history
diff --git
a/rebuild/org.argeo.tp.utils/Makefile
b/rebuild/org.argeo.tp.utils/Makefile
index e4d6df1190717e1eff389812aafc57f84dc3dedd..c7f8e976ca09b2adfa62928316777c27ae78bdcc 100644
(file)
--- a/
rebuild/org.argeo.tp.utils/Makefile
+++ b/
rebuild/org.argeo.tp.utils/Makefile
@@
-3,15
+3,28
@@
include ../../sdk.mk
export NO_SDK_LEGAL := true
export NO_SDK_LEGAL := true
+A2_CATEGORY = org.argeo.tp.sys
+
+# GNU
+prefix ?= /usr/local
+exec_prefix ?= $(prefix)
+libdir ?= $(exec_prefix)/lib
+A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2
+
MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
MBOX_TARGET_EXEC=libmbox.so
## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
MBOX_TARGET_EXEC=libmbox.so
## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
-ANGUS_VERSION=2.0.2
+ANGUS_BRANCH=2.0
+ANGUS_VERSION=$(ANGUS_BRANCH).2
all: retrieve-angus-mbox osgi jni-angus-mbox
all: retrieve-angus-mbox osgi jni-angus-mbox
-install: osgi-install
+install:
+ mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
+ # Angus mbox
+ cp -Rv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar $(A2_INSTALL_TARGET)/$(A2_CATEGORY)
+ cp -v $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
uninstall: osgi-uninstall
uninstall: osgi-uninstall
@@
-33,7
+46,6
@@
retrieve-angus-mbox:
javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
rm -rf org.eclipse.angus.mail.mbox/bin
javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
rm -rf org.eclipse.angus.mail.mbox/bin
-A2_CATEGORY = org.argeo.tp.sys
BUNDLES = \
org.eclipse.angus.mail.mbox \
BUNDLES = \
org.eclipse.angus.mail.mbox \