From d86facb98aaa76ad7f925fe78e9fd7eff55a78a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 12 Feb 2020 21:58:30 +0100 Subject: [PATCH] Updated some http URLs to https Also removed a very outdated README.txt about building a Windows installer. --- CONTRIBUTING.md | 2 +- LICENSE.APACHE | 4 +-- dist/copr/tiled.spec | 16 +++++------ dist/win/README.txt | 45 ------------------------------- dist/win/installer.wxs | 4 +-- util/java/libtiled-java/README.md | 2 +- 6 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 dist/win/README.txt diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e8aeae277e..93e906ee5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ Also, please consider adding a screenshot or video if it helps illustrate the is First of all, look around the already open issues to see if the feature was already requested in some form. In that case it's better to comment on the existing feature instead. -If you're not entirely sure about what feature you need, consider to [post your problem on the forum](http://discourse.mapeditor.org/) instead. +If you're not entirely sure about what feature you need, consider to [post your problem on the forum](https://discourse.mapeditor.org/) instead. In any case, be sure to describe the feature in enough detail, to consider its implications on existing parts of the software if relevant and to describe how it would help you in particular. Also, please consider including a mockup if the issue includes UI changes. diff --git a/LICENSE.APACHE b/LICENSE.APACHE index 261eeb9e9f..20e4bd8566 100644 --- a/LICENSE.APACHE +++ b/LICENSE.APACHE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -192,7 +192,7 @@ 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 + https://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, diff --git a/dist/copr/tiled.spec b/dist/copr/tiled.spec index 4aa11f591e..d0e6dbe773 100644 --- a/dist/copr/tiled.spec +++ b/dist/copr/tiled.spec @@ -7,7 +7,7 @@ Release: 1%{?dist} Summary: Tiled Map Editor # tiled itself is GPLv2+, libtiled and tmxviewer are BSD License: GPLv2+ and BSD -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Source0: https://github.com/bjorn/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: pkgconfig(Qt5Core) @@ -29,7 +29,7 @@ to view Tiled maps. %package plugin-python Summary: Python plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-python A plugin for tiled which allows to write Python plugins. @@ -39,7 +39,7 @@ A plugin for tiled which allows to write Python plugins. %package plugin-droidcraft Summary: Droidcraft plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-droidcraft A plugin for tiled which allows to save maps as .dat droidcraft maps. @@ -49,7 +49,7 @@ A plugin for tiled which allows to save maps as .dat droidcraft maps. %package plugin-flare Summary: Flare plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-flare A plugin for tiled which allows to save maps as .txt flare maps. @@ -59,7 +59,7 @@ A plugin for tiled which allows to save maps as .txt flare maps. %package plugin-replica-island Summary: Replica Island plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-replica-island A plugin for tiled which allows to save maps as .bin Replica Island maps. @@ -69,7 +69,7 @@ A plugin for tiled which allows to save maps as .bin Replica Island maps. %package plugin-t-engine4 Summary: T-Engine4 plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-t-engine4 A plugin for tiled which allows to export maps as .lua T-Engine4 maps. @@ -79,7 +79,7 @@ A plugin for tiled which allows to export maps as .lua T-Engine4 maps. %package plugin-defold Summary: Defold plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-defold A plugin for tiled which allows to export maps as .tilemap Defold maps. @@ -89,7 +89,7 @@ A plugin for tiled which allows to export maps as .tilemap Defold maps. %package plugin-gmx Summary: GameMaker Studio plugin for Tiled License: GPLv2+ -URL: http://www.mapeditor.org +URL: https://www.mapeditor.org Requires: %{name} = %{epoch}:%{version}-%{release} %description plugin-gmx A plugin for tiled which allows to export maps as GameMaker Studio room files. diff --git a/dist/win/README.txt b/dist/win/README.txt deleted file mode 100644 index 691c75c66e..0000000000 --- a/dist/win/README.txt +++ /dev/null @@ -1,45 +0,0 @@ - -How to create a Windows installer for Tiled -=============================================================================== -Prerequisites: - * Qt is installed - * MinGW is installed - * NSIS is installed - * Tiled executable in release mode has already been built - -Tiled's windows installer is created using NSIS. You thus need to -install NSIS first if you want to build your custom windows installer for it. -You can download the latest version of the installer from the NSIS project -website located at http://nsis.sourceforge.net. Another requirement is that the -project be already been built. - -The installer script is called "tiled.nsi" and is located in the dist/win -directory. In order for the script to correctly produce binaries we do however -need to modify the shell environment from which the script is run first. This -is due to the fact that a successful compilation depends on some variables -like the actual location of the Qt or MinGW installation path being correctly -set. These values can not be automatically inferred by the installer script. - -Three mandatory variables "QTDIR", "MINGW" and "VERSION" need to be set to the -correct paths of their respective packages. If VERSION is not set it will try -to read the content of a file "version.txt" located in the root directory of -tiled into that variable. The commands to set those may look like the -following: -set QTDIR="C:\Qt\4.8.6" -set MINGW="C:\MinGW" -set VERSION="0.12.0" - -Optionally you can also set the program architecture which is then used to -deduce the resulting installer filename. It can either be 32 or 64 and defaults -to 32: -set ARCH="32" - -After setting the above variables to the correct values you can compile the -NSIS installer script from the command line by executing the provided batch -script "build_installer.bat". Make sure the nsis compiler is in PATH so it can -be found by the command line interpreter. The resulting installer will be -placed in the same directory where the nsis script was located and have a name -similar to "setup-tiled--.exe", where is replaced with -the value of the "VERSION" variable explained above and will - depending -on the actual value of the "ARCH" variable - reflect the architecture -(win32 or win64) for which the installer is built. diff --git a/dist/win/installer.wxs b/dist/win/installer.wxs index 6d0f25e032..5965e982fe 100644 --- a/dist/win/installer.wxs +++ b/dist/win/installer.wxs @@ -4,7 +4,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/util/java/libtiled-java/README.md b/util/java/libtiled-java/README.md index 1ce60f8867..9cb4987c18 100644 --- a/util/java/libtiled-java/README.md +++ b/util/java/libtiled-java/README.md @@ -11,7 +11,7 @@ This small library is BSD licensed. See the LICENSE.BSD file for details. * Thorbjørn Lindeijer * Mike Thomas -http://www.mapeditor.org/ +https://www.mapeditor.org/ ## Building