From 3256b1d9ce991e5c0fe4c5b4af86253e4fde4f2a Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Sat, 9 Apr 2016 17:45:38 -0700 Subject: [PATCH] Update docs/tests due to rcedit upgrade --- NEWS.md | 7 +++++++ readme.md | 6 ------ test/ci/before_install.sh | 7 +------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/NEWS.md b/NEWS.md index 321ed9d1..e2553f96 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,13 @@ ## Unreleased +## [6.0.2] - 2016-04-09 + +### Changed + +* [win32] `rcedit` dependency updated to 0.5.x. **The DLL mentioned in the 6.0.1 release notes + is no longer required.** + ## [6.0.1] - 2016-04-08 ### Changed diff --git a/readme.md b/readme.md index cb72dc11..77452dc0 100644 --- a/readme.md +++ b/readme.md @@ -125,12 +125,6 @@ The `Foo Bar.app` folder generated can be executed by a system running OS X, whi Building an Electron app for the Windows platform with a custom icon requires editing the `Electron.exe` file. Currently, electron-packager uses [node-rcedit](https://github.com/atom/node-rcedit) to accomplish this. A Windows executable is bundled in that node package and needs to be run in order for this functionality to work, so on non-Windows host platforms, [Wine](https://www.winehq.org/) needs to be installed. On OS X, it is installable via [Homebrew](http://brew.sh/). -As of `node-rcedit` 0.4.0, an additional DLL is required, `MSVCP120.dll`. This is available in the [Microsoft Visual C++ 2013 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=40784), but the easiest way to install it is to use [winetricks](https://github.com/Winetricks/winetricks): - -```sh -winetricks -q vcrun2013 -``` - ## Related - [electron-builder](https://www.npmjs.com/package/electron-builder) - for creating installer wizards diff --git a/test/ci/before_install.sh b/test/ci/before_install.sh index 72dd9f0e..98e94ba6 100755 --- a/test/ci/before_install.sh +++ b/test/ci/before_install.sh @@ -7,11 +7,6 @@ case "$TRAVIS_OS_NAME" in # Chrome source does not work because they no longer support i386 sudo rm /etc/apt/sources.list.d/google-chrome.list* sudo apt-get update - sudo apt-get install --no-install-recommends --yes wine1.6 winetricks - # 20140817 - wget -q https://raw.githubusercontent.com/Winetricks/winetricks/fa9e42955dbdf780240dedf9057295264fddd98f/src/winetricks - chmod +x winetricks - ./winetricks --version - ./winetricks -q vcrun2013 + sudo apt-get install --no-install-recommends --yes wine1.6 ;; esac