From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14118 invoked by alias); 15 Apr 2008 12:28:31 -0000 Received: (qmail 14084 invoked by uid 9112); 15 Apr 2008 12:28:30 -0000 Date: Tue, 15 Apr 2008 12:28:00 -0000 Message-ID: <20080415122830.14069.qmail@sourceware.org> From: mark@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Make java main detection in Makefile.gen.sh more strict. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 679ae166ae85307bd174477621c2548a8a17bf1e X-Git-Newrev: f456c6b56d21b6d9b2f6921103ee6b0515b2cd15 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00101.txt.bz2 The branch, master has been updated via f456c6b56d21b6d9b2f6921103ee6b0515b2cd15 (commit) from 679ae166ae85307bd174477621c2548a8a17bf1e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f456c6b56d21b6d9b2f6921103ee6b0515b2cd15 Author: Mark Wielaard Date: Tue Apr 15 14:27:29 2008 +0200 Make java main detection in Makefile.gen.sh more strict. frysk-common/ChangeLog 2008-04-15 Mark Wielaard * Makefile.gen.sh (has_java_main): Make regexp more strict. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 4 ++++ frysk-common/Makefile.gen.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index ad517af..89af89e 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,3 +1,7 @@ +2008-04-15 Mark Wielaard + + * Makefile.gen.sh (has_java_main): Make regexp more strict. + 2008-04-14 Andrew Cagney * Makefile.gen.sh (echo_arch32_PROGRAMS): Run the compiler diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh index f05302c..a9114a7 100755 --- a/frysk-common/Makefile.gen.sh +++ b/frysk-common/Makefile.gen.sh @@ -328,7 +328,7 @@ has_java_source () has_java_main () { - grep ' main[ ]*[(]' $1 > /dev/null 2>&1 + grep ' void main[ ]*[(][ ]*String' $1 > /dev/null 2>&1 } has_main () hooks/post-receive -- frysk system monitor/debugger