From: Mathieu Baudier Date: Fri, 28 Jan 2022 10:00:58 +0000 (+0100) Subject: Introduce Makefile for Java build X-Git-Tag: argeo-commons-2.3.5~52 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=633a8acd189cc22f06944d278879601189be1bc8 Introduce Makefile for Java build --- diff --git a/Makefile b/Makefile index 649560c5a..21af0b9d0 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,70 @@ +include sdk.mk + MAKEDIRS = org.argeo.api.uuid BUILD_BASE=generated -.PHONY: clean all -all: +.PHONY: clean all base rcp +all: base $(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir);) clean: $(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir) clean;) + +JVM := /usr/lib/jvm/jre-11/bin/java +ECJ_JAR := /usr/share/java/ecj/ecj.jar + +BASE_CLASSPATH=\ +/usr/share/java/osgi-core/osgi.core.jar:$\ +/usr/share/java/osgi-compendium/osgi.cmpn.jar:$\ +/usr/share/java/ecj/ecj.jar:$\ +/usr/share/java/aqute-bnd/biz.aQute.bndlib.jar:$\ +/usr/share/java/slf4j/api.jar:$\ +/usr/share/java/commons-io.jar:$\ +/usr/share/java/commons-cli.jar:$\ +/usr/share/java/bcprov.jar:$\ +/usr/share/java/bcpkix.jar:$\ +/usr/share/java/commons-httpclient3.jar:$\ +/usr/share/java/postgresql-jdbc.jar + +base: + $(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BASE_CLASSPATH) \ + $(SDK_SRC_BASE)/org.argeo.api.uuid/src[-d $(SDK_SRC_BASE)/org.argeo.api.uuid/bin] \ + $(SDK_SRC_BASE)/org.argeo.api.acr/src[-d $(SDK_SRC_BASE)/org.argeo.api.acr/bin] \ + $(SDK_SRC_BASE)/org.argeo.api.cms/src[-d $(SDK_SRC_BASE)/org.argeo.api.cms/bin] \ + $(SDK_SRC_BASE)/org.argeo.init/src[-d $(SDK_SRC_BASE)/org.argeo.init/bin] \ + $(SDK_SRC_BASE)/org.argeo.util/src[-d $(SDK_SRC_BASE)/org.argeo.util/bin] \ + $(SDK_SRC_BASE)/org.argeo.cms.tp/src[-d $(SDK_SRC_BASE)/org.argeo.cms.tp/bin] \ + $(SDK_SRC_BASE)/org.argeo.cms/src[-d $(SDK_SRC_BASE)/org.argeo.cms/bin] \ + $(SDK_SRC_BASE)/org.argeo.cms.pgsql/src[-d $(SDK_SRC_BASE)/org.argeo.cms.pgsql/bin] \ + + +RCP_CLASSPATH=$(BASE_CLASSPATH):$\ +$(SDK_SRC_BASE)/org.argeo.api.uuid/bin:$\ +$(SDK_SRC_BASE)/org.argeo.api.acr/bin:$\ +$(SDK_SRC_BASE)/org.argeo.api.cms/bin:$\ +$(SDK_SRC_BASE)/org.argeo.util/bin:$\ +$(SDK_SRC_BASE)/org.argeo.cms/bin:$\ +/usr/share/java/tomcat-servlet-api.jar:$\ +/usr/share/java/eclipse/equinox.http.jetty.jar:$\ +/usr/lib/java/swt.jar:$\ +/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64_3.116.0.v20210304-1735:$\ +/usr/lib/eclipse/plugins/org.eclipse.e4.ui.css.core_0.13.0.v20210304-1735.jar:$\ +/usr/lib/eclipse/plugins/org.eclipse.e4.ui.css.swt_0.14.100.v20210304-1735.jar:$\ +/usr/lib/eclipse/plugins/org.eclipse.e4.ui.css.swt.theme_0.13.0.v20210304-1735.jar:$\ +/usr/lib/eclipse/plugins/org.eclipse.jface_3.22.100.v20210304-1735.jar:$\ +/usr/lib/eclipse/plugins/org.eclipse.core.commands_3.9.800.v20210304-1735.jar:$\ +/usr/share/java/eclipse/equinox.common.jar:$\ +/usr/share/java/sac.jar + + +rcp: base + $(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(RCP_CLASSPATH) \ + $(SDK_SRC_BASE)/org.argeo.cms.servlet/src[-d $(SDK_SRC_BASE)/org.argeo.cms.servlet/bin] \ + $(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/bin] \ + $(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/bin] \ + $(SDK_SRC_BASE)/org.argeo.cms.swt/src[-d $(SDK_SRC_BASE)/org.argeo.cms.swt/bin] \ + $(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/bin] \ + + diff --git a/org.argeo.api.uuid/jni/org_argeo_api_uuid/.gitignore b/org.argeo.api.uuid/jni/org_argeo_api_uuid/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/org.argeo.api.uuid/jni/org_argeo_api_uuid/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/org.argeo.api.uuid/jni/org_argeo_api_uuid/Makefile b/org.argeo.api.uuid/jni/org_argeo_api_uuid/Makefile index 1c45b52a9..336a38fac 100644 --- a/org.argeo.api.uuid/jni/org_argeo_api_uuid/Makefile +++ b/org.argeo.api.uuid/jni/org_argeo_api_uuid/Makefile @@ -1,5 +1,5 @@ NATIVE_PACKAGE := org_argeo_api_uuid -#include ../../../branch.mk include ../../../sdk.mk +include $(SDK_SRC_BASE)/sdk/jni.mk diff --git a/sdk/dnf-tp.sh b/sdk/dnf-tp.sh new file mode 100644 index 000000000..1005f8c0f --- /dev/null +++ b/sdk/dnf-tp.sh @@ -0,0 +1 @@ +sudo dnf install osgi-core osgi-compendium ecj aqute-bnd eclipse-equinox-osgi apache-commons-io apache-commons-cli apache-commons-exec bouncycastle bouncycastle-pkix tomcat-servlet-4.0-api jakarta-commons-httpclient eclipse-platform slf4j postgresql-jdbc \ No newline at end of file diff --git a/sdk/fedora-tp-rcp.target b/sdk/fedora-tp-rcp.target new file mode 100644 index 000000000..08540f7be --- /dev/null +++ b/sdk/fedora-tp-rcp.target @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sdk/includes.mk b/sdk/includes.mk index 8f1aedaeb..e69de29bb 100644 --- a/sdk/includes.mk +++ b/sdk/includes.mk @@ -1 +0,0 @@ -include $(SDK_SRC_BASE)/sdk/jni.mk diff --git a/sdk/jni.mk b/sdk/jni.mk index e22460dc3..b13ceaf00 100644 --- a/sdk/jni.mk +++ b/sdk/jni.mk @@ -18,7 +18,8 @@ LDFLAGS=-shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(MAJOR).$(MINOR) # # Generic Argeo # -BUILD_DIR := $(SDK_BUILD_BASE)/$(NATIVE_PACKAGE) +#BUILD_DIR := $(SDK_BUILD_BASE)/$(NATIVE_PACKAGE) +BUILD_DIR := ./build #META_INF_DIR := ./../META-INF ARCH := $(shell uname -p)