X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=repackage%2FMakefile;h=e846c0b51f208e1aa7b0fedd92f0d4ac805aca48;hb=189e09096d5663f2d40eee792362a0724b5c0900;hp=3b9f86a60bc6cb4e8a45ad97cd3a345c4418a938;hpb=62ccf9f33b28bcabd29248a68c9f51a113ee88c7;p=gpl%2Fargeo-tp.git

diff --git a/repackage/Makefile b/repackage/Makefile
index 3b9f86a..e846c0b 100644
--- 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 \
@@ -15,6 +8,10 @@ osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
+lib/linux/x86_64/org.argeo.tp \
+lib/linux/aarch64/org.argeo.tp \
+lib/win32/x86_64/org.argeo.tp \
+lib/macosx/x86_64/org.argeo.tp \
 lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \
 lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \
@@ -23,38 +20,17 @@ 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.httpd \
 org.argeo.tp.utils \
-org.argeo.tp.sql \
+org.argeo.tp.publish \
+org.argeo.tp.math \
 org.argeo.tp.jcr \
-org.argeo.tp.poi \
-org.argeo.tp.gis \
-
-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)
-	#$(JVM) -cp \
-	# $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar 
-	$(JVM) -cp $(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 $@
+org.argeo.tp.office \
+org.argeo.tp.earth \
+crypto/full/org.argeo.tp.crypto \
+crypto/fips/org.argeo.tp.crypto \
 
-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