public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Make java main detection in Makefile.gen.sh more strict.
@ 2008-04-15 12:28 mark
  0 siblings, 0 replies; only message in thread
From: mark @ 2008-04-15 12:28 UTC (permalink / raw)
  To: frysk-cvs

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 <mwielaard@redhat.com>
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  <mwielaard@redhat.com>
    
           * 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  <mwielaard@redhat.com>
+
+	* Makefile.gen.sh (has_java_main): Make regexp more strict.
+
 2008-04-14  Andrew Cagney  <cagney@redhat.com>
 
 	* 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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-15 12:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-15 12:28 [SCM] master: Make java main detection in Makefile.gen.sh more strict mark

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).