Skip to content

Commit

Permalink
Merge electron-complete-builder project into electron-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Feb 15, 2016
1 parent e016af1 commit 022502c
Show file tree
Hide file tree
Showing 75 changed files with 5,446 additions and 32 deletions.
17 changes: 14 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
node_modules
tmp
*.log
node_modules/
tmp/
*.log
out/
npm-debug.log
dist/
.idea/compiler.xml
.idea/encodings.xml
.idea/copyright/profiles_settings.xml
.idea/workspace.xml
typings/browser/
typings/browser.d.ts
typings/main.d.ts
.DS_Store
82 changes: 82 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions .idea/dictionaries/develar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/electron-builder.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/jsLibraryMappings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/runConfigurations/ArtifactPublisherTest.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/runConfigurations/BuildTest.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/runConfigurations/RepoSlugTest.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/scopes/src.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/typescript-compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/watcherTasks.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
example-app
*.spec.js
.idea/
typings/
src/
tsconfig.json
tsd.json
npm-debug.log
test/
docs/
46 changes: 37 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
language: node_js
node_js:
- "0.12"
- "4"
- "5"

branches:
only:
- master
os:
- osx
- linux

env:
- NODE_VERSION=4
- NODE_VERSION=5

language: ruby

rvm:
- 2.2.0

cache:
directories:
- node_modules
- test/testApp/node_modules
- $HOME/.electron
- $HOME/.npm

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gnu-tar dpkg ; fi
- gem install fpm

install:
- rm -rf ~/.nvm
- git clone https://github.com/creationix/nvm.git ~/.nvm
- source ~/.nvm/nvm.sh
- nvm install $NODE_VERSION
- npm install npm -g
- npm -v
- npm prune
- npm install

script:
- npm run test
23 changes: 23 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
platform:
- x64

cache:
- node_modules
- '%APPDATA%\npm-cache'
- '%USERPROFILE%\.electron'

init:
- git config --global core.autocrlf input

install:
- ps: Install-Product node 5 x64
- npm install npm -g
- node -v
- npm -v
- npm prune
- npm install

build: off

test_script:
- npm run test-win
5 changes: 5 additions & 0 deletions lib/linux.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare class Linux {
build(options: any, callback: (error: Error, path: string) => void): void
}

export function init(): Linux
Loading

0 comments on commit 022502c

Please sign in to comment.