Author: brett Date: Wed Jul 9 04:23:47 2014 New Revision: 1609009 URL: http://svn.apache.org/r1609009 Log: remove some redundancy and mistaken JAR inclusion
Note that this code only appears to be used from DotGNU and Nemerle now, so might be removed Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java?rev=1609009&r1=1609008&r2=1609009&view=diff ============================================================================== --- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java (original) +++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java Wed Jul 9 04:23:47 2014 @@ -395,34 +395,14 @@ public final class CompilerContextImpl { modules.add( artifact ); } - else if ( ( - artifactType != ArtifactType.NULL && ( - StringUtils.equals( artifactType.getTargetCompileType(), "library" ) - || artifactType.getExtension().equals( "dll" ) || artifactType.getExtension().equals( - "exe" - ) - ) - ) || type.equals( "jar" ) ) - { + else if ( ArtifactTypeHelper.isDotnetAssembly(artifactType) ) { libraries.add( artifact ); } if ( type.equals( ArtifactType.COM_REFERENCE.getPackagingType() ) ) { - moveInteropDllToBuildDirectory( artifact ); - libraries.add( artifact ); - } - else if ( ( - artifactType != null && ( - "library".equals( artifactType.getTargetCompileType() ) || "dll".equals( - artifactType.getExtension() - ) || "exe".equals( artifactType.getExtension() ) - ) - ) || "jar".equals( type ) ) - { - libraries.add( artifact ); + moveInteropDllToBuildDirectory(artifact); } - } }