From 2aa231df0f9e1c9412dbd2867b0fcb646ea80094 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Wed, 4 Apr 2018 12:42:15 -0500 Subject: [PATCH] Move the licenses around a bit, potentially structuring for Valve to drop in a top level license file. --- LICENSE | 12 ++++++++++++ LICENSE.proton | 1 + build_proton.sh | 4 ++-- LICENSE.lin => dist.LICENSE.lin | 0 LICENSE.osx => dist.LICENSE.osx | 0 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 LICENSE create mode 100644 LICENSE.proton rename LICENSE.lin => dist.LICENSE.lin (100%) rename LICENSE.osx => dist.LICENSE.osx (100%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..fd2e4805 --- /dev/null +++ b/LICENSE @@ -0,0 +1,12 @@ +Copyright (c) 2018, Valve Corporation +All rights reserved. + +Redistribution and use of Proton in source and binary forms is governed +by a variety of licenses. + +Refer to the contents of LICENCE.proton for the license for the top +level contents of the Proton project. + +Proton uses a variety of other software, each of which is governed +by its own license. Those licenses are contained in a file named +LICENSE at the top of each directory. diff --git a/LICENSE.proton b/LICENSE.proton new file mode 100644 index 00000000..ea402d9c --- /dev/null +++ b/LICENSE.proton @@ -0,0 +1 @@ +TODO - Valve to provide a license for Proton itself. Similar to openvr license? diff --git a/build_proton.sh b/build_proton.sh index 8694980e..45bb21c4 100755 --- a/build_proton.sh +++ b/build_proton.sh @@ -491,9 +491,9 @@ if [ "$PACKAGE" = true ]; then cp -a filelock.py dist/ cp -a proton dist/ if [ "$PLATFORM" == "Darwin" ]; then - cp -a LICENSE.osx dist/LICENSE + cp -a dist.LICENSE.osx dist/LICENSE else - cp -a LICENSE.lin dist/LICENSE + cp -a dist.LICENSE.lin dist/LICENSE fi date '+%s' > dist/version diff --git a/LICENSE.lin b/dist.LICENSE.lin similarity index 100% rename from LICENSE.lin rename to dist.LICENSE.lin diff --git a/LICENSE.osx b/dist.LICENSE.osx similarity index 100% rename from LICENSE.osx rename to dist.LICENSE.osx