X-Recipient:	archive-cygwin AT delorie DOT com
X-Spam-Check-By:	sourceware.org
Message-ID:	<47D19139.2090108@t-online.de>
Date:	Fri, 07 Mar 2008 20:02:17 +0100
From:	Christian Franke <Christian DOT Franke AT t-online DOT de>
User-Agent:	Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071128 SeaMonkey/1.1.7
MIME-Version:	1.0
To:	cygwin AT cygwin DOT com
Subject:	[Patch] cygport: Allow to clear default_excludes
X-ID:	VO5Q3-ZAohuQqRrdZmIYhqjzLGfPlE2dgm8Zm3VE6wU+ViE53FbJ-pNvA1tJCW+Qew
X-TOI-MSGID:	d1819e45-10fa-41ea-ac87-ae299819ab58
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

--------------040204050701090900010706
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

The cygport 0.3.8 "default_excludes" list is not suitable for all 
projects, in particular when aclocal.m4 is used in a non-automake 
project like bash (http://sourceware.org/ml/cygwin/2007-03/msg00613.html).

With the attached, the default_excludes list is cleared when when 
DIFF_EXCLUDES starts with '!' (Syntax borrowed from .cvsignore ;-)
Then all necessary excludes except CYGWIN-PATCHES must be specified, e.g:

DIFF_EXCLUDES="! config.* install-sh missing ..."

The patch also adds a missing blank for DIFF_EXCLUDES="-x foo ...".

Christian


--------------040204050701090900010706
Content-Type: text/x-patch;
 name="cygport-0.3.8-exclude.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cygport-0.3.8-exclude.patch"

--- cygport-0.3.8	2008-02-14 07:53:41.001000000 +0100
+++ cygport	2008-03-05 12:52:32.968750000 +0100
@@ -1770,14 +1770,24 @@ __pkg_diff() {
 		fi
 	fi
 
-	for exclude in ${default_excludes}
-	do
-		diff_excludes_x+=" -x ${exclude}";
-	done
+	# ignore defaults if DIFF_EXCLUDES starts with '!'
+	case ${DIFF_EXCLUDES} in
+		!*)
+			diff_excludes_x=" -x CYGWIN-PATCHES"
+			DIFF_EXCLUDES="${DIFF_EXCLUDES#!}"
+			DIFF_EXCLUDES="${DIFF_EXCLUDES# }"
+			;;
+		*)
+			for exclude in ${default_excludes}
+			do
+				diff_excludes_x+=" -x ${exclude}";
+			done
+			;;
+	esac
 
 	case ${DIFF_EXCLUDES} in
 		-x*)
-			diff_excludes_x+="${DIFF_EXCLUDES}";
+			diff_excludes_x+=" ${DIFF_EXCLUDES}";
 			;;
 		*)
 			for exclude in ${DIFF_EXCLUDES}


--------------040204050701090900010706
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------040204050701090900010706--

- Raw text -