diff --git a/LICENSE b/LICENSE index 8fb5d8b12..8aa1456ef 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -VisiCut itself is licensed under the GNU Lesser Public License (see COPYING.LESSER for details). +VisiCut itself is licensed under the GNU Lesser Public License (see https://www.gnu.org/licenses/lgpl-3.0-standalone.html or COPYING.LESSER for details). However, it contains some 3rd Party files, which are listed below. diff --git a/distribute/distribute.sh b/distribute/distribute.sh index abd032be8..e9b5fd216 100755 --- a/distribute/distribute.sh +++ b/distribute/distribute.sh @@ -81,7 +81,14 @@ then unzip -q ../cache/jre.zip mv *jre*/ stream/jre/ test -e stream/jre/bin/java.exe || { echo "Cannot find java.exe in JRE ZIP file"; exit 1; } - + test -e stream/jre/legal/java.base/LICENSE || { echo "Cannot find license information in JRE ZIP file"; exit 1; } + # Build license text for Windows installer + { + cat ../../LICENSE + echo "Java Runtime for Windows:" + echo -e "- OpenJRE (GPLv2 with Classpath exception). License details follow:" + find stream/jre/legal/ -type f -print -exec cat '{}' ';' + } > stream/license-with-jre.txt makensis launcher.nsi > /dev/null || exit 1 # build VisiCut.exe cp VisiCut.exe ../visicut/ # copy VisiCut.exe so that it is included in the platform independent ZIP mv VisiCut.exe ./stream/ diff --git a/distribute/windows/installer.nsi b/distribute/windows/installer.nsi index d293203b5..0085ff617 100644 --- a/distribute/windows/installer.nsi +++ b/distribute/windows/installer.nsi @@ -33,7 +33,7 @@ ;Pages ; License page - ; !insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt" + !insertmacro MUI_PAGE_LICENSE "stream\license-with-jre.txt" !insertmacro MUI_PAGE_INSTFILES !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Installation complete" !define MUI_PAGE_HEADER_TEXT "Installing"