Move crypto to selectable A2 (FIPS or full)

[gpl/argeo-tp.git] / repackage / Makefile

diff --git a/repackage/Makefile b/repackage/Makefile
index eb92d8af8d29cf83aff14d11adbc4dc49cd1e8e3..bfee248341cdfd7aab0e27a2c878f916277a200f 100644 (file)
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -1,11 +1,4 @@
 include ../sdk.mk
-include ../common.mk
-
-.PHONY: clean all
-
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 
 CATEGORIES=\
 org.argeo.tp.sdk \
@@ -23,37 +16,15 @@ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.tp \
-org.argeo.tp.crypto \
 org.argeo.tp.jetty \
 org.argeo.tp.utils \
-org.argeo.tp.sql \
 org.argeo.tp.jcr \
 org.argeo.tp.poi \
 org.argeo.tp.gis \
+crypto/full/org.argeo.tp.crypto \
+crypto/fips/org.argeo.tp.crypto \
 
-TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
-
-BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
-
-all: $(BUILD_BASE)/repackaged 
-
-.SECONDEXPANSION:
-
-$(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
-$(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
-       # TODO make it more configurable / centralise in Argeo Build
-       $(JVM) -cp $(A2_OUTPUT)/org.argeo.tp.log/org.argeo.tp.syslogger.2.3.jar:$(A2_OUTPUT)/org.argeo.tp.build/biz.aQute.bndlib.5.3.jar \
-        $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
-       touch $(BUILD_BASE)/repackaged
-
-$(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
-       @rm -rf $(dir $@)
-       @mkdir -p $(dir $@) 
-       @touch $@
-
-clean:
-       $(foreach category, $(CATEGORIES), rm -rf $(A2_OUTPUT)/$(category))
-       $(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
-       rm -f $(BUILD_BASE)/repackaged
+# NOTE: FIPS support is experimental, in order to preapre for the 2.0.0 stream
+# see https://www.bouncycastle.org/fips_java_roadmap.html
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/repackage.mk
\ No newline at end of file