widelands

Merge lp:~widelands-dev/widelands/b19-appid into lp:widelands/build19

  1. b19-appid
  2. Merge into b19
Proposed by Tino
Status: Merged
Merged at revision: 8146
Proposed branch: lp:~widelands-dev/widelands/b19-appid
Merge into: lp:widelands/build19
Diff against target: 20 lines (+2/-1)
1 file modified
utils/win32/innosetup/Widelands.iss (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/b19-appid
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+310135@code.launchpad.net

Commit message

Give the build19 builds from Appveyor also a unique AppID.

Description of the change

Backport unique AppID from trunk to build19 branch for appveyor.

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

Continuous integration builds have changed state:

Travis build 1580. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/173664725.
Appveyor build 1418. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_b19_appid-1418.

Revision history for this message
Tino (tino79) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2016-10-04 15:29:55 +0000
+++ utils/win32/innosetup/Widelands.iss 2016-11-06 13:12:39 +0000
@@ -40,6 +40,7 @@
40;Appveyor environment40;Appveyor environment
41#define BuildFolder GetEnv("APPVEYOR_BUILD_FOLDER")41#define BuildFolder GetEnv("APPVEYOR_BUILD_FOLDER")
42#define DLLFolder GetEnv("MINGWPATH")42#define DLLFolder GetEnv("MINGWPATH")
43#define Version GetEnv("APPVEYOR_BUILD_VERSION") + GetEnv("CONFIGURATION") + GetEnv("PLATFORM")
4344
44[Setup]45[Setup]
45AppName={#Name}46AppName={#Name}
@@ -68,7 +69,7 @@
68UninstallDisplayName={#VerName}69UninstallDisplayName={#VerName}
69VersionInfoCopyright={#Publisher}70VersionInfoCopyright={#Publisher}
70InternalCompressLevel=max71InternalCompressLevel=max
71AppID={{WIDELANDS-WIN32-IS}72AppID={#Version}
72AppCopyright={#Copyright}73AppCopyright={#Copyright}
73ChangesAssociations=yes74ChangesAssociations=yes
74PrivilegesRequired=lowest75PrivilegesRequired=lowest

Subscribers

People subscribed via source and target branches

to all changes: