luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exclude directories from unmanagedSources 

fix #2552
This commit is contained in:
xuwei-k 2016-04-30 10:11:08 +09:00
parent 2590f2d3d1
commit a6e31a0dc7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/Defaults.scala
View File

@ -47,7 +47,7 @@ import sbt.util.InterfaceUtil.{ f1, o2m }
import sbt.internal.util.Types._ import sbt.internal.util.Types._
import sbt.internal.io.WatchState import sbt.internal.io.WatchState
import sbt.io.{ AllPassFilter, FileFilter, GlobFilter, HiddenFileFilter, IO, NameFilter, NothingFilter, Path, PathFinder } import sbt.io.{ AllPassFilter, FileFilter, GlobFilter, HiddenFileFilter, IO, NameFilter, NothingFilter, Path, PathFinder, SimpleFileFilter }
import Path._ import Path._
import Keys._ import Keys._
@ -105,7 +105,7 @@ object Defaults extends BuildCommon {
artifactClassifier in packageSrc :== Some(SourceClassifier), artifactClassifier in packageSrc :== Some(SourceClassifier),
artifactClassifier in packageDoc :== Some(DocClassifier), artifactClassifier in packageDoc :== Some(DocClassifier),
includeFilter :== NothingFilter, includeFilter :== NothingFilter,
includeFilter in unmanagedSources :== "*.java" | "*.scala", includeFilter in unmanagedSources :== ("*.java" | "*.scala") && new SimpleFileFilter(_.isFile),
includeFilter in unmanagedJars :== "*.jar" | "*.so" | "*.dll" | "*.jnilib" | "*.zip", includeFilter in unmanagedJars :== "*.jar" | "*.so" | "*.dll" | "*.jnilib" | "*.zip",
includeFilter in unmanagedResources :== AllPassFilter includeFilter in unmanagedResources :== AllPassFilter
) )

4
sbt/src/sbt-test/tests/source-directory-name/src/main/scala/ch.epfl.scala/Client.scala Normal file
View File

@ -0,0 +1,4 @@
package ch.epfl.scala
// https://github.com/sbt/sbt/issues/2552
class Client

2
sbt/src/sbt-test/tests/source-directory-name/test Normal file
View File

@ -0,0 +1,2 @@
> compile
$ exists target/scala-2.11/classes/ch/epfl/scala/Client.class