[schilytools] Patches for Makefile System

[Robert Clausecker]

Hi Nico,

The patches looks good!  Will apply them soon.

Next time, please send each patch as its own email instead of attaching
them.  Use the git-send-email(1) utility for this purpose.

Yours,
Robert Clausecker

Am Sat, Aug 06, 2022 at 04:28:07PM +0200 schrieb Nico Sonack:
> Hey there,
> 
> attached I have two patches:
> 
> The first updates the messages printed whenever we encounter a system 
> that does not have specialized rule files. This is related to issue #11.
> 
> The second patch fixes a bug when generating Emacs TAGS files. This is 
> merely a convenience thing for developers.
> 
> Please see the commit messages for more details. I'd appreciate a short 
> review and import of the patches.
> 
> Regards,
> Nico
> 
> 
> -- 
> Sent from hades / FreeBSD 13.1-RELEASE
> 
> Please remember: https://useplaintext.email/#etiquette
> HTML-formatted mail will likely end up in the Spam folder.
> Do NOT send me Microsoft Office documents. I shall refrain from opening
> them.
> 
> Nico Sonack <nsonack at herrhotzenplotz.de>

> From 4d2bd1f5b391ded26832a583faca519b9f2a8390 Mon Sep 17 00:00:00 2001
> From: Nico Sonack <nsonack at herrhotzenplotz.de>
> Date: Sat, 6 Aug 2022 16:14:15 +0200
> Subject: [PATCH] conf/makeinc: Update E-Mail address and project URL
> 
> This message is printed whenever we build on an architecture where
> there is no rule file available and it is generated
> automatically. This was encountered while testing this on
> OpenBSD/arm64.
> 
> Related to #11
> ---
>  conf/makeinc | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/conf/makeinc b/conf/makeinc
> index 2eca3c39..d8052edb 100755
> --- a/conf/makeinc
> +++ b/conf/makeinc
> @@ -32,7 +32,8 @@
>  # When distributing Covered Code, include this CDDL HEADER in each
>  # file and include the License file CDDL.Schily.txt from this distribution.
>  ###########################################################################
> -MAILADDR=joerg at schily.net
> +MAILADDR=schilytools at mlists.in-berlin.de
> +UPSTREAMURL=https://codeberg.org/schilytools/schilytools
>  
>  ###########################################################################
>  # Option processing
> @@ -86,7 +87,7 @@ if [ -r $1 ]; then
>  	echo "WARNING:	requested file '$1' already exists"
>  	exit
>  fi
> -echo "IMPORTANT:	Please report your architecture to $MAILADDR"
> +echo "IMPORTANT:	Please report your architecture to $MAILADDR or open a ticket at $UPSTREAMURL"
>  echo
>  echo "Trying to create missing rule file '$1'"
>  sleep 1
> @@ -195,7 +196,8 @@ echo "MANSTYLE:	$MANSTYLE"
>  		if [ .$similar != . ]; then
>  			echo 'Found similar architecture             ' "'$similar'"
>  			echo 'creating symlink:' ln -s $SARCH-$OSNAME-$CCOM.rul $1
> -			echo "Please send a mail to $MAILADDR to report whether this works or not"
> +			echo "Please send a mail to $MAILADDR or open a ticket at $UPSTREAMURL"
> +			echo "to report whether this works or not."
>  			sleep 10
>  			ln -s $SARCH-$OSNAME-$CCOM.rul $1 || cp $SARCH-$OSNAME-$CCOM.rul $1
>  			exit
> @@ -229,8 +231,9 @@ echo "MANSTYLE:	$MANSTYLE"
>  		echo "Unknown rule to build: '$1'."
>  		exit 1
>  		;;
> -	
> +
>  	esac
>  
> -echo "Please send a mail to $MAILADDR to report whether this works or not"
> +echo "Please send a mail to $MAILADDR or open a ticket at $UPSTREAMURL"
> +echo "to report whether this works or not."
>  sleep 10
> -- 
> 2.37.1
> 

> From d5ec73e1c91dcb7422fde31153388011617b9e96 Mon Sep 17 00:00:00 2001
> From: Nico Sonack <nsonack at herrhotzenplotz.de>
> Date: Sun, 17 Jul 2022 20:21:51 +0200
> Subject: [PATCH] Makefiles: Fix emacs TAGS generation
> 
> Etags exits with code 1 if you don't supply any files to it. Work
> around that by ignoring its return code.
> ---
>  .gitignore        | 3 +++
>  RULES/r-smake.tag | 2 +-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 98f99f39..7fdc7dd9 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -15,3 +15,6 @@ psmake/xconfig.h
>  config.cache
>  config.log
>  config.status
> +
> +# emacs tag files
> +TAGS
> \ No newline at end of file
> diff --git a/RULES/r-smake.tag b/RULES/r-smake.tag
> index 031f7528..779db4a8 100644
> --- a/RULES/r-smake.tag
> +++ b/RULES/r-smake.tag
> @@ -21,7 +21,7 @@
>  # file and include the License file CDDL.Schily.txt from this distribution.
>  ###########################################################################
>  TAGS:		$(CFILES) $(CFILES_TAG) $(HFILES) $(HFILES_TAG)
> -		$(ETAGS) $r1
> +		-$(ETAGS) $r1
>  
>  tags:		$(CFILES) $(CFILES_TAG) $(HFILES) $(HFILES_TAG)
>  		$(CTAGS) -t $r1
> -- 
> 2.37.1
> 

> -- 
> schilytools mailing list
> schilytools at mlists.in-berlin.de
> https://mlists.in-berlin.de/mailman/listinfo/schilytools-mlists.in-berlin.de


-- 
()  ascii ribbon campaign - for an 8-bit clean world 
/\  - against html email  - against proprietary attachments