legal cleanup

hubertp · Feb 8, 2010 · a33223a · a33223a
1 parent 9ed643c
commit a33223a
Show file tree

Hide file tree

Showing 59 changed files with 234 additions and 14 deletions.
diff --git a/NOTICE b/NOTICE
@@ -2,7 +2,8 @@ Simple Build Tool (xsbt)
 Copyright 2008, 2009, 2010 Mark Harrah
 Licensed under BSD-style license (see LICENSE)
 
-Portions based on code from the Scala compiler
+Portions based on code from the Scala compiler.  Portions of the Scala
+library are distributed with the launcher.
 Copyright 2002-2008 EPFL, Lausanne
 Licensed under BSD-style license (see licenses/LICENSE_Scala)
 

diff --git a/cache/NOTICE b/cache/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Cache Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/cache/tracking/NOTICE b/cache/tracking/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Tracking Component
+Copyright 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/compile/NOTICE b/compile/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Compile Component
+Copyright 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/compile/api/NOTICE b/compile/api/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Source API Component
+Copyright 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/compile/interface/NOTICE b/compile/interface/NOTICE
@@ -0,0 +1,7 @@
+Simple Build Tool: Compiler Interface Component
+Copyright 2008, 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
+
+Portions based on code from the Scala compiler.
+Copyright 2002-2008 EPFL, Lausanne
+Licensed under BSD-style license (see licenses/LICENSE_Scala)
diff --git a/ivy/ComponentManager.scala b/ivy/ComponentManager.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010 Mark Harrah
+ */
 package sbt
 
 import java.io.{File,FileOutputStream}

diff --git a/ivy/ConvertResolver.scala b/ivy/ConvertResolver.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+ * Copyright 2008, 2009, 2010 Mark Harrah
  */
 package sbt
 

diff --git a/ivy/CustomXmlParser.scala b/ivy/CustomXmlParser.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+ * Copyright 2008, 2009, 2010  Mark Harrah
  */
 package sbt
 

diff --git a/ivy/IvyActions.scala b/ivy/IvyActions.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010 Mark Harrah
+ */
 package sbt
 
 import java.io.File

diff --git a/ivy/IvyCache.scala b/ivy/IvyCache.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010  Mark Harrah
+ */
 package sbt
 
 import java.io.File

diff --git a/ivy/IvyConfigurations.scala b/ivy/IvyConfigurations.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010 Mark Harrah
+ * Copyright 2008, 2009, 2010  Mark Harrah
  */
 package sbt
 

diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+ * Copyright 2008, 2009, 2010  Mark Harrah
  */
 package sbt
 

diff --git a/ivy/IvyLogger.scala b/ivy/IvyLogger.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+ * Copyright 2008, 2009, 2010  Mark Harrah
  */
 package sbt
 

diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala
@@ -1,3 +1,7 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010  Mark Harrah
+ */
+
 // based on Ivy's PomModuleDescriptorWriter, which is Apache Licensed, Version 2.0
 // http://www.apache.org/licenses/LICENSE-2.0
 

