From 9baea23a9a635270ff4e08282dfdcb4b62175e31 Mon Sep 17 00:00:00 2001
From: Olivier XILLO <oxillo@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:13:45 +0100
Subject: [PATCH] bugfix #2903 Addon data copy (#6244)

#changelog #makefiles
---
 CHANGELOG.md                                  |  7 +++++++
 .../project/makefileCommon/compile.project.mk | 20 ++++++++-----------
 .../project/makefileCommon/config.addons.mk   |  2 ++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2e4ed33980..609ab87f075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+
+PLATFORM/IDE SPECIFIC
+-----------------
+
+### makefiles
+- makefiles: addon data not being copied(#2903).
+
 ADDONS
 ------
 ### ofxOpenCv
diff --git a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
index a1f8a632b3f..1d4a3ea268c 100644
--- a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
+++ b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
@@ -131,9 +131,6 @@ ifndef ABIS_TO_COMPILE_RELEASE
 else
 	@$(foreach abi,$(ABIS_TO_COMPILE_RELEASE),$(MAKE) ReleaseABI ABI=$(abi) &&) echo
 endif
-ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
-	@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA=$(PROJECT_ADDONS_DATA)
-endif
 
 
 
@@ -148,9 +145,6 @@ ifndef ABIS_TO_COMPILE_DEBUG
 else
 	@$(foreach abi,$(ABIS_TO_COMPILE_DEBUG),$(MAKE) DebugABI ABI=$(abi) &&) echo
 endif
-ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
-	@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA=$(PROJECT_ADDONS_DATA)
-endif
 
 ReleaseNoOF:
 	@echo Compiling $(APPNAME) for Release
@@ -159,9 +153,6 @@ ifndef ABIS_TO_COMPILE_RELEASE
 else
 	@$(foreach abi,$(ABIS_TO_COMPILE_RELEASE),$(MAKE) ReleaseABI ABI=$(abi) &&) echo
 endif
-ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
-	@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA=$(PROJECT_ADDONS_DATA)
-endif
 
 DebugNoOF:
 	@echo Compiling $(APPNAME) for Debug
@@ -170,15 +161,18 @@ ifndef ABIS_TO_COMPILE_DEBUG
 else
 	@$(foreach abi,$(ABIS_TO_COMPILE_DEBUG),$(MAKE) DebugABI ABI=$(abi) &&) echo
 endif
-ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
-	@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA=$(PROJECT_ADDONS_DATA)
-endif
 
 ReleaseABI: $(TARGET)
+ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
+	@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA="$(PROJECT_ADDONS_DATA)"
+endif
 	@$(MAKE) afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_RELEASE)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET)
 	@$(PROJECT_AFTER)
 
 DebugABI: $(TARGET)
+ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
+	@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA="$(PROJECT_ADDONS_DATA)"
+endif
 	@$(MAKE) afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_DEBUG)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET)
 	@$(PROJECT_AFTER)
 
@@ -444,6 +438,8 @@ after: $(TARGET_NAME)
 	@echo
 
 copyaddonsdata:
+	@echo 
+	@echo "Copying addons data"
 	@mkdir -p bin/data
 	@cp -rf $(PROJECT_ADDONS_DATA) bin/data/
 
diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
index f798081cd88..c8919a0898c 100644
--- a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
+++ b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
@@ -261,4 +261,6 @@ ifdef MAKEFILE_DEBUG
 	$(foreach v, $(PROJECT_ADDONS_INCLUDES_CFLAGS),$(info $(v)))
 	$(info ---PROJECT_ADDONS_LDFLAGS---)
 	$(foreach v, $(PROJECT_ADDONS_LDFLAGS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_DATA---)
+	$(foreach v, $(PROJECT_ADDONS_DATA),$(info $(v)))
 endif