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

build cleanup

This commit is contained in:
Mark Harrah 2010-04-05 18:48:15 -04:00
parent 5b833a6b72
commit eb295fc54b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project/build/ProguardProject.scala
View File

@ -17,8 +17,8 @@ trait ProguardProject extends BasicScalaProject
def outputJar: Path def outputJar: Path
def rootProjectDirectory = rootProject.info.projectPath def rootProjectDirectory = rootProject.info.projectPath
val toolsConfig = config("tools") val toolsConfig = config("tools") hide
val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools->default" val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools"
lazy val proguard = proguardAction lazy val proguard = proguardAction
def proguardAction = proguardTask dependsOn(writeProguardConfiguration) describedAs(ProguardDescription) def proguardAction = proguardTask dependsOn(writeProguardConfiguration) describedAs(ProguardDescription)
@ -71,11 +71,11 @@ trait ProguardProject extends BasicScalaProject
{ {
val dependencies = mainDependencies.snapshot val dependencies = mainDependencies.snapshot
log.debug("proguard configuration, all dependencies:\n\t" + dependencies.all.mkString("\n\t")) log.debug("proguard configuration, all dependencies:\n\t" + dependencies.all.mkString("\n\t"))
val externalJars = dependencies.external// mainDependencies.map(_.getAbsoluteFile).filter(_.getName.endsWith(".jar")) val externalJars = dependencies.external
log.debug("proguard configuration external dependencies: \n\t" + externalJars.mkString("\n\t")) log.debug("proguard configuration external dependencies: \n\t" + externalJars.mkString("\n\t"))
// partition jars from the external jar dependencies of this project by whether they are located in the project directory // partition jars from the external jar dependencies of this project by whether they are located in the project directory
// if they are, they are specified with -injars, otherwise they are specified with -libraryjars // if they are, they are specified with -injars, otherwise they are specified with -libraryjars
val libraryJars = dependencies.libraries ++ dependencies.scalaJars//toList.partition(jar => Path.relativize(rootProjectDirectory, jar).isDefined) val libraryJars = dependencies.libraries ++ dependencies.scalaJars
log.debug("proguard configuration library jars locations:\n\t" + libraryJars.mkString("\n\t")) log.debug("proguard configuration library jars locations:\n\t" + libraryJars.mkString("\n\t"))
val proguardConfiguration = template(libraryJars, externalJars, outputJar.asFile, basicOptions, getMainClass(false), keepClasses) val proguardConfiguration = template(libraryJars, externalJars, outputJar.asFile, basicOptions, getMainClass(false), keepClasses)