diff options
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarLayout21.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarLayout21.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java index 34bcd06..73b40b8 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java @@ -131,10 +131,14 @@ public class NarLayout21 type = Library.EXECUTABLE; aol = new AOL(aolDir[0]); - if ( narInfo.getBinding( aol, null ) == null ) - { - narInfo.setBinding( aol, Library.EXECUTABLE ); - } +// if ( narInfo.getBinding( aol, null ) == null ) +// { +// narInfo.setBinding( aol, Library.EXECUTABLE ); +// } +// if ( narInfo.getBinding( null, null ) == null ) +// { +// narInfo.setBinding( null, Library.EXECUTABLE ); +// } } else { @@ -159,6 +163,11 @@ public class NarLayout21 { narInfo.setBinding( aol, type ); } + // and not set or override if SHARED + if (( narInfo.getBinding( null, null ) == null ) || type.equals( Library.SHARED ) ) + { + narInfo.setBinding( null, type ); + } } assert(type != null); |