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

diff --git a/repackage/Makefile b/repackage/Makefile
index 40aef3e..e846c0b 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -1,11 +1,4 @@
 include ../sdk.mk
-.PHONY: clean all
-
-all: distribution
-
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 
 CATEGORIES=\
 org.argeo.tp.sdk \
@@ -15,36 +8,29 @@ 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 \
 lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt \
+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.apache \
-org.argeo.tp.jetty \
+org.argeo.tp.httpd \
+org.argeo.tp.utils \
+org.argeo.tp.publish \
+org.argeo.tp.math \
 org.argeo.tp.jcr \
-org.argeo.tp.formats \
-org.argeo.tp.poi \
-org.argeo.tp.gis \
-
-
-distribution:
-	$(JVM) -cp \
-	 $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar:$(BOOTSTRAP_BASE)/org.argeo.slc.api/bin:$(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin \
-	 $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES)
+org.argeo.tp.office \
+org.argeo.tp.earth \
+crypto/full/org.argeo.tp.crypto \
+crypto/fips/org.argeo.tp.crypto \
 
-clean:
-	rm -rf $(A2_OUTPUT)/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/*/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/*/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/*/*/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/*/*/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/*/*/*/org.argeo.tp.*
+# 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