changeset 123:2b3b254e24cc

8078598: [Master] Consolidate DIO build into a single 'make all' job Summary: osgi_all target is added Reviewed-by: alkonsta
author snazarki
date Fri, 24 Apr 2015 13:59:33 +0400
parents eeb924bad166
children cbc878a0c120
files Makefile
diffstat 1 files changed, 19 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Apr 08 21:34:58 2015 +0400
+++ b/Makefile	Fri Apr 24 13:59:33 2015 +0400
@@ -195,8 +195,26 @@
 
 .PHONY: clean all dirs device-io bundle osgi
 
-all: $(ALL_TARGETS)
+# target osgi_build_i586, osgi_build_arm, and osgi_all maybe only available on Jenkins, you may not be able to run it on your local machione
 
+osgi_build_i586:
+	rm -rf $(OSGI_BUILD_DIR)/*
+	@echo "Build osgi bundle for i586..."
+	make bundle TARGET_CPU_LEGACY_LIB=i586 PI_TOOLS=/usr USER_C_FLAGS="-march=i586 -m32" USER_CXX_FLAGS="-march=i586 -m32" USER_LD_FLAGS="-march=i586 -m32" osgi
+
+osgi_build_arm:
+	rm -rf $(OSGI_BUILD_DIR)/*
+	@echo "Build osgi bundle for arm..."
+	make bundle PI_TOOLS=/opt/pi-tools osgi
+
+osgi_all: osgi_all_clean osgi_build_i586 osgi_build_arm
+	@echo "osgi bundles built for all architectures..."
+
+osgi_all_clean:
+	@echo "clean: removing $(OSGI_BUILD_DIR) and $(OSGI_DIST_DIR)"
+	rm -rf $(OSGI_BUILD_DIR)/*
+	rm -rf $(OSGI_DIST_DIR)/*
+    
 dirs:
 	@echo "Creating output directories"
 	@$(MKDIR) $(SO_OUT_DIR)
@@ -243,7 +261,6 @@
 
 osgi: $(LIB_NAME).jar lib$(LIB_NAME).so
 	rm -rf $(OSGI_BUILD_DIR)/*
-	rm -rf $(OSGI_DIST_DIR)/*
 	mkdir -p $(OSGI_DIST_DIR)
 	mkdir -p $(OSGI_BUILD_DIR)/lib
 	mkdir -p $(OSGI_BUILD_DIR)/OSGI-INF