[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2672-g2310cbb

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  2310cbb7c81f94b304eaf5936871c7a041183280 (commit)
       via  447ddf43fbc769438fce88f54017c4e0b0fedb10 (commit)
      from  5851568a9a1e7fcb8ee45c46e7809e33643d969b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2310cbb7c81f94b304eaf5936871c7a041183280
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 17:31:21 2012 +0100

    [BUILDROOT] Improve as_devices package integration/build in BR

commit 447ddf43fbc769438fce88f54017c4e0b0fedb10
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 16:37:03 2012 +0100

    Indentation

-----------------------------------------------------------------------

Summary of changes:
 buildroot/package/armadeus/as_devices/Config.in    |   26 ++--
 .../package/armadeus/as_devices/as_devices.mk      |  150 +++++++-------------
 ...buildroot-Adding_copy_method_for_download.patch |    2 +-
 target/packages/as_devices/Makefile                |   15 ++-
 4 files changed, 76 insertions(+), 117 deletions(-)

diff --git a/buildroot/package/armadeus/as_devices/Config.in b/buildroot/package/armadeus/as_devices/Config.in
index 7791781..db1b4e0 100644
--- a/buildroot/package/armadeus/as_devices/Config.in
+++ b/buildroot/package/armadeus/as_devices/Config.in
@@ -5,27 +5,33 @@ config BR2_PACKAGE_AS_DEVICES
           Library that drives armadeus specific devices.
 
 config BR2_PACKAGE_AS_DEVICES_TESTS
-	bool "as_device test"
+	bool "as_devices test tool"
 	depends on BR2_PACKAGE_AS_DEVICES
 	help
-	  Executable that can test all as_devices
+	  Executable that can test all as_devices modules.
 
 config BR2_PACKAGE_AS_DEVICES_CPP
-    depends on BR2_PACKAGE_AS_DEVICES
-    bool "wrapper C++"
-    default n
-    help
-        C++ wrapper for as_devices library
+	depends on BR2_PACKAGE_AS_DEVICES
+	depends on BR2_TOOLCHAIN_BUILDROOT_CXX
+	bool "C++ wrapper"
+	help
+	  C++ wrapper for as_devices library.
 
 config BR2_PACKAGE_AS_DEVICES_TESTS_CPP
-	bool "as_device C++ wrappers test"
+	bool "as_devices C++ wrapper test tool"
 	depends on BR2_PACKAGE_AS_DEVICES_CPP
 	help
-	  Executable that can test as_devices C++ wrappers
+	  Executable that can test as_devices C++ wrappers.
 
 config BR2_PACKAGE_AS_DEVICES_PYTHON
 	depends on BR2_PACKAGE_AS_DEVICES
 	depends on BR2_PACKAGE_PYTHON
 	bool "Python wrapper"
 	help
-	  Python wrapper for as_devices library. needs python.
+	  Python wrapper for as_devices library. Needs python.
+
+comment "C++ wrapper requires a toolchain with C++ support"
+	depends on !BR2_TOOLCHAIN_BUILDROOT_CXX
+
+comment "Python wrapper requires python interpreter"
+	depends on BR2_PACKAGE_AS_DEVICES && !BR2_PACKAGE_PYTHON
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index f18fe06..5c631ca 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -4,126 +4,74 @@
 #
 #############################################################
 
-PYTHON:=python2.7
+AS_DEVICES_VERSION = 0.16
+AS_DEVICES_SITE = $(TOPDIR)/../target/packages/as_devices
+AS_DEVICES_SITE_METHOD = copy
+AS_DEVICES_INSTALL_STAGING = YES
 
-AS_DEVICES_VER:=0.16
-AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
-AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
-AS_DEVICES_CAT:=zcat
-
-AS_DEVICES_BINARY:=libas_devices.so
-AS_DEVICES_TARGET_DIR:=usr/lib
-AS_DEVICES_TARGET_BINARY:=$(AS_DEVICES_TARGET_DIR)/$(AS_DEVICES_BINARY)
-
-# C++ wrapper variables
-AS_DEVICES_CPP_BINARY:=libas_devices_cpp.so
-AS_DEVICES_CPP_TARGET_DIR:=usr/lib
-AS_DEVICES_CPP_TARGET_BINARY:=$(AS_DEVICES_CPP_TARGET_DIR)/$(AS_DEVICES_CPP_BINARY)
-
-# Python wrapper variables
-AS_DEVICES_PYTHON_BINARY:=AsGpio_wrap.so
-AS_DEVICES_PYTHON_MODULE:=AsDevices
-AS_DEVICES_PYTHON_TARGET_DIR:=usr/lib/$(PYTHON)/
-AS_DEVICES_PYTHON_TARGET_BINARY:=$(AS_DEVICES_PYTHON_TARGET_DIR)/$(AS_DEVICES_PYTHON_MODULE)
-
-AS_DEVICES_TEST_BINARY:=test_cdevices
-AS_DEVICES_TEST_TARGET_DIR:=/usr/bin
-AS_DEVICES_TEST_TARGET_BINARY:=$(AS_DEVICES_TEST_TARGET_DIR)/$(AS_DEVICES_TEST_BINARY)
-
-AS_DEVICES_TEST_CPP_BINARY:=test_cppdevices
-AS_DEVICES_TEST_CPP_TARGET_DIR:=/usr/bin
-AS_DEVICES_TEST_CPP_TARGET_BINARY:=$(AS_DEVICES_TEST_CPP_TARGET_DIR)/$(AS_DEVICES_TEST_CPP_BINARY)
-
-AS_DEVICES_BINARIES=$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY)
-endif
+AS_DEVICES_BUILD_TARGET = c_target
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_CPP)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY)
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS_CPP)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY)
-endif
+AS_DEVICES_BUILD_TARGET += cpp_target
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY)
+AS_DEVICES_DEPENDENCIES += python
+AS_DEVICES_BUILD_TARGET += python_target
 endif
 
