From cf14e6ba7b41b8056bd113457b6912782b3d0238 Mon Sep 17 00:00:00 2001 From: Stefan Zeiger Date: Wed, 18 Jan 2012 16:50:17 +0100 Subject: [PATCH 1/4] Add Jansi license file (because it is not contained in jansi.jar) --- project/packaging.scala | 9 +- src/windows/jansi-license.txt | 202 ++++++++++++++++++++++++++++++++++ 2 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 src/windows/jansi-license.txt diff --git a/project/packaging.scala b/project/packaging.scala index 3886f2b52..315c22fce 100644 --- a/project/packaging.scala +++ b/project/packaging.scala @@ -110,8 +110,10 @@ object Packaging { //wixFile <<= sourceDirectory in Windows map (_ / "sbt.xml"), mappings in packageMsi in Windows <+= sbtLaunchJar map { f => f -> "sbt-launch.jar" }, mappings in packageMsi in Windows <+= jansiJar map { f => f -> "jansi.jar" }, - mappings in packageMsi in Windows <+= sourceDirectory in Windows map { d => - (d / "sbt.bat") -> "sbt.bat" }, + mappings in packageMsi in Windows <++= sourceDirectory in Windows map { d => Seq( + (d / "sbt.bat") -> "sbt.bat", + (d / "jansi-license.txt") -> "jansi-license.txt" + )}, mappings in packageMsi in Windows <+= (compile in Compile, classDirectory in Compile) map { (c, d) => compile; (d / "SbtJansiLaunch.class") -> "SbtJansiLaunch.class" @@ -172,8 +174,9 @@ object Packaging { - + + diff --git a/src/windows/jansi-license.txt b/src/windows/jansi-license.txt new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/src/windows/jansi-license.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From f889a92c340c31cd076160520d06d568282690dd Mon Sep 17 00:00:00 2001 From: Stefan Zeiger Date: Wed, 18 Jan 2012 16:57:48 +0100 Subject: [PATCH 2/4] Reflow License.rtf to make it more readable in the Windows installer --- src/windows/License.rtf | Bin 1812 -> 1724 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/windows/License.rtf b/src/windows/License.rtf index 218b930464d9086391baa7a0a2c037be41af5b83..4f90c8da4330e1b2820ec9f9e5c134b258983d9e 100644 GIT binary patch delta 89 zcmbQjw}*Gb21Z7O$=ev6faE_$|H+|D9h09jxlA@>o;>*sv(IEX78jsQ28$<<+|JSq kB)wQYCU>z2PF}%k3FJLzbp?_}Y|cQkn#}`9o@Da|03NLyX8-^I delta 177 zcmdnPJB4q<21d4+g2W>V0O!Nt>GmNRh23K3i<_!QjJTnXc From bc12a127ee24c9e0be0f3c6be3038780b04b3cc2 Mon Sep 17 00:00:00 2001 From: Stefan Zeiger Date: Wed, 18 Jan 2012 16:58:30 +0100 Subject: [PATCH 3/4] Add sbt launcher script for Cygwin and MSYS to Windows installer --- project/packaging.scala | 12 +++++++++--- src/windows/sbt | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 src/windows/sbt diff --git a/project/packaging.scala b/project/packaging.scala index 315c22fce..bb1321e0c 100644 --- a/project/packaging.scala +++ b/project/packaging.scala @@ -112,6 +112,7 @@ object Packaging { mappings in packageMsi in Windows <+= jansiJar map { f => f -> "jansi.jar" }, mappings in packageMsi in Windows <++= sourceDirectory in Windows map { d => Seq( (d / "sbt.bat") -> "sbt.bat", + (d / "sbt") -> "sbt", (d / "jansi-license.txt") -> "jansi-license.txt" )}, mappings in packageMsi in Windows <+= (compile in Compile, classDirectory in Compile) map { (c, d) => @@ -148,7 +149,7 @@ object Packaging { case Array(major) => Seq(major,"0","0","1") mkString "." } ( - + - - + + + + + + + diff --git a/src/windows/sbt b/src/windows/sbt new file mode 100644 index 000000000..f607847c5 --- /dev/null +++ b/src/windows/sbt @@ -0,0 +1,20 @@ +#!/bin/sh + +# sbt launcher script for Cygwin and MSYS + +UDIR=`dirname "$0"` +if [ -z "$MSYSTEM" ]; then + WDIR=`cygpath -alm "$UDIR"` +else + WDIR=`echo "$UDIR" | sed -e 's~^/\([^/]*\)/~\1:/~'` +fi + +if [ "_$TERM" = "_xterm" ]; then + # Let the terminal handle ANSI sequences + LAUNCHER=xsbt.boot.Boot +else + # Use Jansi to intercept ANSI sequences + LAUNCHER=SbtJansiLaunch +fi + +java -Xmx512M -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" $LAUNCHER $@ From 7e5b93fbf8ba37281445c665ef7817437b16ed09 Mon Sep 17 00:00:00 2001 From: Stefan Zeiger Date: Wed, 18 Jan 2012 17:32:39 +0100 Subject: [PATCH 4/4] Make sbt/jline work properly in Cygwin's MinTTY terminal --- src/windows/sbt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/windows/sbt b/src/windows/sbt index f607847c5..e2fbdb5e6 100644 --- a/src/windows/sbt +++ b/src/windows/sbt @@ -1,7 +1,9 @@ #!/bin/sh - # sbt launcher script for Cygwin and MSYS +JAVA_CMD=java +JAVA_OPTS=-Xmx512M + UDIR=`dirname "$0"` if [ -z "$MSYSTEM" ]; then WDIR=`cygpath -alm "$UDIR"` @@ -11,10 +13,10 @@ fi if [ "_$TERM" = "_xterm" ]; then # Let the terminal handle ANSI sequences - LAUNCHER=xsbt.boot.Boot + stty -icanon min 1 -echo > /dev/null 2>&1 + $JAVA_CMD $JAVA_OPTS -Djline.terminal=jline.UnixTerminal -jar "$WDIR/sbt-launch.jar" $@ + stty icanon echo > /dev/null 2>&1 else # Use Jansi to intercept ANSI sequences - LAUNCHER=SbtJansiLaunch + $JAVA_CMD $JAVA_OPTS -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" SbtJansiLaunch $@ fi - -java -Xmx512M -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" $LAUNCHER $@