diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-29 22:09:45 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-29 22:09:45 +0100 |
| commit | b508c3209c43ce26c378807ae37c53fa908faa5b (patch) | |
| tree | 338887108aa1748c4051639f9621fa6781e2602c /src/main/java/org/apache/maven/plugin/nar/Linker.java | |
| parent | 0007cfb94d604bcd650a657dab1dfa765b034fd3 (diff) | |
| download | maven-nar-plugin-b508c3209c43ce26c378807ae37c53fa908faa5b.tar.gz maven-nar-plugin-b508c3209c43ce26c378807ae37c53fa908faa5b.tar.bz2 maven-nar-plugin-b508c3209c43ce26c378807ae37c53fa908faa5b.tar.xz maven-nar-plugin-b508c3209c43ce26c378807ae37c53fa908faa5b.zip | |
Fixed NAR-5 and NAR-98
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/Linker.java')
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/Linker.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java index 5d9069f..2bfc6aa 100644 --- a/src/main/java/org/apache/maven/plugin/nar/Linker.java +++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java @@ -179,28 +179,38 @@ public class Linker throw new MojoFailureException( "Cannot deduce linker version if name is null" ); String version = null; - + TextStream out = new StringTextStream(); TextStream err = new StringTextStream(); TextStream dbg = new StringTextStream(); if ( name.equals( "g++" ) || name.equals( "gcc" ) ) { - NarUtil.runCommand( "gcc", new String[] { "--version" }, null, null, out, err, dbg ); + int r = NarUtil.runCommand( "gcc", new String[] { "--version" }, null, null, out, err, dbg ); Pattern p = Pattern.compile( "\\d+\\.\\d+\\.\\d+" ); Matcher m = p.matcher( out.toString() ); - if (m.find()) { + if ( m.find() ) + { version = m.group( 0 ); } + else + { + throw new MojoFailureException( "Cannot deduce version number from: " + out ); + } } else if ( name.equals( "msvc" ) ) { - NarUtil.runCommand( "link", new String[] { "/version" }, null, null, out, err, dbg ); + int r = NarUtil.runCommand( "link", new String[] { "/version" }, null, null, out, err, dbg ); Pattern p = Pattern.compile( "\\d+\\.\\d+\\.\\d+" ); Matcher m = p.matcher( out.toString() ); - if (m.find()) { + if ( m.find() ) + { version = m.group( 0 ); } + else + { + throw new MojoFailureException( "Cannot deduce version number from: " + out ); + } } else { |