-# Copy directory in build_armâ¦
-$(AS_DEVICES_DIR)/Makefile:
-	mkdir -p $(AS_DEVICES_DIR)/
-	cp -rf $(AS_DEVICES_SOURCE)/* $(AS_DEVICES_DIR)
-
-# Compile as_devices library using the makefile
-$(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY): $(AS_DEVICES_DIR)/Makefile
-	#XXX: BR2_TARGET_UBOOT_BOARDNAME  is wrong, to be fixed
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(AS_DEVICES_DIR)/c ARMADEUS_BOARD_NAME=$(BR2_TARGET_UBOOT_BOARDNAME)
+AS_DEVICES_MAKE_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)"
+ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
+AS_DEVICES_MAKE_ENV += PYINC="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)"
+AS_DEVICES_MAKE_ENV += PYLIB="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)"
+endif
+#XXX: BR2_TARGET_UBOOT_BOARDNAME  is wrong, to be fixed
+AS_DEVICES_MAKE_ENV += ARMADEUS_BOARD_NAME=$(BR2_TARGET_UBOOT_BOARDNAME)
 
-# Install library on staging dir
-$(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY): $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY)
-	$(MAKE) INSTALL_DIR=$(STAGING_DIR) -C $(AS_DEVICES_DIR) install
+define AS_DEVICES_BUILD_CMDS
+	$(MAKE) $(AS_DEVICES_MAKE_ENV) -C $(@D) $(AS_DEVICES_BUILD_TARGET)
+endef
 
-# install library on target
-$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY): $(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY)
-	$(MAKE) INSTALL_DIR=$(TARGET_DIR) STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" -C $(AS_DEVICES_DIR) install-exe
+define AS_DEVICES_INSTALL_STAGING_CMDS
+	$(MAKE) INSTALL_DIR=$(STAGING_DIR) -C $(@D) install
+endef
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS)),y)
-
-$(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY): $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_BINARY)
-	cp -rf $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_BINARY) $(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY)
-
-$(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_BINARY): $(AS_DEVICES_DIR)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" $(AS_DEVICES_TEST_BINARY) -C $(AS_DEVICES_DIR)
+define AS_DEVICES_INSTALL_TEST
+	cp -rf $(@D)/test_cdevices $(TARGET_DIR)/usr/bin/
+endef
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_CPP)),y)
-$(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY)
-	install -D $< $@
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY)
-
-$(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY): $(AS_DEVICES_DIR)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/cpp
-
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS_CPP)),y)
-
-$(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_CPP_BINARY)
-	cp -rf $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_CPP_BINARY) $(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY)
-
-$(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_CPP_BINARY): $(AS_DEVICES_DIR)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" $(AS_DEVICES_TEST_CPP_BINARY) -C $(AS_DEVICES_DIR)
+define AS_DEVICES_INSTALL_CPP_LIB
+	install -D $(@D)/cpp/libas_devices_cpp.so $(TARGET_DIR)/usr/lib/
+endef
 endif
 
+ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS_CPP)),y)
+define AS_DEVICES_INSTALL_CPP_TEST
+	cp -rf $(@D)/test_cppdevices $(TARGET_DIR)/usr/bin/
+endef
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
-
-$(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY): python $(AS_DEVICES_DIR)/python/AsDevices/wrappers/$(AS_DEVICES_PYTHON_BINARY)
-	cp -rf $(AS_DEVICES_DIR)/python/AsDevices $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_DIR)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY)/wrappers/*.so
-
-$(AS_DEVICES_DIR)/python/AsDevices/wrappers/$(AS_DEVICES_PYTHON_BINARY): python $(AS_DEVICES_DIR)/python/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/python STAGING_DIR=$(STAGING_DIR)
-
-endif
-
-as_devices: $(AS_DEVICES_BINARIES)
-
-as_devices-clean:
-	rm -f $(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
-	-$(MAKE) -C $(AS_DEVICES_DIR)/c clean
-
-as_devices-dirclean:
-	rm -rf $(AS_DEVICES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES)),y)
-TARGETS+=as_devices
+define AS_DEVICES_INSTALL_PYTHON
+	cp -rf $(@D)/python/AsDevices $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/
+endef
 endif
 
+define AS_DEVICES_INSTALL_TARGET_CMDS
+	$(MAKE) INSTALL_DIR=$(TARGET_DIR) \
+		STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
+		-C $(@D) install-exe
+	$(AS_DEVICES_INSTALL_TEST)
+	$(AS_DEVICES_INSTALL_CPP_LIB)
+	$(AS_DEVICES_INSTALL_CPP_TEST)
+	$(AS_DEVICES_INSTALL_PYTHON)
+endef
+
+define AS_DEVICES_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package/armadeus,as_devices))
diff --git a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
index 8ceab75..dd2af1b 100644
--- a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
+++ b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
@@ -49,7 +49,7 @@ Index: buildroot/package/Makefile.package.in
 +endef
 +
 +define SHOW_EXTERNAL_DEPS_COPY
-+  echo $(2)
++	echo $(2)
 +endef
 +
 +
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index d014f88..f59943a 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -24,8 +24,13 @@ CPP_INCLUDE=cpp
 
 .PHONY: all install install-exe clean
 
-all: $(C_BINARY) $(P_WRAPPER)
-	#$(CPP_BINARY)
+all: $(C_BINARY) $(P_WRAPPER) $(CPP_BINARY)
+
+c_target: $(C_BINARY)
+
+cpp_target: $(CPP_BINARY)
+
+python_target: $(P_WRAPPER)
 
 $(C_BINARY): main.c test_c.h $(C_LIB)
 	$(CC) $(CFLAGS) main.c $(C_LIB) -o $(C_BINARY) -I$(C_INCLUDE) -lm
@@ -39,8 +44,8 @@ $(CPP_LIB): $(C_LIB)
 $(C_LIB):
 	make -C c/
 
-$(P_WRAPPER):
-	make -C python/ STAGING_DIR=$(STAGING_DIR)
+$(P_WRAPPER): $(C_LIB)
+	make -C python/ STAGING_DIR=$(ARMADEUS_STAGING_DIR)
 	touch $(P_WRAPPER)
 
 install:
@@ -57,5 +62,5 @@ clean:
 	make -C cpp/ clean
 	rm -f $(P_WRAPPER)
 	make -C python/ clean
-	rm -f $(C_BINARY) # $(CPP_BINARY)
+	rm -f $(C_BINARY) $(CPP_BINARY)
 


hooks/post-receive
-- 
armadeus


