X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=bootstrap%2FMakefile;h=cdae8df4ed93fb158cbf534949be29680ae313fa;hb=afd7fd6484e95660ae5d285e11d6520b18a05a00;hp=8029b42fa3e2f30f4de103ba6efaa23000d7814d;hpb=62ccf9f33b28bcabd29248a68c9f51a113ee88c7;p=gpl%2Fargeo-tp.git

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index 8029b42..cdae8df 100644
--- a/bootstrap/Makefile
+++ b/bootstrap/Makefile
@@ -1,5 +1,4 @@
-include ../sdk.mk
-include ../common.mk
+-include sdk.mk
 
 ECJ_VERSION=4.26
 
@@ -12,10 +11,10 @@ SLF4J_VERSION=1.7.36
 ORIGIN_BASE=$(HOME)/.cache/argeo/build/origin
 BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
 
-ECJ_BASE=$(BOOTSTRAP_BASE)/ecj
+ECJ_BASE=./ecj
 ECJ_SRC=$(ECJ_BASE)/OSGI-OPT/src
 
-BNDLIB_BASE=$(BOOTSTRAP_BASE)/bndlib
+BNDLIB_BASE=./bndlib
 BNDLIB_SRC=$(BNDLIB_BASE)/OSGI-OPT/src
 
 OSGI_BASE=$(BOOTSTRAP_BASE)/osgi
