[wip/infuse-pom-crisp] Added verbose encoding error check in CrispASN1

infuse-crisp-genom3/Makefile

@@ -20,6 +20,41 @@ include ../../architecture/genom3/module.mk
 # In InFuse we use ROS, so keep these options enabled by default
 PKG_SUGGESTED_OPTIONS+=         ros-client-c ros-client-ros ros-server
 
+# # This WAS SUPPOSED TO fix the double dependency on std_msgs in the
+# # generated package.xml files. This does not work here probably because
+# # PKG_OPTIONS here is empty. This should probably go in a 'define' to be
+# # expanded later, but I don't know how to do it. :(
+# ifneq (,$(filter ros-client-c,${PKG_OPTIONS}))
+# 	SUBST_CLASSES+=							fix-ros-client-c-depends
+# 	SUBST_STAGE.fix-ros-client-c-depends=	pre-install
+# 	SUBST_MESSAGE.fix-ros-client-c-depends=	Fixing repeated dependency on std_msgs for option ros-client-c
+# 	SUBST_FILES.fix-ros-client-c-depends=	../templates/ros/client/c/*/package.xml
+# 	SUBST_SED.fix-ros-client-c-depends=		-e '0,/<depend>std_msgs<\/depend>/! s/<depend>std_msgs<\/depend>//'
+# endif
+# ifneq (,$(filter ros-client-ros,${PKG_OPTIONS}))
+# 	SUBST_CLASSES+=								fix-ros-client-ros-depends
+# 	SUBST_STAGE.fix-ros-client-ros-depends=		pre-install
+# 	SUBST_MESSAGE.fix-ros-client-ros-depends=	Fixing repeated dependency on std_msgs for option ros-client-ros
+# 	SUBST_FILES.fix-ros-client-ros-depends=		../templates/ros/client/ros/*/package.xml
+# 	SUBST_SED.fix-ros-client-ros-depends=		-e '0,/<depend>std_msgs<\/depend>/! s/<depend>std_msgs<\/depend>//'
+# endif
+# ifneq (,$(filter ros-server,${PKG_OPTIONS}))
+# 	SUBST_CLASSES+=							fix-ros-server-depends
+# 	SUBST_STAGE.fix-ros-server-depends=		pre-install
+# 	SUBST_MESSAGE.fix-ros-server-depends=	Fixing repeated dependency on std_msgs for option ros-server
+# 	SUBST_FILES.fix-ros-server-depends=		../templates/ros/server/*/package.xml
+# 	SUBST_SED.fix-ros-server-depends=		-e '0,/<depend>std_msgs<\/depend>/! s/<depend>std_msgs<\/depend>//'
+# endif
+
+# Dirty hack to fix the repeated dependency because the solution commented
+# above didn't work. The installation of this package probably going to fail
+# if not compiled with ROS options
+SUBST_CLASSES+=							fix-std-msgs-depends
+SUBST_STAGE.fix-std-msgs-depends=		pre-install
+SUBST_MESSAGE.fix-std-msgs-depends=		Fixing repeated dependency on std_msgs
+SUBST_FILES.fix-std-msgs-depends=		../templates/ros/server/*/package.xml
+SUBST_FILES.fix-std-msgs-depends+=		../templates/ros/client/*/*/package.xml
+SUBST_SED.fix-std-msgs-depends=			-e '0,/<depend>std_msgs<\/depend>/! s/<depend>std_msgs<\/depend>//'
 
 include ../../interfaces/openrobots-idl/depend.mk
 include ../../wip/infuse-idl/depend.mk

infuse-pom-crisp/Makefile

@@ -2,6 +2,7 @@
 # Created:			Quentin Labourey on Tue, 21 Aug 2018
 #
 
+PKGREVISION=            1
 NAME=                   infuse-pom-crisp
 VERSION=                0.1.1
 DISTNAME=               ${NAME}-${VERSION}

infuse-pom-crisp/distinfo

 SHA1 (infuse-pom-crisp-0.1.1.tar.gz) = a4c03c2b5f1b35de923f35bbddc81e732e7221ca
 RMD160 (infuse-pom-crisp-0.1.1.tar.gz) = 630eb690f22c5a96bdb37fe019ff0c26a5935f84
 Size (infuse-pom-crisp-0.1.1.tar.gz) = 5257 bytes
+SHA1 (patch-aa) = fb1b7a38f1d34e5d1922b592ebcca4b0780391d6

infuse-pom-crisp/patches/patch-aa

+--- src/CrispASN1.cpp	2018-08-22 23:20:14.000000000 +0200
++++ src/CrispASN1.cpp	2018-08-23 10:44:15.111770881 +0200
+@@ -48,7 +48,10 @@
+     BitStream_Init(&bstream, bstream.buf, asn1SccTransformWithCovariance_REQUIRED_BYTES_FOR_ENCODING);
+     res = asn1SccTransformWithCovariance_Encode(&asnPose, &bstream, &errorCode, TRUE);
+     if(!res)
++    {
++        cout << "error CrispASN1 : encoding error : " << errorCode << endl;
+         return 0;
++    }
+ 
+     return 1;
+ }