Skip to content

Commit

Permalink
Update vjs build
Browse files Browse the repository at this point in the history
fix filenames
add separate build packages
update hola-skin
  • Loading branch information
norlin committed Dec 9, 2015
1 parent 24a3b9d commit fd3c1b9
Show file tree
Hide file tree
Showing 28 changed files with 43 additions and 41 deletions.
27 changes: 15 additions & 12 deletions build/grunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ module.exports = function(grunt) {
},
// compression: 'DEFLATE',
src: ['dist/**/*'],
dest: 'dist/video-js-full-' + version.full + '.zip'
dest: 'dist/videojs-full-' + version.full + '.zip'
},
basic: {
router: function (filepath) {
Expand All @@ -203,7 +203,7 @@ module.exports = function(grunt) {
'dist/video-js.min.css',
'dist/video-js.swf',
],
dest: 'dist/video-js-' + version.full + '.zip'
dest: 'dist/videojs-' + version.full + '.zip'
},
hls: {
router: function (filepath) {
Expand All @@ -213,12 +213,12 @@ module.exports = function(grunt) {
src: [
'dist/videojs.hls.js',
'dist/videojs.hls.min.js',
'dist/videojs.hls.js.map',
'dist/videojs.hls.min.js.map',
'dist/video-js.css',
'dist/video-js.min.css',
'dist/video-js.swf',
],
dest: 'dist/video-js-hls-' + version.full + '.zip'
dest: 'dist/videojs-hls-' + version.full + '.zip'
},
osmf: {
router: function (filepath) {
Expand All @@ -228,13 +228,13 @@ module.exports = function(grunt) {
src: [
'dist/videojs.osmf.js',
'dist/videojs.osmf.min.js',
'dist/videojs.osmf.js.map',
'dist/videojs.osmf.min.js.map',
'dist/video-js.css',
'dist/video-js.min.css',
'dist/video-js.swf',
'dist/video-js-osmf.swf',
'dist/videojs-osmf.swf',
],
dest: 'dist/video-js-osmf-' + version.full + '.zip'
dest: 'dist/videojs-osmf-' + version.full + '.zip'
},
},
version: {
Expand Down Expand Up @@ -287,10 +287,10 @@ module.exports = function(grunt) {
},
files: {
src: [ // Files that you want to attach to Release
`dist/video-js-full-${version.full}.zip`,
`dist/video-js-${version.full}.zip`,
`dist/video-js-hls-${version.full}.zip`,
`dist/video-js-osmf-${version.full}.zip`,
`dist/videojs-full-${version.full}.zip`,
`dist/videojs-${version.full}.zip`,
`dist/videojs-hls-${version.full}.zip`,
`dist/videojs-osmf-${version.full}.zip`,
]
}
},
Expand Down Expand Up @@ -523,7 +523,10 @@ module.exports = function(grunt) {
'build',
'copy:dist',
'copy:examples',
'zip:dist'
'zip:dist',
'zip:basic',
'zip:hls',
'zip:osmf',
]);

// Default task - build and test
Expand Down
1 change: 0 additions & 1 deletion dist/alt/video.novtt.hls.min.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion dist/alt/video.novtt.js
Original file line number Diff line number Diff line change
Expand Up @@ -18024,7 +18024,7 @@ HolaSkin.prototype.dispose = function(){
var defaults = {
className: 'vjs5-hola-skin',
css: '/css/videojs-hola-skin.css',
ver: 'ver=0.0.1'
ver: 'ver=0.0.2'
};

// VideoJS plugin register
Expand Down
2 changes: 1 addition & 1 deletion dist/alt/video.novtt.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/alt/video.novtt.osmf.min.js.map

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18024,7 +18024,7 @@ HolaSkin.prototype.dispose = function(){
var defaults = {
className: 'vjs5-hola-skin',
css: '/css/videojs-hola-skin.css',
ver: 'ver=0.0.1'
ver: 'ver=0.0.2'
};

// VideoJS plugin register
Expand Down

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/alt/videojs.novtt.hls.min.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -18024,7 +18024,7 @@ HolaSkin.prototype.dispose = function(){
var defaults = {
className: 'vjs5-hola-skin',
css: '/css/videojs-hola-skin.css',
ver: 'ver=0.0.1'
ver: 'ver=0.0.2'
};

// VideoJS plugin register
Expand Down

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/alt/videojs.novtt.osmf.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/examples/hls-embed/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
data-setup='{"plugins":{"hola_skin":{"css":false}, "settings_button":{"info":true}}}'>
<source src="http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes.m3u8" type="application/x-mpegurl" />
<source src="http://player.h-cdn.org/static/hls/cdn2/master.m3u8" type="application/x-mpegurl" />
<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
</video>

Expand Down
2 changes: 1 addition & 1 deletion dist/examples/osmf-embed/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
data-setup='{"plugins":{"hola_skin":{"css":false}, "settings_button":{"info":true}}}'>
<source src="http://demo.unified-streaming.com/video/oceans/oceans.mp4/oceans.f4m" type="application/adobe-f4m">
<source src="http://flash.flowplayer.org/demos/standalone/plugins/streaming/bbb.f4m" type="application/adobe-f4m">
<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
</video>

Expand Down
6 changes: 1 addition & 5 deletions dist/examples/simple-embed/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
poster="http://video-js.zencoder.com/oceans-clip.png"
data-setup='{"plugins":{"hola_skin":{"css":false}, "settings_button":{"info":true}}}'>
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
<source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
<track kind="captions" src="../shared/example-captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
<track kind="subtitles" src="../shared/example-captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
<source src="http://player.h-cdn.org/static/mp4/cdn_demo_long_720p.mp4" type='video/mp4' />
<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
</video>

Expand Down
Binary file removed dist/video-js-5.0.2.zip
Binary file not shown.
3 changes: 3 additions & 0 deletions dist/video-js.css
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,9 @@ and the native poster can take over */
border-color: #fff;
background: #00b7f1;
}
.vjs5-hola-skin .vjs-live-control {
order: 4;
}
.vjs5-hola-skin .vjs-volume-bar.vjs-slider-horizontal .vjs-volume-level {
background-color: #00b7f1;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/video-js.min.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/video.hls.min.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion dist/video.js
Original file line number Diff line number Diff line change
Expand Up @@ -19979,7 +19979,7 @@ HolaSkin.prototype.dispose = function(){
var defaults = {
className: 'vjs5-hola-skin',
css: '/css/videojs-hola-skin.css',
ver: 'ver=0.0.1'
ver: 'ver=0.0.2'
};

// VideoJS plugin register
Expand Down
2 changes: 1 addition & 1 deletion dist/video.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/video.osmf.min.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion dist/video.hls.js → dist/videojs.hls.js
Original file line number Diff line number Diff line change
Expand Up @@ -19979,7 +19979,7 @@ HolaSkin.prototype.dispose = function(){
var defaults = {
className: 'vjs5-hola-skin',
css: '/css/videojs-hola-skin.css',
ver: 'ver=0.0.1'
ver: 'ver=0.0.2'
};

// VideoJS plugin register
Expand Down
4 changes: 2 additions & 2 deletions dist/video.hls.min.js → dist/videojs.hls.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/videojs.hls.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/video.osmf.js → dist/videojs.osmf.js
Original file line number Diff line number Diff line change
Expand Up @@ -19979,7 +19979,7 @@ HolaSkin.prototype.dispose = function(){
var defaults = {
className: 'vjs5-hola-skin',
css: '/css/videojs-hola-skin.css',
ver: 'ver=0.0.1'
ver: 'ver=0.0.2'
};

// VideoJS plugin register
Expand Down
4 changes: 2 additions & 2 deletions dist/video.osmf.min.js → dist/videojs.osmf.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/videojs.osmf.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"videojs-swf": "5.0.0-rc1",
"vtt.js": "git+https://github.com/gkatsev/vtt.js.git#vjs-v0.12.1",
"xhr": "2.1.0",
"videojs-hola-skin": "git+https://github.com/hola/videojs5-hola-skin.git#vjs-5.0.2",
"videojs-hola-skin": "git+https://github.com/hola/videojs5-hola-skin.git#vjs-5.0.2-2",
"videojs-settings": "git+https://github.com/hola/videojs5-settings.git#vjs-5.0.2",
"videojs-contrib-hls": "git+https://github.com/hola/videojs-contrib-hls.git#hola_5.0.2-1",
"videojs-osmf": "git+https://github.com/hola/videojs5-osmf"
Expand Down

0 comments on commit fd3c1b9

Please sign in to comment.