Permalink
Browse files

Duplicate license in /LICENSE for GitHub

So that our license (in doc/LICENSE.md) is detected by `licensee`.
Also removed some cruft while I was at it... Bye bye svn mappings.
  • Loading branch information...
1 parent 7ef5575 commit ec960ad03f16b4f614d3cab40324ccae0bd1c36d @adriaanm adriaanm committed Oct 19, 2016
View
@@ -0,0 +1,30 @@
+This software includes projects with other licenses -- see `doc/LICENSE.md`.
+
+Copyright (c) 2002-2016 EPFL
+Copyright (c) 2011-2016 Lightbend, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the EPFL nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"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 COPYRIGHT OWNER OR
+CONTRIBUTORS 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.
View
@@ -1,7 +1,7 @@
Scala Distribution
------------------
-The Scala distribution requires Java 1.6 or above.
+The Scala distribution requires Java 1.8 or above.
Please report bugs at https://issues.scala-lang.org/.
We welcome contributions at https://github.com/scala/scala!
@@ -31,6 +31,6 @@ Licenses
--------
Scala is licensed under the standard 3-clause BSD license,
-included in the distribution as the file `doc/LICENSE`.
+included in the distribution as the file `doc/LICENSE.md`.
The licenses of the software included in the Scala distribution can
be found in the `doc/licenses` directory.
View
@@ -1,90 +0,0 @@
-//###########################################################-*-outline-*-####
-// TODO list
-//############################################################################
-
-* Histories
-
- Requires: -
-
- Create a class "History<X>" that can be used to store a phase
- dependent value of type "X". We can then have TypeHistories,
- FlagHistories, ClosureHistories, ...
-
- Currently only symbols may contain phase dependent values. For that
- reason we sometimes create symbols just because we need a phase
- dependent type (for example the thisTypeSym). And sometimes we don't
- have phase dependent values where we should (for example lobound in
- AbsTypeSymbol or flags in Symbol)
-
- Once we have histories, it is possible to add one or several
- phase-dependent values to every symbol (and also to other data
- types).
-
- The two base operations of class "History" are "getValueAt(Phase)"
- and "setValueAt(Phase)". There are two kinds of histories: those
- that may only return values already set and those that trigger the
- evaluation of values not yet set (=> lazy types).
-
-
-* Remove the notion of primary constructor.
-
- Requires: Histories
-
- In case of abstract types and type aliases, the sole purpose of the
- primary constructor is to store the type parameters. These type
- parameters can be stored in a type parameters history.
-
- In case of class types, the primary constructor stores the type and
- value parameters of the class and it defines a valid instance
- constructor. As for abstract types and type aliases, the type and
- value parameters can be stored in parameters histories and the
- instance constructor defined be the primary constructor can be
- replaced by a normal constructor.
-
-
-* Remove symbols from MethodTypes and PolyTypes
-
- Requires: Histories, Primary constructor removal
-
- The symbols of the value parameters of methods are currently stored
- in their type in "MethodType" types. These symbols can be stored in
- a new parameters history of class "TermSymbol". The array of symbols
- in the "MethodType" type can then be replaced by an array of types.
-
- The process is about the same for symbols in PolyTypes. The main
- difference is that type parameters may be referenced and thus we
- need something like De Bruijn indices to represent these
- references.
-
-
-* Scopes with history
-
- Requires: -
-
- Implement scopes that maintain a validity phase interval for each of
- its member. Members may then only be added to scopes. Removing is
- replaced by terminating the validity interval.
-
-
-* Implement a type IntervalType(Type,Type)
-
- Requires: -
-
- A type IntervalType(Type,Type) specifies an upper and a lower
- bound. This type can be used to replace the loBound field in class
- AbsTypeSymbol. It makes it possible to merge classes TypeAliasSymbol
- and AbsTypeSymbol into one single class whose info is either a
- TypeRef for type aliases or an IntervalType for abstract types.
-
-
-* Solve refinement problem.
-
- Requires: Histories, Scopes with history, IntervalTypes
-
- Replace the current type CompoundType(Type[],Scope) by the new types
- CompoundType(Type[]) and RefinementType(Type,Map<Symbol,Type>) and
- add a Scope field in class ClassSymbol.
-
- Replace the symbol in compound types by a closure history.
-
-//############################################################################
@@ -1,124 +0,0 @@
-Java Virtual Machine
-====================
-
-
-This document gathers technical informations about the Java VM to help
-Java/Scala developers tuning their runtime settings on the Java VM.
-
-
-Java VM Options
-----------------
-
-* -Xmx option (maximum heap size)
-
- Heaps larger than 2GB are available starting with J2SE 1.3.1
-
- Default:
- -client: 64M (32-bit UNIX and Windows, MacOS X)
- -server: 128M (MacOS X, see [vm11])
-
-* -Xms option (initial heap size)
-
- Minimum: 1025K (Linux-i586, Solaris-i586), etc.. (see [vm08])
- Default:
- -client: 2M (32-bit UNIX and Windows, MacOS X)
- -server: 32M (MacOS X, see [vm11])
-
-* -Xss option (thread stack size)
-
- Minimum: 48K (Linux-i586), 64K (Solaris-i586), etc.. (see [vm08])
- Default: 256K (32-bit UNIX and Windows)
-
- NB. Stack size under Windows is a link-time setting, so the executable
- (java.exe) as created by Sun has this 256K limit built in. Windows
- however, has a simple utility to modify the stack space of an
- executable (see [vm03]).
- In a command window (or Cygwin shell), use the EDITBIN command to
- permanently modify the executable (WARNING! Do not reduce the stack
- size below 32K, see [vm04])
-
- EDITBIN /STACK:16000000 C:\Path\To\java.exe
-
-
-Scala Environment Options
--------------------------
-
-* JAVACMD variable (Java command)
-
- Scala default: java (v2.x)
-
-* JAVA_OPTS variable (Java options)
-
- Scala default: -Xmx256M -Xms16M (v2.x)
-
-
-In the following example, simply replace <jdk> by
-"java-1.5", "java-1.6", "java-1.7" or
-"java-ibm-1.5" to experiment with different Java VMs:
-
-> env JAVACMD=/home/linuxsoft/apps/<jdk>/bin/java \
- JAVA_OPTS="-Xmx256M -Xms16M -Xss128k" \
- test/scalatest test/files/shootout/message.scala
-
-
-
-Resources
-=========
-
-
-VM Options and Tools
---------------------
-
-[vm01] Some useful -XX options
- http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp
-
-[vm02] jvmstat 3.0
- http://java.sun.com/performance/jvmstat/
-
-[vm03] Modify the actual java.exe executable on Windows
- http://www.eyesopen.com/docs/html/javaprog/node7.html
-
-[vm04] Configuring server stack size
- https://ssa.usyd.edu.au/docs/eassag/eassag20.htm
-
-[vm06] Tuning the Java Runtime System
- http://docs.sun.com/source/817-2180-10/pt_chap5.html
-
-[vm07] JVM Tuning
- http://www.caucho.com/resin-3.0/performance/jvm-tuning.xtp
-
-[vm08] Java HotSpot: load the VM from a non-primordial thread and effects
- on stack and heap limits.
- http://blogs.sun.com/ksrini/entry/hotspot_primordial_thread_jni_stack
-
-[vm09] A Collection of JVM Options (13-Dec-2005)
- http://blogs.sun.com/watt/resource/jvm-options-list.html
-
-[vm10] The Java VM for Mac OS X (Apple Developer Connection, 2006-05-23)
- http://developer.apple.com/documentation/Java/Conceptual/Java14Development/06-JavaVM/JavaVM.html#//apple_ref/doc/uid/TP40001903-211276-TPXREF107
-
-[vm11] Java Virtual Machine Options (Apple Developer Connection, 2006-05-23)
- http://developer.apple.com/documentation/Java/Conceptual/JavaPropVMInfoRef/Articles/JavaVirtualMachineOptions.html#//apple_ref/doc/uid/TP40001974-SW1
-
-[vm12] Running your Java application on AIX, Part 2: JVM memory models (22 Oct 2003)
- http://www-128.ibm.com/developerworks/aix/library/au-JavaPart2.html
-
-[vm13] Options in JVM profiles (IBM)
- http://publib.boulder.ibm.com/infocenter/cicsts/v3r1/index.jsp?topic=/com.ibm.cics.ts31.doc/dfha2/dfha2jb.htm
-
-
-Garbage Collection
-------------------
-
-[gc01] Tuning Garbage Collection with the 5.0 Java[tm] Virtual Machine
- http://java.sun.com/docs/hotspot/gc5.0/gc_tuning_5.html
-
-[gc02] Tuning Garbage Collection with the 1.4.2 Java[tm] Virtual Machine
- http://java.sun.com/docs/hotspot/gc1.4.2/
-
-[gc03] Tuning Garbage Collection with the 1.3.1 Java[tm] Virtual Machine
- http://java.sun.com/docs/hotspot/gc/
-
-[gc04] Garbage Collector Ergonomics
- http://java.sun.com/j2se/1.5.0/docs/guide/vm/gc-ergonomics.html
-
@@ -1,104 +0,0 @@
-digraph SQLTypes {
-
- size="4,4"
- rankdir=BT
- rank=max
- ratio=compress
-
- node [shape = record]
-
- Tree
-
- SymTree -> Tree
-
- DefTree -> SymTree
-
- TermTree -> Tree
-
- TypTree -> Tree
-
- EmptyTree -> TermTree
-
- PackageDef -> DefTree
-
- ClassDef -> DefTree
-
- ModuleDef -> DefTree
-
- ValDef -> DefTree
-
- DefDef -> DefTree
-
- AbsTypeDef -> DefTree
-
- AliasTypeDef -> DefTree
-
- LabelDef -> DefTree
- LabelDef -> TermTree
-
- Import -> SymTree
-
- Attributed -> Tree
-
- DocDef -> Tree
-
- Template -> SymTree
-
- Block -> TermTree
-
- CaseDef -> Tree
-
- Sequence -> TermTree
-
- Alternative -> TermTree
-
- Star -> TermTree
-
- Bind -> DefTree
-
- ArrayValue -> TermTree
-
- Function -> TermTree
-
- Assign -> TermTree
-
- If -> TermTree
-
- Match -> TermTree
-
- Return -> TermTree
-
- Try -> TermTree
-
- Throw -> TermTree
-
- New -> TermTree
-
- TypeApply -> TermTree
-
- Apply -> TermTree
-
- Super -> TermTree
- Super -> SymTree
-
- This -> TermTree
- This -> SymTree
-
- Select -> SymTree
-
- Ident -> SymTree
-
- Literal -> TermTree
-
- TypeTree -> TypTree
-
- SingletonTypeTree -> TypTree
-
- SelectFromTypeTree -> TypTree
- SelectFromTypeTree -> SymTree
-
- CompoundTypeTree -> TypTree
-
- AppliedTypeTree -> TypTree
-
-}
Oops, something went wrong.

0 comments on commit ec960ad

Please sign in to comment.