diff --git a/.travis.yml b/.travis.yml index 9c69806a692..58fb2db878e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +git: + depth: 1000 + language: cpp branches: @@ -12,7 +15,8 @@ dist: trusty addons: artifacts: - paths: $(ls powershell*{deb,pkg} | tr "\n" ":") + paths: + - $(ls powershell*{deb,pkg,AppImage} | tr "\n" ":") install: - (cd tools && ./download.sh) diff --git a/README.md b/README.md index ca7fca0447e..dfa220f15c3 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,16 @@ You can download and install a PowerShell package for any of the following platf | Ubuntu 16.04 | [.deb][rl-ubuntu16] | [Instructions][in-ubuntu16] | | Ubuntu 14.04 | [.deb][rl-ubuntu14] | [Instructions][in-ubuntu14] | | CentOS 7 | [.rpm][rl-centos] | [Instructions][in-centos] | +| Many Linux distributions | [.AppImage][rl-ai] | [Instructions][in-appimage] | | OS X 10.11 | [.pkg][rl-osx] | [Instructions][in-osx] | -| Docker | | [Instructions] [in-docker] | +| Docker | | [Instructions][in-docker] | [rl-windows10]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/PowerShell_6.0.0.9-alpha.9-win10-x64.msi [rl-windows81]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/PowerShell_6.0.0.9-alpha.9-win81-x64.msi [rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell_6.0.0-alpha.9-1ubuntu1.16.04.1_amd64.deb [rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell_6.0.0-alpha.9-1ubuntu1.14.04.1_amd64.deb [rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell-6.0.0_alpha.9-1.el7.centos.x86_64.rpm +[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell-6.0.0-alpha.9-x86_64.AppImage [rl-osx]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell-6.0.0-alpha.9.pkg [installation]: docs/installation @@ -42,6 +44,7 @@ You can download and install a PowerShell package for any of the following platf [in-ubuntu14]: docs/installation/linux.md#ubuntu-1404 [in-ubuntu16]: docs/installation/linux.md#ubuntu-1604 [in-centos]: docs/installation/linux.md#centos-7 +[in-appimage]: docs/installation/linux.md#linux-appimage [in-osx]: docs/installation/linux.md#os-x-1011 [in-docker]: docs/installation/docker.md diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 919bcd396c4..474b848948e 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -2,7 +2,7 @@ Package installation instructions ================================= Supports [Ubuntu 14.04][u14], [Ubuntu 16.04][u16], -[CentOS 7][cos], and [OS X 10.11][osx]. +[CentOS 7][cos], [many Linux distributions (AppImage)][lai], and [OS X 10.11][osx]. All packages are available on our GitHub [releases][] page. Once the package is installed, run `powershell` from a terminal. @@ -10,6 +10,7 @@ Once the package is installed, run `powershell` from a terminal. [u14]: #ubuntu-1404 [u16]: #ubuntu-1604 [cos]: #centos-7 +[lai]: #linux-appimage [osx]: #os-x-1011 Ubuntu 14.04 @@ -46,7 +47,6 @@ sudo dpkg -i powershell_6.0.0-alpha.9-1ubuntu1.16.04.1_amd64.deb [Ubuntu 16.04]: http://releases.ubuntu.com/16.04/ - CentOS 7 ======== @@ -64,6 +64,31 @@ sudo yum install powershell-6.0.0_alpha.9-1.el7.centos.x86_64.rpm [CentOS 7]: https://www.centos.org/download/ +Linux AppImage +============== + +> Please note that we do have an alpha.9 AppImage, +> this is preparation for alpha.10! + +Using a recent Linux distribution for the Intel x86_64 architecture, +download the AppImage `powershell-6.0.0-alpha.9-x86_64.AppImage` +from the [releases][] page onto the Linux machine. + +Then execute the following in the terminal: + +``` +chmod a+x powershell-6.0.0-alpha.9-x86_64.AppImage +./powershell-6.0.0-alpha.9-x86_64.AppImage +``` + +The [AppImage][] lets you run PowerShell without installing it. +It is a portable application that bundles PowerShell and its dependencies +(including .NET Core's system dependencies) into one cohesive package. +This package works independently of the user's Linux distribution, +and is a single binary. + +[appimage]: http://appimage.org/ + OS X 10.11 ========== diff --git a/license_thirdparty_proprietary.txt b/license_thirdparty_proprietary.txt index 51cfcfe7ea2..8fc5e7a94b0 100644 --- a/license_thirdparty_proprietary.txt +++ b/license_thirdparty_proprietary.txt @@ -720,4 +720,25 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po prévus par les lois de votre pays. Le présent contrat ne modifie pas les droits que vous confèrent les lois de votre pays si celles-ci ne le permettent pas. - +The following components are governed by the MIT license, a copy of which appears +below the list of components: +------------------------------------------------------ +tools/appimage.sh +------------------------------------------------------ +Copyright (c) 2016 Simon Peter +All rights reserved. +MIT License +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to the following +conditions: +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/tools/appimage.sh b/tools/appimage.sh new file mode 100755 index 00000000000..67eb1c95c64 --- /dev/null +++ b/tools/appimage.sh @@ -0,0 +1,141 @@ +#!/bin/bash + +# This code is based on an example recipe from the AppImage project, +# https://github.com/probonopd/AppImages/blob/master/recipes/powershell/Recipe +# Copyright (c) 2016 Simon Peter +# The license of this code and of https://github.com/probonopd/AppImages/raw/master/functions.sh +# is the MIT License, see https://github.com/probonopd/AppImages/blob/master/LICENSE +# +# Generate AppImage, http://appimage.org +# +# The resulting PowerShell AppImage is known to run on +# CentOS-7.0-1406-x86_64-GnomeLive.iso +# CentOS-7-x86_64-LiveGNOME-1511.iso +# Chromixium-1.5-amd64.iso +# Fedora-Live-Workstation-x86_64-22-3.iso +# Fedora-Live-Workstation-x86_64-23-10.iso +# SL-72-x86_64-2016-02-03-LiveDVDgnome.iso +# debian-live-8.0.0-amd64-xfce-desktop+nonfree.iso +# debian-live-8.4.0-amd64-gnome-desktop.iso +# elementary_OS_0.3_freya_amd64.iso +# kali-linux-2.0-amd64.iso +# kali-linux-2016.1-amd64.iso +# kubuntu-14.04.4-desktop-amd64.iso +# kubuntu-15.04-desktop-amd64.iso +# kubuntu-16.04-desktop-amd64.iso +# linuxmint-17.3-cinnamon-64bit.iso +# neon-devedition-gitunstable-20160814-0806-amd64.iso +# netrunner-17-64bit.iso +# ubuntu-14.04.1-desktop-amd64.iso +# ubuntu-16.04-desktop-amd64.iso +# ubuntu-gnome-16.04-desktop-amd64.iso +# ubuntu-mate-16.04-desktop-amd64.iso +# xubuntu-16.04-desktop-amd64.iso + +APP=powershell + +mkdir -p ./$APP/$APP.AppDir/usr/lib + +cd ./$APP/ + +wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh +. ./functions.sh + +# We get this app and almost all its dependencies via apt-get +# but not using the host system's information about what is +# installed on the system but our own assumptions instead + +mkdir -p ./tmp/archives/ +mkdir -p ./tmp/lists/partial +touch tmp/pkgcache.bin tmp/srcpkgcache.bin + +generate_status + +echo "deb http://archive.ubuntu.com/ubuntu/ trusty main universe +" > sources.list + +OPTIONS="-o Debug::NoLocking=1 +-o APT::Cache-Limit=125829120 +-o Dir::Etc::sourcelist=./sources.list +-o Dir::State=./tmp +-o Dir::Cache=./tmp +-o Dir::State::status=./status +-o Dir::Etc::sourceparts=- +-o APT::Get::List-Cleanup=0 +-o APT::Get::AllowUnauthenticated=1 +-o Debug::pkgProblemResolver=true +-o Debug::pkgDepCache::AutoInstall=true +-o APT::Install-Recommends=0 +-o APT::Install-Suggests=0 +" + +cp ../powershell_*_amd64.deb . + +# Add local repository so that we can install deb files +# that were downloaded outside of a repository +dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz +echo "deb file:$(readlink -e $PWD) ./" >> sources.list + +apt-get $OPTIONS update + +URLS=$(apt-get $OPTIONS -y install --print-uris $APP | cut -d "'" -f 2 | grep -e "^http") + +wget -c $URLS + +cd ./$APP.AppDir/ + +find ../*.deb -exec dpkg -x {} . \; || true + +rm usr/bin/powershell +mv opt/microsoft/powershell/*/* usr/bin/ + +cat > $APP.desktop <<\EOF +[Desktop Entry] +Name=PowerShell +Comment=Microsoft PowerShell +Exec=powershell +Keywords=shell;prompt;command;commandline;cmd; +Icon=powershell +Type=Application +Categories=System;TerminalEmulator; +StartupNotify=true +Terminal=true +EOF + +cp ../../assets/Powershell_256.png $APP.png + +cat > ./AppRun <<\EOF +#!/bin/sh +HERE=$(dirname $(readlink -f "${0}")) +export PATH="${HERE}/usr/bin/":$PATH +export LD_LIBRARY_PATH="${HERE}/usr/lib/":$LD_LIBRARY_PATH +exec "${HERE}/usr/bin/powershell.wrapper" "$@" +EOF +chmod a+x ./AppRun + +move_lib +mv ./usr/lib/x86_64-linux-gnu/* ./usr/lib/ # AppRun sets Qt env here + +mv ./usr/lib/pulseaudio/*.so usr/lib/ || true + +mv usr/local/share/man usr/share/ + +delete_blacklisted +rm -rf ./etc/ ./home/ ./lib/ || true +rm -r opt/ usr/lib/x86_64-linux-gnu/ usr/lib64 usr/share/ + +VERSION=$(find ../*.deb -name $APP"_*" | head -n 1 | cut -d "~" -f 1 | cut -d "_" -f 2 | cut -d "-" -f 1-2 | sed -e 's|1%3a||g') +echo $VERSION + +get_desktopintegration $APP +sed -i -e 's|^echo|# echo|g' usr/bin/$APP.wrapper # Make less verbose + +# Go out of AppImage +cd .. + +ARCH="x86_64" +generate_appimage + +cp ../out/*AppImage .. + +cd .. diff --git a/tools/travis.sh b/tools/travis.sh index 016e3787a1a..1e3d3bb3258 100755 --- a/tools/travis.sh +++ b/tools/travis.sh @@ -1,8 +1,10 @@ -set -x +set -ex ulimit -n 4096 # Only build packages for branches, not pull requests if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -CrossGen; Start-PSPackage; Start-PSPester; Start-PSxUnit" + # Generate AppImage + ./tools/appimage.sh else powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild -CrossGen; Start-PSPester; Start-PSxUnit" fi