jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-20 09:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make asar a development dependency (#1330)

Browse Source 
To prevent any potential version incompatibility caused by simply installing
the latest version of the packages in the CI services.

See: https://github.com/resin-io/etcher/pull/1326
Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2017-04-20 13:48:31 -04:00 committed by GitHub
parent 14a28fedcc
commit 0aefa56e1d
8 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -41,7 +41,6 @@ install:
./scripts/build/docker/run-command.sh -r "${TARGET_ARCH}" -s "${PWD}" -c "make info && make electron-develop"; ./scripts/build/docker/run-command.sh -r "${TARGET_ARCH}" -s "${PWD}" -c "make info && make electron-develop";
else else
pip install codespell==1.9.2 awscli; pip install codespell==1.9.2 awscli;
npm install -g asar;
brew install afsctool jq; brew install afsctool jq;
make info; make info;
travis_wait make electron-develop; travis_wait make electron-develop;

1
appveyor.yml
View File

@ -25,7 +25,6 @@ matrix:
install: install:
- ps: Install-Product node $env:nodejs_version x64 - ps: Install-Product node $env:nodejs_version x64
- npm install -g npm@4.4.4 - npm install -g npm@4.4.4
- npm install -g rimraf asar
- choco install nsis -version 2.51 - choco install nsis -version 2.51
- choco install jq - choco install jq
- choco install curl - choco install curl

2
docs/RUNNING-LOCALLY.md
View File

@ -12,13 +12,11 @@ Prerequisites
- [NodeJS](https://nodejs.org) (at least v6) - [NodeJS](https://nodejs.org) (at least v6)
- [Python](https://www.python.org) - [Python](https://www.python.org)
- [jq](https://stedolan.github.io/jq/) - [jq](https://stedolan.github.io/jq/)
- [Asar](https://github.com/electron/asar)
- [Codespell](https://github.com/lucasdemarchi/codespell) - [Codespell](https://github.com/lucasdemarchi/codespell)
- [curl](https://curl.haxx.se/) - [curl](https://curl.haxx.se/)
### Windows ### Windows
- [Rimraf](https://github.com/isaacs/rimraf)
- [NSIS v2.51](http://nsis.sourceforge.net/Main_Page) (v3.x won't work) - [NSIS v2.51](http://nsis.sourceforge.net/Main_Page) (v3.x won't work)
- Either one of the following: - Either one of the following:
- [Visual C++ 2015 Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) containing standalone compilers, libraries and scripts - [Visual C++ 2015 Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) containing standalone compilers, libraries and scripts

1
package.json
View File

@ -103,6 +103,7 @@
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.6.3", "angular-mocks": "1.6.3",
"asar": "^0.10.0",
"browserify": "^13.0.1", "browserify": "^13.0.1",
"electron-builder": "^2.6.0", "electron-builder": "^2.6.0",
"electron-mocha": "^3.1.1", "electron-mocha": "^3.1.1",

1
scripts/build/docker/Dockerfile-i686
View File

@ -25,7 +25,6 @@ RUN apt-get update && apt-get install -y \
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
&& apt-get install -y nodejs && apt-get install -y nodejs
RUN npm config set spin=false RUN npm config set spin=false
RUN npm install -g asar
# Python # Python
RUN pip install codespell==1.9.2 awscli RUN pip install codespell==1.9.2 awscli

1
scripts/build/docker/Dockerfile-x86_64
View File

@ -25,7 +25,6 @@ RUN apt-get update && apt-get install -y \
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
&& apt-get install -y nodejs && apt-get install -y nodejs
RUN npm config set spin=false RUN npm config set spin=false
RUN npm install -g asar
# Python # Python
RUN pip install codespell==1.9.2 awscli RUN pip install codespell==1.9.2 awscli

1
scripts/build/docker/Dockerfile.template
View File

@ -25,7 +25,6 @@ RUN apt-get update && apt-get install -y \
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
&& apt-get install -y nodejs && apt-get install -y nodejs
RUN npm config set spin=false RUN npm config set spin=false
RUN npm install -g asar
# Python # Python
RUN pip install codespell==1.9.2 awscli RUN pip install codespell==1.9.2 awscli

6
scripts/build/electron-create-asar.sh
View File

@ -19,7 +19,9 @@
set -u set -u
set -e set -e
./scripts/build/check-dependency.sh asar ASAR="./node_modules/.bin/asar"
./scripts/build/check-dependency.sh "$ASAR"
function usage() { function usage() {
echo "Usage: $0" echo "Usage: $0"
@ -49,5 +51,5 @@ fi
# Omit `*.dll` and `*.node` files from the # Omit `*.dll` and `*.node` files from the
# asar package, otherwise `process.dlopen` and # asar package, otherwise `process.dlopen` and
# `module.require` can't load them correctly. # `module.require` can't load them correctly.
asar pack "$ARGV_DIRECTORY" "$ARGV_OUTPUT" \ "$ASAR" pack "$ARGV_DIRECTORY" "$ARGV_OUTPUT" \
--unpack "{*.dll,*.node}" --unpack "{*.dll,*.node}"