cpp/openttd-patchpack/source Changeset - r23897:e643f8ce322e

Changeset - r23897:e643f8ce322e

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

Charles Pigott - 4 years ago 2019-10-28 22:23:30
charlespigott@googlemail.com

Fix: A few places still referred to old name of COPYING and README

6 files changed with 15 insertions and 15 deletions:

CONTRIBUTING.md

Makefile.bundle.in

README.md

os/os2/installer/openttd.wis

os/rpm/openttd.spec

os/windows/installer/install.nsi

0 comments (0 inline, 0 general)

CONTRIBUTING.md

➞

Show inline comments

@@ @@ -243,7 +243,7 @@ Patchpack discussions and related topics @@
 ### License
 By contributing your code, you agree to license your contribution under the [GPL v2](https://github.com/OpenTTD/OpenTTD/blob/master/COPYING).
+By contributing your code, you agree to license your contribution under the [GPL v2](https://github.com/OpenTTD/OpenTTD/blob/master/COPYING.md).
 ### Privacy Notice

Makefile.bundle.in

➞

Show inline comments

@@ @@ -69,10 +69,10 @@ endif @@
 	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/README.md"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/README.md"            "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING.md"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.md" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.md"  "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ @@ -88,7 +88,7 @@ ifdef MENU_DIR @@
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
+	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING.md" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 endif
 ### Packing the current bundle into several compressed file formats ###
@@ @@ -153,7 +153,7 @@ bundle_dmg: bundle @@
 bundle_exe: all
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
 	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
+	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING.md" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
 	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
 	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
@@ @@ -190,7 +190,7 @@ ifndef DO_NOT_INSTALL_CHANGELOG @@
 endif
 ifndef DO_NOT_INSTALL_LICENSE
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING.md" "$(INSTALL_DOC_DIR)"
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
 ifdef ICON_THEME_DIR

README.md

➞

Show inline comments

@@ @@ -618,7 +618,7 @@ list of available NewGRFs. Once you have @@
 ## 9.0) Licensing
 OpenTTD is licensed under the GNU General Public License version 2.0. For
 the complete license text, see the file 'COPYING'. This license applies
+the complete license text, see the file 'COPYING.md'. This license applies
 to all files in this distribution, except as noted below.
 The squirrel implementation in src/3rdparty/squirrel is licensed under

os/os2/installer/openttd.wis

➞

Show inline comments

@@ @@ -71,7 +71,7 @@ @@
 <!-- page 1: introductory page -->
 <PAGE INDEX="1" TYPE="README">
 <NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
-<README EXTRACTFROMPCK="1">README.TXT</README>
+<README EXTRACTFROMPCK="1">README.md</README>
 <TEXT>Welcome to the OpenTTD installer. This program will install OpenTTD 1.0 on your system. Before we begin the installation process, please take a moment to read the following document.
 Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
@@ @@ -80,7 +80,7 @@ Select "Next" to continue, or "Cancel" t @@
 <!-- page 2: licence page -->
 <PAGE INDEX="2" TYPE="README">
 <NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
 <README EXTRACTFROMPCK="1">COPYING</README>
+<README EXTRACTFROMPCK="1">COPYING.md</README>
 <TEXT>OpenTTD is licenced under the GNU General Public License. The text of the licence is below.
 Select "Next" if you agree to this licence.

os/rpm/openttd.spec

➞

Show inline comments

@@ @@ -81,7 +81,7 @@ the original data from the game or insta @@
 free graphics, OpenSFX for free sounds and OpenMSX for free music.
 OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
+information, see the file 'COPYING.md' included with every release and source
 download of the game.
 %package gui

os/windows/installer/install.nsi

➞

Show inline comments

@@ @@ -63,7 +63,7 @@ Var CDDRIVE @@
 !define MUI_ABORTWARNING
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING"
+!insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING.md"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 !insertmacro MUI_PAGE_COMPONENTS
@@ @@ -156,8 +156,8 @@ Section "!OpenTTD" Section1 @@
 	File ${PATH_ROOT}changelog.txt
 	Push "$INSTDIR\changelog.txt"
 	Call unix2dos
 	File ${PATH_ROOT}COPYING
 	Push "$INSTDIR\COPYING"
 	File ${PATH_ROOT}COPYING.md
 	Push "$INSTDIR\COPYING.md"
 	Call unix2dos
 	File ${PATH_ROOT}README.md
 	Push "$INSTDIR\README.md"
@@ @@ -392,7 +392,7 @@ Section "Uninstall" @@
 	Delete "$INSTDIR\README.md"
 	Delete "$INSTDIR\known-bugs.txt"
 	Delete "$INSTDIR\openttd.exe"
 	Delete "$INSTDIR\COPYING"
+	Delete "$INSTDIR\COPYING.md"
 	Delete "$INSTDIR\INSTALL.LOG"
 	Delete "$INSTDIR\crash.log"
 	Delete "$INSTDIR\crash.dmp"

0 comments (0 inline, 0 general)