@@ -27,40 +26,35 @@ $(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar \
 $(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar \
 $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar \
 $(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz
-	
 
-bootstrap-download-sources: $(SOURCE_ARCHIVES)
+all: ecj-build bndlib-build	
+	make -C org.argeo.tp.build all
 
-$(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar:
-	mkdir -p $(ORIGIN_BASE)
-	wget -c -O $(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar https://ftp-stud.hs-esslingen.de/Mirrors/eclipse/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-$(ECJ_VERSION).jar
+ecj-build:
+	mkdir -p $(BOOTSTRAP_BASE)
+	# list sources
+	find $(ECJ_BASE)/OSGI-OPT/src | grep "\.java" > $(BOOTSTRAP_BASE)/ecj.todo
+	# build
+	$(JAVA_HOME)/bin/javac -d $(ECJ_BASE) -source 17 -target 17 -Xlint:none @$(BOOTSTRAP_BASE)/ecj.todo
 	
-$(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz:
-	mkdir -p $(ORIGIN_BASE)
-	wget -c -O $(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz https://github.com/bndtools/bnd/archive/refs/tags/$(BND_VERSION).REL.tar.gz
-
-$(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar:
-	mkdir -p $(ORIGIN_BASE)/org.osgi
-	wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.core/$(OSGI_CORE_VERSION)/osgi.core-$(OSGI_CORE_VERSION)-sources.jar
-
-$(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar:
-	mkdir -p $(ORIGIN_BASE)/org.osgi
-	wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.cmpn/$(OSGI_CMPN_VERSION)/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar
-
-$(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar:
-	mkdir -p $(ORIGIN_BASE)/org.osgi
-	wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.annotation/$(OSGI_ANNOTATION_VERSION)/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar
-
-$(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar:
-	mkdir -p $(ORIGIN_BASE)/org.slf4j
-	wget -c -O $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/$(SLF4J_VERSION)/slf4j-api-$(SLF4J_VERSION)-sources.jar
+bndlib-build: ecj-build
+	$(JAVA_HOME)/bin/java -cp $(ECJ_BASE) org.eclipse.jdt.internal.compiler.batch.Main -nowarn \
+		-source 17 -target 17 \
+		$(BNDLIB_SRC) \
+		-d $(BNDLIB_BASE)
 
-all: ecj-build bndlib-build	
-	make -C org.argeo.tp.build all
+clean:
+	$(RM) -rf $(BOOTSTRAP_BASE)
+	find $(ECJ_BASE) -name "*.class" -type f -exec rm -f {} \;
+	find $(BNDLIB_BASE) -name "*.class" -type f -exec rm -f {} \;
+	make -C org.argeo.tp.build clean
 
-ecj: ecj-build
+clean-sources:
+	$(RM) -rf $(ECJ_BASE)
+	$(RM) -rf $(BNDLIB_BASE)
 
-ecj-build:
+bootstrap-prepare-sources: bootstrap-download-sources
+	## ECJ
 	mkdir -p $(ECJ_BASE)
 	cd $(ECJ_BASE) && jar -xf $(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar
 	# remove ant-dependent class
@@ -72,32 +66,24 @@ ecj-build:
 	$(RM) -rf $(ECJ_BASE)/scripts
 	# TODO: keep the service files
 	$(RM) -rf  $(ECJ_BASE)/META-INF
-	# list sources
-	find $(ECJ_BASE)/org | grep "\.java" > $(BOOTSTRAP_BASE)/ecj.todo
-	# copy sources
+
+	# copy sources and resources
 	mkdir -p $(ECJ_SRC)
 	cp -r $(ECJ_BASE)/org $(ECJ_SRC)
-	# build
-	$(JAVA_HOME)/bin/javac -d $(ECJ_BASE) -source 17 -target 17 -Xlint:none @$(BOOTSTRAP_BASE)/ecj.todo
-	# remove sources
-	cd $(ECJ_BASE) && find . -name "*.java" -name "*.html" -type f -exec rm -f {} \;
+	# remove java sources
+	cd $(ECJ_BASE) && find org -name "*.java" -type f -exec rm -f {} \;
+	cd $(ECJ_BASE) && find org -name "*.html" -type f -exec rm -f {} \;
 	
-bndlib-build:
+	## BNDLIB
 	# copy sources
+	mkdir -p $(BOOTSTRAP_BASE)
 	cd $(BOOTSTRAP_BASE) && tar -xzf $(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz
 	mkdir -p $(BNDLIB_SRC)
 	cp -r $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL/aQute.libg/src/* $(BNDLIB_SRC)
 	cp -r $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL/biz.aQute.bndlib/src/* $(BNDLIB_SRC)
 	cp -r $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL/biz.aQute.bnd.annotation/src/* $(BNDLIB_SRC)	
-	$(RM) -rf $(BNDLIB_SRC)/aQute/bnd/annotation/spi
 	$(RM) -rf $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL
-	
-	# SLF4J
-	cd $(BNDLIB_SRC) && jar -xf $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar
-	$(RM) -rf $(BNDLIB_SRC)/META-INF
-	#rm -rf $(BNDLIB_SRC)/org/slf4j/impl
-	cp -rv ../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* $(BNDLIB_SRC)
-	
+
 	# OSGi
 	mkdir -p $(OSGI_BASE)
 	cd $(OSGI_BASE) && jar -xf $(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar
@@ -113,20 +99,41 @@ bndlib-build:
 	cp -r $(OSGI_BASE)/org/osgi/dto $(BNDLIB_SRC)/org/osgi
 	cp -r $(OSGI_BASE)/org/osgi/service/repository $(BNDLIB_SRC)/org/osgi/service
 	cp -r $(OSGI_BASE)/org/osgi/service/log $(BNDLIB_SRC)/org/osgi/service
+
+	# SLF4J
+	cd $(BNDLIB_SRC) && jar -xf $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar
+	$(RM) -rf $(BNDLIB_SRC)/META-INF
+	cp -rv ../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* $(BNDLIB_SRC)
+
+	# clean up BNDLIB
+	$(RM) -rf $(BNDLIB_SRC)/aQute/bnd/annotation/spi
+	$(RM) -rf $(BNDLIB_SRC)/aQute/bnd/junit	
+
+bootstrap-download-sources: $(SOURCE_ARCHIVES)
+
+$(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar:
+	mkdir -p $(ORIGIN_BASE)
+	wget -c -O $(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar https://ftp-stud.hs-esslingen.de/Mirrors/eclipse/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-$(ECJ_VERSION).jar
 	
-	# clean up
-	rm -rf $(BNDLIB_SRC)/aQute/bnd/junit
-	
-	# build
-	$(JAVA_HOME)/bin/java -cp $(ECJ_BASE) org.eclipse.jdt.internal.compiler.batch.Main -nowarn \
-		-source 17 -target 17 \
-		$(BNDLIB_SRC) \
-		-d $(BNDLIB_BASE)
+$(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz:
+	mkdir -p $(ORIGIN_BASE)
+	wget -c -O $(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz https://github.com/bndtools/bnd/archive/refs/tags/$(BND_VERSION).REL.tar.gz
 
-	# remove classes	
-	#rm -rf $(BNDLIB_SRC)/org/slf4j/impl
-	#rm -rf $(BNDLIB_BASE)/org/slf4j/impl
+$(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar:
+	mkdir -p $(ORIGIN_BASE)/org.osgi
+	wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.core/$(OSGI_CORE_VERSION)/osgi.core-$(OSGI_CORE_VERSION)-sources.jar
 
-clean:
-	rm -rf $(BOOTSTRAP_BASE)
-	make -C org.argeo.tp.build clean
+$(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar:
+	mkdir -p $(ORIGIN_BASE)/org.osgi
+	wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.cmpn/$(OSGI_CMPN_VERSION)/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar
+
+$(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar:
+	mkdir -p $(ORIGIN_BASE)/org.osgi
+	wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.annotation/$(OSGI_ANNOTATION_VERSION)/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar
+
+$(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar:
+	mkdir -p $(ORIGIN_BASE)/org.slf4j
+	wget -c -O $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/$(SLF4J_VERSION)/slf4j-api-$(SLF4J_VERSION)-sources.jar
+
+
+