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

fix artifact name to be normalized

This commit is contained in:
Mark Harrah 2011-05-07 22:02:05 -04:00
parent 7ad8e9778f
commit 5e9b080fc8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/Defaults.scala
View File

@ -238,7 +238,7 @@ object Defaults
} }
lazy val packageBase = Seq( lazy val packageBase = Seq(
artifact <<= name(n => Artifact(n)), artifact <<= normalizedName(n => Artifact(n)),
packageOptions in GlobalScope :== Nil, packageOptions in GlobalScope :== Nil,
artifactName in GlobalScope :== ( Artifact.artifactName _ ) artifactName in GlobalScope :== ( Artifact.artifactName _ )
) )
@ -538,8 +538,8 @@ object Classpaths
artifactPath in makePom <<= artifactPathSetting(artifact in makePom), artifactPath in makePom <<= artifactPathSetting(artifact in makePom),
publishArtifact in makePom <<= publishMavenStyle.identity, publishArtifact in makePom <<= publishMavenStyle.identity,
artifact in makePom <<= moduleID( name => Artifact(name, "pom", "pom") ), artifact in makePom <<= moduleID( name => Artifact(name, "pom", "pom") ),
projectID <<= (organization,moduleID,version,artifacts){ (org,module,version,as) => projectID <<= (organization,moduleID,version,artifacts,crossPaths){ (org,module,version,as,crossEnabled) =>
ModuleID(org, module, version).cross(true).artifacts(as : _*) ModuleID(org, module, version).cross(crossEnabled).artifacts(as : _*)
}, },
resolvers in GlobalScope :== Nil, resolvers in GlobalScope :== Nil,
projectDescriptors <<= depMap, projectDescriptors <<= depMap,

1
sbt/src/sbt-test/package/manifest/build.sbt
View File

@ -1,6 +1,5 @@
import java.util.jar.{Attributes, Manifest} import java.util.jar.{Attributes, Manifest}
import Path.makeString import Path.makeString
import Configurations.Compile
name :== "Jar Manifest Test" name :== "Jar Manifest Test"