Fix exporting simpleini sources

MRPT · Oct 19, 2020 · fc369e7 · fc369e7
1 parent adfa370
commit fc369e7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md
@@ -1,8 +1,9 @@
 \page changelog Change Log
 
-# Version 2.1.1: (Under development)
+# Version 2.1.2: (Under development)
 - BUG FIXES:
   - Fix wrong coloring of graph edges in mrpt::opengl::graph_visualize() (Closes [#1111](https://github.com/MRPT/mrpt/issues/1111)).
+  - Fix Debian Lintian error: exporting copyrighted sources as part of simpleini submodule.
 
 ------
 # Version 2.1.1: Released Oct 19th, 2020

diff --git a/scripts/prepare_debian.sh b/scripts/prepare_debian.sh
@@ -64,14 +64,18 @@ if [ -f version_prefix.txt ];
 then
 	MRPTSRC=`pwd`
 
-  if [ -f $HOME/mrpt_release/mrpt*.tar.gz ];
-  then
-    echo "## release file already exists. Reusing it."
-  else
+  # Do not reuse the sources since each Ubuntu version may require different sources...
+  # Re-add after Bionic 18.04 EOL, which right now (2020) is a special case since
+  # it misses libsimpleini-dev
+  #
+  #if [ -f $HOME/mrpt_release/mrpt*.tar.gz ];
+  #then
+  #  echo "## release file already exists. Reusing it."
+  #else
     source scripts/prepare_release.sh
     echo
     echo "## Done prepare_release.sh"
-  fi
+  #fi
 else
 	echo "ERROR: Run this script from the MRPT root directory."
 	exit 1

diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh
@@ -45,8 +45,7 @@ then
 	git archive --format=tar HEAD | tar -x -C ${OUT_DIR}
 
 	# Include external submodules:
-	# TODO: Remove "simpleini" when bionic 18.04 is EOL.
-	EXTERNAL_MODS="nanogui nanogui/ext/nanovg googletest libfyaml rplidar_sdk simpleini"
+	EXTERNAL_MODS="nanogui nanogui/ext/nanovg googletest libfyaml rplidar_sdk ${MRPT_PKG_EXPORTED_SUBMODULES}"
 	for MOD in $EXTERNAL_MODS;
 	do
 		cd ${MRPTSRC}/3rdparty/$MOD

diff --git a/scripts/prepare_ubuntu_pkgs_for_ppa.sh b/scripts/prepare_ubuntu_pkgs_for_ppa.sh
@@ -19,6 +19,9 @@ LST_DISTROS=(xenial bionic eoan focal groovy)
 # Special case for Xenial: enforce g++7
 export MRPT_PKG_CUSTOM_CMAKE_PARAMS_xenial="-DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCMAKE_CXX_COMPILER=/usr/bin/g++-7"
 
+# Special case for Bionic: use embedded version of simpleini
+export MRPT_PKG_EXPORTED_SUBMODULES_bionic="simpleini"
+
 
 # Checks
 # --------------------------------
@@ -72,6 +75,10 @@ do
 	cd ${MRPTSRC}
 	auxVarName=MRPT_PKG_CUSTOM_CMAKE_PARAMS_${DEBIAN_DIST}
 	auxVarName=${!auxVarName} # Replace by variable contents
+
+	auxVarName2=MRPT_PKG_EXPORTED_SUBMODULES_${DEBIAN_DIST}
+	export MRPT_PKG_EXPORTED_SUBMODULES=${!auxVarName2} # Replace by variable contents
+
 	bash scripts/prepare_debian.sh -s -u -h -d ${DEBIAN_DIST} ${EMBED_EIGEN_FLAG}  -c "${MRPT_PKG_CUSTOM_CMAKE_PARAMS}${auxVarName}"
 
 	CUR_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"