Merge lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands

Proposed by Tino
Status: Merged
Merged at revision: 8839
Proposed branch: lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles
Merge into: lp:widelands
Diff against target: 162 lines (+2/-129)
5 files modified
utils/win32/mingw/WL.exe.Manifest (+0/-23)
utils/win32/mingw/Widelands_win.h (+0/-42)
utils/win32/mingw/Widelands_win.rc (+0/-60)
utils/win32/mingw/wlversion.h (+0/-2)
utils/win32/widelands.rc.cmake (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+355178@code.launchpad.net

Commit message

Remove obsolete mingw files.
Only "widelands.rc.cmake" is needed, which cmake needs to generate the ressource file widelands.rc

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3994. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429922544.
Appveyor build 3791. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1629013_obsoletewinfiles-3791.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'utils/win32/mingw'
2=== removed file 'utils/win32/mingw/WL.exe.Manifest'
3--- utils/win32/mingw/WL.exe.Manifest 2008-03-13 21:29:56 +0000
4+++ utils/win32/mingw/WL.exe.Manifest 1970-01-01 00:00:00 +0000
5@@ -1,23 +0,0 @@
6-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
7-<assembly
8- xmlns="urn:schemas-microsoft-com:asm.v1"
9- manifestVersion="1.0">
10-<assemblyIdentity
11- name="SDLapp.Widelands"
12- processorArchitecture="x86"
13- version="1.0.0.0"
14- type="win32"/>
15-<description>Widelands</description>
16-<dependency>
17- <dependentAssembly>
18- <assemblyIdentity
19- type="win32"
20- name="Microsoft.Windows.Common-Controls"
21- version="6.0.0.0"
22- processorArchitecture="x86"
23- publicKeyToken="6595b64144ccf1df"
24- language="*"
25- />
26- </dependentAssembly>
27-</dependency>
28-</assembly>
29
30=== removed file 'utils/win32/mingw/Widelands_win.h'
31--- utils/win32/mingw/Widelands_win.h 2016-09-29 16:47:19 +0000
32+++ utils/win32/mingw/Widelands_win.h 1970-01-01 00:00:00 +0000
33@@ -1,42 +0,0 @@
34-/*
35- * Copyright (C) 2006-2015 by the Widelands Development Team
36- *
37- * This program is free software; you can redistribute it and/or
38- * modify it under the terms of the GNU General Public License
39- * as published by the Free Software Foundation; either version 2
40- * of the License, or (at your option) any later version.
41- *
42- * This program is distributed in the hope that it will be useful,
43- * but WITHOUT ANY WARRANTY; without even the implied warranty of
44- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
45- * GNU General Public License for more details.
46- *
47- * You should have received a copy of the GNU General Public License
48- * along with this program; if not, write to the Free Software
49- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
50- *
51- */
52-
53-#ifndef WIDELANDS_WIN_H
54-#define WIDELANDS_WIN_H
55-
56-#include "wlversion.h"
57-
58-/* VERSION DEFINITIONS */
59-#define VER_STRING "0.0.0.19"
60-#define VER_MAJOR 0
61-#define VER_MINOR 0
62-#define VER_RELEASE 0
63-#define VER_BUILD 19
64-#define COMPANY_NAME "The Widelands Development Team"
65-#define FILE_VERSION BUILD_ID
66-#define FILE_DESCRIPTION "Widelands - realtime strategy game"
67-#define INTERNAL_NAME "WL"
68-#define LEGAL_COPYRIGHT "GPL v2"
69-#define WWW "http:\/\/wl.widelands.org"
70-#define License "Gnu GPL v2"
71-#define ORIGINAL_FILENAME "widelands"
72-#define PRODUCT_NAME "Widelands"
73-#define PRODUCT_VERSION BUILD_ID
74-
75-#endif /*WIDELANDS_WIN_H*/
76
77=== removed file 'utils/win32/mingw/Widelands_win.rc'
78--- utils/win32/mingw/Widelands_win.rc 2016-09-29 16:47:19 +0000
79+++ utils/win32/mingw/Widelands_win.rc 1970-01-01 00:00:00 +0000
80@@ -1,60 +0,0 @@
81-/*
82- * Copyright (C) 2006-2016 by the Widelands Development Team
83- *
84- * This program is free software; you can redistribute it and/or
85- * modify it under the terms of the GNU General Public License
86- * as published by the Free Software Foundation; either version 2
87- * of the License, or (at your option) any later version.
88- *
89- * This program is distributed in the hope that it will be useful,
90- * but WITHOUT ANY WARRANTY; without even the implied warranty of
91- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
92- * GNU General Public License for more details.
93- *
94- * You should have received a copy of the GNU General Public License
95- * along with this program; if not, write to the Free Software
96- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
97- *
98- */
99-
100-#include "wlversion.h"
101-
102-#include <windows.h> // included for version info constants
103-
104-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../WL.ico"
105-
106-// SUPPORT FOR WINDOWS XP THEMES:
107-// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
108-// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
109-1 24 "WL.exe.Manifest"
110-
111-//
112-// TO CHANGE VERSION INFORMATION, EDIT OPTIONS BELOW...
113-//
114-1 VERSIONINFO
115-FILEVERSION 0,0,0,19
116-PRODUCTVERSION 0,0,0,19
117-FILETYPE VFT_APP
118-{
119- BLOCK "StringFileInfo"
120- {
121- BLOCK "080904E4"
122- {
123- VALUE "CompanyName", "The Widelands Development Team"
124- VALUE "FileVersion", BUILD_ID
125- VALUE "FileDescription", "Widelands - realtime strategy game"
126- VALUE "InternalName", "WL"
127- VALUE "LegalCopyright", "GPL v2"
128- VALUE "WWW", "http://www.widelands.org"
129- VALUE "License", "Gnu GPL v2"
130- VALUE "OriginalFilename", "widelands"
131- VALUE "ProductName", "Widelands - an Open-Source realtime strategy game"
132- VALUE "ProductVersion", BUILD_ID
133- }
134- }
135- BLOCK "VarFileInfo"
136- {
137- VALUE "Translation", 0x0809, 1252
138- }
139-}
140-
141
142=== removed file 'utils/win32/mingw/wlversion.h'
143--- utils/win32/mingw/wlversion.h 2016-09-29 16:47:19 +0000
144+++ utils/win32/mingw/wlversion.h 1970-01-01 00:00:00 +0000
145@@ -1,2 +0,0 @@
146-#define BUILD_ID "Build19"
147-#define BUILD_TYPE "inoffical"
148
149=== modified file 'utils/win32/widelands.rc.cmake'
150--- utils/win32/widelands.rc.cmake 2016-09-29 16:47:19 +0000
151+++ utils/win32/widelands.rc.cmake 2018-09-18 07:14:37 +0000
152@@ -25,8 +25,8 @@
153 // TO CHANGE VERSION INFORMATION, EDIT OPTIONS BELOW...
154 //
155 1 VERSIONINFO
156-FILEVERSION 0,19,0,1
157-PRODUCTVERSION 0,19,0,1
158+FILEVERSION 0,20,0,1
159+PRODUCTVERSION 0,20,0,1
160 FILETYPE VFT_APP
161 {
162 BLOCK "StringFileInfo"

Subscribers

People subscribed via source and target branches

to status/vote changes: