Author: jfallows
Date: Thu Aug 25 17:08:34 2011
New Revision: 1161644
URL: http://svn.apache.org/viewvc?rev=1161644&view=rev
Log:
Add search directory paths for ILRepack to avoid dependency on current working
directory
Modified:
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
Modified:
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java?rev=1161644&r1=1161643&r2=1161644&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
(original)
+++
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
Thu Aug 25 17:08:34 2011
@@ -20,6 +20,7 @@ package npanday.plugin.ilmerge;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -311,9 +312,19 @@ public class AssemblyMerger extends Abst
}
}
+ // ILRepack on non-Windows appears to need a /lib: referring to
the target directory
+ // to avoid a problem during the merge process where it is unable
to locate the primary assembly
+ File artifactFile = (File) artifacts.iterator().next();
+ Collection<String> searchDirectoryPaths = Arrays.asList(
artifactFile.getParent() );
List commands = new ArrayList();
commands.add("/lib:" + assemblyPath);
+
+ for ( String searchDirectoryPath : searchDirectoryPaths )
+ {
+ commands.add("/lib:" + searchDirectoryPath);
+ }
+
commands.add("/out:" + mergedArtifactFile);
// TODO: workaround bug in ILMerge when merged .pdb output would
overwrite an input .pdb
