Skip to content

Commit

Permalink
Removed node_modules from repo. And added support for node_webkit bui…
Browse files Browse the repository at this point in the history
…lder with custom libraries for extra encoders support
  • Loading branch information
GonzaGonza committed Mar 10, 2014
1 parent 378ffd9 commit 2ca31ee
Show file tree
Hide file tree
Showing 3,941 changed files with 116 additions and 993,710 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ lib-cov

node_modules/

build/

pids
logs
results
Expand Down
40 changes: 38 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,52 @@
files: ['sass/**/*.scss'],
tasks: ['sass'],
options: {
livereload: true,
livereload: true
}
},
nodewebkit: {
options: {
version: '0.9.1',
build_dir: './build', // Where the build version of my node-webkit app is saved
mac_icns: './images/popcorntime.icns', // Path to the Mac icon file
mac: true, // We want to build it for mac
win: true, // We want to build it for win
linux32: false, // We don't need linux32
linux64: true // We don't need linux64
},
src: ['./css/**', './fonts/**', './images/**', './js/**', './language/**', './node_modules/**', './rc/**', './tmp/**', './Config.rb', './index.html', './package.json', './README.md' ] // Your node-webkit app './**/*'
},
copy: {
main: {
files: [
{
src: 'libraries/win/ffmpegsumo.dll',
dest: 'build/releases/Popcorn-Time/win/Popcorn-Time/ffmpegsumo.dll',
flatten: true
},
{
src: 'libraries/mac/ffmpegsumo.so',
dest: 'build/releases/Popcorn-Time/mac/Popcorn-Time.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/ffmpegsumo.so',
flatten: true
},
{
src: 'libraries/linux64/libffmpegsumo.so',
dest: 'build/releases/Popcorn-Time/linux64/Popcorn-Time/libffmpegsumo.so',
flatten: true
}
]
}
}
});

grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-node-webkit-builder');

grunt.registerTask('css', ['compass']);

grunt.registerTask('default', ['compass']);
grunt.registerTask('nodewkbuild', ['nodewebkit', 'copy']);


};
51 changes: 51 additions & 0 deletions css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,57 @@ body.has-notification #notification {
-webkit-transform: translateY(-50%);
}

.pagination {
border-radius: 4px;
display: block;
margin: 40px 0;
padding-left: 0;
text-align: center;
}

.pagination ul li {
display: inline-block;
}

.pagination li:first-child > a, .pagination li:first-child > span {
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
margin-left: 0;
}

.pagination li:last-child > a, .pagination li:last-child > span {
border-bottom-right-radius: 4px;
border-top-right-radius: 4px;
}

.pagination li > a, .pagination li > span {
border: 1px solid rgba(255, 255, 255, 0.2);
color: #999999;
float: left;
line-height: 1.42857;
margin-left: -1px;
padding: 6px 12px;
position: relative;
text-decoration: none;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid #000;
text-align: center;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 1px rgba(0, 0, 0, 0.6);
background-image: linear-gradient(to bottom, #2a2a2a 0%, #1b1b1b 100%);
}

.pagination li > a:hover {
opacity: 0.8;
}

.pagination ul li.active a, .pagination li > a:active {
background-image: linear-gradient(to bottom, #121212 0%, #191919 100%);
box-shadow: 0 1px 0px rgba(255, 255, 255, 0.1), inset 0 1px 1px rgba(0, 0, 0, 0.5);
color: #fff;
}

sidebar {
right: 0;
position: absolute;
Expand Down
36 changes: 0 additions & 36 deletions dist/linux/build.sh

This file was deleted.

103 changes: 0 additions & 103 deletions dist/mac/Info.plist

This file was deleted.

45 changes: 0 additions & 45 deletions dist/mac/build.bat

This file was deleted.

2 changes: 0 additions & 2 deletions dist/windows/README.txt

This file was deleted.

Binary file removed dist/windows/installer-image.bmp
Binary file not shown.
Loading

2 comments on commit 2ca31ee

@prcastro
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now, how do we build it for Linux? Shouldn't grunt be on the repo also? I installed grunt-cli with npm, and runned it inside the popcorn-app folder and this is the message:

$ grunt
grunt-cli: The grunt command line interface. (v0.1.13)

Fatal error: Unable to find local grunt.

If you're seeing this message, either a Gruntfile wasn't found or grunt
hasn't been installed locally to your project. For more information about
installing and configuring grunt, please see the Getting Started guide:

http://gruntjs.com/getting-started

@GonzaGonza
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

npm install
and if you want to actually build it, you must have Grunt Installed.
I think that as npm, you should install Grunt globally
npm install -g grunt-cli

Please sign in to comment.