From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Add tool to format rootfiles
Date: Thu, 10 Sep 2020 12:45:26 +0100
Message-ID: <F6ED050E-9F79-4B42-B28E-CFFD9F31AEE0@ipfire.org>
In-Reply-To: <20200905084008.29873-1-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6503007159213612967=="
List-Id: <development.lists.ipfire.org>

--===============6503007159213612967==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello Jonatan,

We have already talked about this patch on the last telephone conference, but=
 I would still like to put forward this:

Can we not change this patch, so that it only tells us what could/should pote=
ntially be changed? So the command will simply say things like =E2=80=9C/usr/=
lib/libabc.so is a development file and should not be included=E2=80=9D.

Wouldn=E2=80=99t that avoid the problem of any automatic errors and we still =
have a helper that makes the whole process easier for developers?

For that, the sed statements simply have to be changed to grep and the output=
 of that has to be dealt with.

-Michael

> On 5 Sep 2020, at 09:40, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrote:
>=20
> There are some rules which files should be definitely not included in a
> rootfile. Applying these rules by hand is error prone and annoying. So I
> wrote these simple command, because computer can apply these rules
> faster and better than humans :-;
>=20
> It removes all lines starting with '-' and comment out all lines which
> point to files which should not be included in the distribution. This
> list needs to be extended, but I think this is a good starting point to
> make the creating of rootfiles easier.
>=20
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
> make.sh | 37 ++++++++++++++++++++++++++++++++++++-
> 1 file changed, 36 insertions(+), 1 deletion(-)
>=20
> diff --git a/make.sh b/make.sh
> index 4a9dd3cb6..909d4a4de 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1895,6 +1895,41 @@ downloadsrc)
> 	fi
> 	cd - >/dev/null 2>&1
> 	;;
> +format-rootfile)
> +	if [ ! -f $2 ]; then
> +		echo -n "'$2' is not a regular file"
> +		beautify message FAIL
> +		exit 1
> +	fi
> +
> +	ROOTFILE_TO_FORMAT=3D"$2"
> +
> +	# Remove all .so files in /usr/lib
> +	sed -i '/^\+usr\/lib\/.*\.so$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +	# Remove all .a files in /usr/lib
> +	sed -i '/^\+usr\/lib\/.*\.a$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +
> +	# Remove all .la files in /usr/lib
> +	sed -i '/^\+usr\/lib\/.*\.la$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +	# Remove all .hpp files in /usr/include
> +	sed -i '/^\+usr\/include\/.*\.hpp$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +	# Remove all .h files in /usr/include
> +	sed -i '/^\+usr\/include\/.*\.h$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +	# Remove all .ipp files in /usr/include
> +	sed -i '/^\+usr\/include\/.*\.ipp$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +	# Remove all .m4 files in /usr/share/aclocal
> +	sed -i '/^\+usr\/share\/aclocal\/.*\.h$/s/+/#/g' "$ROOTFILE_TO_FORMAT"
> +
> +	# Remove all lines starting with -
> +	sed -i '/^-.*$/d' "$ROOTFILE_TO_FORMAT"
> +
> +;;
> toolchain)
> 	# Clear screen
> 	${INTERACTIVE} && clear
> @@ -1990,7 +2025,7 @@ find-dependencies)
> 	exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@"
> 	;;
> *)
> -	echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|syn=
c|toolchain|update-contributors|find-dependencies}"
> +	echo "Usage: $0 {build|changelog|clean|format-rootfile|gettoolchain|downl=
oadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
> 	cat doc/make.sh-usage
> 	;;
> esac
> --=20
> 2.20.1
>=20


--===============6503007159213612967==--