diff --git a/ivy/NOTICE b/ivy/NOTICE
@@ -0,0 +1,28 @@
+Simple Build Tool: Ivy Interface Component
+Copyright 2008, 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
+
+Portions based on Apache Ivy,
+licensed under the Apache License, Version 2.0 (see licenses/LICENSE_Apache)
+
+It requires the following notice:
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Ivy were originally developed by
+Jayasoft SARL (http://www.jayasoft.fr/)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/launch/Boot.scala b/launch/Boot.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+ * Copyright 2009, 2010  Mark Harrah
  */
  package xsbt.boot
 

diff --git a/launch/BootConfiguration.scala b/launch/BootConfiguration.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+ * Copyright 2009, 2010  Mark Harrah
  */
  package xsbt.boot
 

diff --git a/launch/Cache.scala b/launch/Cache.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import java.lang.ref.{Reference, SoftReference}

diff --git a/launch/Configuration.scala b/launch/Configuration.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/ConfigurationParser.scala b/launch/ConfigurationParser.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 

diff --git a/launch/Create.scala b/launch/Create.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/Exceptions.scala b/launch/Exceptions.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
 package xsbt.boot
 
 // The exception to use when an error occurs at the launcher level (and not a nested exception).

diff --git a/launch/Find.scala b/launch/Find.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/Launch.scala b/launch/Launch.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/LaunchConfiguration.scala b/launch/LaunchConfiguration.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/ListMap.scala b/launch/ListMap.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/Locks.scala b/launch/Locks.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 import java.io.{File, FileOutputStream}

diff --git a/launch/NOTICE b/launch/NOTICE
@@ -0,0 +1,35 @@
+Simple Build Tool Launcher
+Copyright 2008, 2009, 2010  Mark Harrah, David MacIver
+Licensed under BSD-style license (see LICENSE)
+
+Classes from the Scala library are distributed with the launcher.
+Copyright 2002-2008 EPFL, Lausanne
+Licensed under BSD-style license (see licenses/LICENSE_Scala)
+
+JLine is distributed with the launcher.
+It is licensed under a BSD-style license (see licenses/LICENSE_JLine)
+
+Classes from Apache Ivy, licensed under the Apache License, Version 2.0
+(see licenses/LICENSE_Apache) are distributed with the launcher.
+It requires the following notice:
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Ivy were originally developed by
+Jayasoft SARL (http://www.jayasoft.fr/)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/launch/Pre.scala b/launch/Pre.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009, 2010  Mark Harrah
+ */
 package xsbt.boot
 
 object Pre

diff --git a/launch/Provider.scala b/launch/Provider.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010 Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/ResolveVersions.scala b/launch/ResolveVersions.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt.boot
 
 import Pre._

diff --git a/launch/Update.scala b/launch/Update.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+ * Copyright 2009, 2010  Mark Harrah
  */
 package xsbt.boot
 

diff --git a/launch/Using.scala b/launch/Using.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt.boot
 
 import java.io.{Closeable, File, FileInputStream, FileOutputStream, InputStream, OutputStream}

diff --git a/launch/interface/NOTICE b/launch/interface/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Launcher Interface Component
+Copyright 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/main/NOTICE b/main/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Aggressive Compiler
+Copyright 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala
@@ -65,7 +65,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info)
 	def compilerInterfaceClasspath = compileInterfaceSub.projectClasspath(Configurations.Test)
 
 	//run in parallel
-	override def parallelExecution = false
+	override def parallelExecution = true
 	def jlineRev = "0.9.94"
 	def jlineDep = "jline" % "jline" % jlineRev intransitive()
 
@@ -108,11 +108,20 @@ class XSbt(info: ProjectInfo) extends ParentProject(info)
 		//override def compileOptions = super.compileOptions ++ List(Unchecked,ExplainTypes, CompileOption("-Xlog-implicits"))
 		val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.3"
 	}
-	class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component
+	class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component with Licensed
 	{
 		override def scratch = true
 		override def consoleClasspath = testClasspath
 	}
+	trait Licensed extends BasicScalaProject
+	{
+		def notice = path("NOTICE")
+		abstract override def mainResources = super.mainResources +++ notice +++ Path.lazyPathFinder( extractLicenses )
+		lazy val seeRegex = """\(see (.*?)\)""".r
+		def licensePath(str: String): Path = { val path = Path.fromString(XSbt.this.info.projectPath, str); if(path.exists) path else error("Referenced license '" + str + "' not found at " + path) }
+		def seePaths(noticeString: String): List[Path] = seeRegex.findAllIn(noticeString).matchData.map(d => licensePath(d.group(1))).toList
+		def extractLicenses = if(!notice.exists) Nil else FileUtilities.readString(notice asFile, log).fold(_ => { log.warn("Could not read NOTICE"); Nil} , seePaths _)
+	}
 	class CompileProject(info: ProjectInfo) extends Base(info) with TestWithLog with TestWithLaunch
 	{
 		override def testCompileAction = super.testCompileAction dependsOn(compileInterfaceSub.`package`, interfaceSub.`package`)

diff --git a/scripted/CommentHandler.scala b/scripted/CommentHandler.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt.test
 
 import java.io.File

diff --git a/scripted/FileCommands.scala b/scripted/FileCommands.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt.test
 
 import java.io.File

diff --git a/scripted/NOTICE b/scripted/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Scripted Test Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/scripted/StatementHandler.scala b/scripted/StatementHandler.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt.test
 
 trait StatementHandler

diff --git a/tasks/NOTICE b/tasks/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Task Engine Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/tasks/standard/NOTICE b/tasks/standard/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Standard Tasks Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/util/classpath/DualLoader.scala b/util/classpath/DualLoader.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
 package xsbt
 
 import java.net.URL

diff --git a/util/classpath/NOTICE b/util/classpath/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Classpath Component
+Copyright 2008, 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
diff --git a/util/collection/HLists.scala b/util/collection/HLists.scala
@@ -1,8 +1,8 @@
-package xsbt
-
 // stripped down version of http://trac.assembla.com/metascala/browser/src/metascala/HLists.scala
 //   Copyright (c) 2009, Jesper Nordenberg
-//   new BSD license, see licenses/MetaScala
+//   new BSD license, see licenses/LICENSE_MetaScala
+
+package xsbt
 
 object HLists extends HLists
 trait HLists

diff --git a/util/collection/NOTICE b/util/collection/NOTICE
@@ -0,0 +1,7 @@
+Simple Build Tool: Collection Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
+
+Portions based on MetaScala
+Copyright (c) 2009, Jesper Nordenberg
+Licensed under BSD-style license (see licenses/LICENSE_MetaScala)