Commit c9325779 authored by Gautam Chitnis's avatar Gautam Chitnis

share build: Changes to build VLC using new contents in /share module

This commit makes required changes and adds any appropriate files to make the project compilable using new contents in /share folder.
Cleaning task in /share makefile is yet to be modified to clean new files if needed.
New tools added as dependencies are added as pre-compiled binaries pending further decision.

Gautam C.
parent dfff660a
all: js css preserve
CLEANFILES = skins2/default.vlt CLEANFILES = skins2/default.vlt
MOSTLYCLEANFILES = MOSTLYCLEANFILES =
EXTRA_DIST = EXTRA_DIST =
JS_TARGETS = $(shell cat js.manifest.txt)
CLOSURE = java -jar ../extras/tools/closure_compiler.jar $(JS_TARGETS)
CLOSURE_FLAGS =
JS_DIST_DIR := lua/http/dist/js
MKDIR_P := mkdir -p
SASS_TARGETS = ../share/lua/http/src/scss/main.scss
SASS_DIST_DIR = ../share/lua/http/dist/css
SASSC = ../extras/tools/sassc $(SASS_TARGETS) $(SASS_DIST_DIR)/main.css
SASSC_FLAGS =
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
if !HAVE_WIN32 if !HAVE_WIN32
if !HAVE_DARWIN if !HAVE_DARWIN
...@@ -115,6 +129,17 @@ luac_verbose_0 = @echo " LUAC $@"; ...@@ -115,6 +129,17 @@ luac_verbose_0 = @echo " LUAC $@";
$(AM_V_at)mkdir -p "$$(dirname '$@')" $(AM_V_at)mkdir -p "$$(dirname '$@')"
$(luac_verbose)$(LUAC) -o $@ $< $(luac_verbose)$(LUAC) -o $@ $<
js:
${MKDIR_P} $(JS_DIST_DIR)
$(CLOSURE) $(CLOSURE_FLAGS) $<
css:
${MKDIR_P} $(SASS_DIST_DIR)
$(SASSC) $(SASSC_FLAGS) $<
preserve:
rsync -rupE ../share/lua/http/src/vendors ../share/lua/http/dist/
if BUILD_LUA if BUILD_LUA
nobase_vlclib_DATA = \ nobase_vlclib_DATA = \
lua/extensions/VLSub.luac \ lua/extensions/VLSub.luac \
...@@ -244,65 +269,19 @@ EXTRA_DIST += \ ...@@ -244,65 +269,19 @@ EXTRA_DIST += \
lua/sd/jamendo.lua lua/sd/jamendo.lua
DIST_http_lua = \ DIST_http_lua = \
lua/http/view.html \ lua/http/requests/playlist.xml \
lua/http/mobile.html \ lua/http/requests/playlist.json \
lua/http/dialogs/create_stream.html \ lua/http/requests/README.txt \
lua/http/dialogs/equalizer_window.html \ lua/http/requests/playlist_jstree.xml \
lua/http/dialogs/mosaic_window.html \ lua/http/requests/browse.xml \
lua/http/dialogs/batch_window.html \ lua/http/requests/browse.json \
lua/http/dialogs/error_window.html \ lua/http/requests/vlm_cmd.xml \
lua/http/dialogs/browse_window.html \ lua/http/requests/status.xml \
lua/http/dialogs/stream_window.html \ lua/http/requests/status.json \
lua/http/dialogs/offset_window.html \ lua/http/requests/vlm.xml \
lua/http/dialogs/stream_config_window.html \
lua/http/custom.lua \ lua/http/custom.lua \
lua/http/vlm.html \
lua/http/images/buttons.png \
lua/http/images/speaker-32.png \
lua/http/images/vlc-48.png \
lua/http/images/Audio-48.png \
lua/http/images/Folder-48.png \
lua/http/images/Other-48.png \
lua/http/images/Back-48.png \
lua/http/images/Video-48.png \
lua/http/images/vlc16x16.png \
lua/http/mobile_equalizer.html \
lua/http/vlm_export.html \
lua/http/mobile_browse.html \
lua/http/favicon.ico \ lua/http/favicon.ico \
lua/http/mobile_view.html \ lua/http/index.html
lua/http/requests/playlist.xml \
lua/http/requests/playlist.json \
lua/http/requests/README.txt \
lua/http/requests/playlist_jstree.xml \
lua/http/requests/browse.xml \
lua/http/requests/browse.json \
lua/http/requests/vlm_cmd.xml \
lua/http/requests/status.xml \
lua/http/requests/status.json \
lua/http/requests/vlm.xml \
lua/http/index.html \
lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css \
lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
lua/http/css/main.css \
lua/http/css/mobile.css \
lua/http/js/ui.js \
lua/http/js/common.js \
lua/http/js/jquery.jstree.js \
lua/http/js/controllers.js
DIST_solid = \ DIST_solid = \
solid/vlc-openbd.desktop \ solid/vlc-openbd.desktop \
......
--js ../share/lua/http/src/services/command.service.js
--js ../share/lua/http/src/services/bus.service.js
--js ../share/lua/http/src/services/initialize.service.js
--js ../share/lua/http/src/components/player/plyr.methods.js
--js ../share/lua/http/src/components/controls/sidenav.component.js
--js ../share/lua/http/src/components/playlist/playlist.component.js
--js ../share/lua/http/src/components/playlist/buttons.playlist.component.js
--js ../share/lua/http/src/components/controls/filebrowser.component.js
--js ../share/lua/http/src/components/vlm/vlm.component.js
--js ../share/lua/http/src/components/equalizer/equalizer.component.js
--js ../share/lua/http/src/components/track-synchronisation/tracksync.component.js
--js ../share/lua/http/src/components/sot/stream.manager.component.js
--js_output_file ../share/lua/http/dist/js/output_script.js
\ No newline at end of file
...@@ -5,17 +5,16 @@ ...@@ -5,17 +5,16 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="initial-scale=1"> <meta name="viewport" content="initial-scale=1">
<title>VLC media player - Web Interface</title> <title>VLC media player - Web Interface</title>
<link rel="stylesheet" href="src/vendors/bootstrap/bootstrap.min.css"> <link rel="stylesheet" href="dist/vendors/bootstrap/bootstrap.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"> <link rel="stylesheet" href="dist/vendors/font-awesome/font-awesome.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css"> <link rel="stylesheet" href="dist/vendors/jstree/themes/default/style.css">
<!--<link rel="stylesheet" href="dist/css/vendor/jstree-theme.css">-->
<link rel="stylesheet" href="dist/css/main.css"> <link rel="stylesheet" href="dist/css/main.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src='src/vendors/vue/vue.js'></script> <script src='dist/vendors/vue/vue.js'></script>
<script src="src/vendors/plyr/plyr.js"></script> <script src="dist/vendors/plyr/plyr.js"></script>
<script src="src/vendors/jstree/jstree.min.js"></script> <script src="dist/vendors/jstree/jstree.min.js"></script>
<script src="dist/js/output_script.js"></script> <script src="dist/js/output_script.js"></script>
<script src="src/vendors/bootstrap/bootstrap.min.js"></script> <script src="dist/vendors/bootstrap/bootstrap.min.js"></script>
</head> </head>
<!-- <!--
PRODUCTION <head> tag PRODUCTION <head> tag
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// ========================================================================== // ==========================================================================
@import "plyr.lib.vars.scss"; @import "plyr.lib.vars.scss";
@import "../utils/mixins.util.scss"; @import "../../utils/mixins.util.scss";
// Animation // Animation
// --------------------------------------- // ---------------------------------------
......
This diff is collapsed.
/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
.fa {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* makes the font 33% larger relative to the icon container */
.fa-lg {
font-size: 1.33333333em;
line-height: 0.75em;
vertical-align: -15%;
}
.fa-2x {
font-size: 2em;
}
.fa-3x {
font-size: 3em;
}
.fa-4x {
font-size: 4em;
}
.fa-5x {
font-size: 5em;
}
.fa-fw {
width: 1.28571429em;
text-align: center;
}
.fa-ul {
padding-left: 0;
margin-left: 2.14285714em;
list-style-type: none;
}
.fa-ul > li {
position: relative;
}
.fa-li {
position: absolute;
left: -2.14285714em;
width: 2.14285714em;
top: 0.14285714em;
text-align: center;
}
.fa-li.fa-lg {
left: -1.85714286em;
}
.fa-border {
padding: .2em .25em .15em;
border: solid 0.08em #eeeeee;
border-radius: .1em;
}
.fa-pull-left {
float: left;
}
.fa-pull-right {
float: right;
}
.fa.fa-pull-left {
margin-right: .3em;
}
.fa.fa-pull-right {
margin-left: .3em;
}
/* Deprecated as of 4.4.0 */
.pull-right {
float: right;
}
.pull-left {
float: left;
}
.fa.pull-left {
margin-right: .3em;
}
.fa.pull-right {
margin-left: .3em;
}
.fa-spin {
-webkit-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
}
.fa-pulse {
-webkit-animation: fa-spin 1s infinite steps(8);
animation: fa-spin 1s infinite steps(8);
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
.fa-rotate-90 {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
-webkit-transform: rotate(90deg);
-ms-transform: rotate(90deg);
transform: rotate(90deg);
}
.fa-rotate-180 {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
-webkit-transform: rotate(180deg);
-ms-transform: rotate(180deg);
transform: rotate(180deg);
}
.fa-rotate-270 {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
-webkit-transform: rotate(270deg);
-ms-transform: rotate(270deg);
transform: rotate(270deg);
}
.fa-flip-horizontal {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
-webkit-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
.fa-flip-vertical {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-webkit-transform: scale(1, -1);
-ms-transform: scale(1, -1);
transform: scale(1, -1);
}
:root .fa-rotate-90,
:root .fa-rotate-180,
:root .fa-rotate-270,
:root .fa-flip-horizontal,
:root .fa-flip-vertical {
filter: none;
}
.fa-stack {
position: relative;
display: inline-block;
width: 2em;
height: 2em;
line-height: 2em;
vertical-align: middle;
}
.fa-stack-1x,
.fa-stack-2x {
position: absolute;
left: 0;
width: 100%;
text-align: center;
}
.fa-stack-1x {
line-height: inherit;
}
.fa-stack-2x {
font-size: 2em;
}
.fa-inverse {
color: #ffffff;
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
.fa-glass:before {
content: "\f000";
}
.fa-music:before {
content: "\f001";
}
.fa-search:before {
content: "\f002";
}
.fa-envelope-o:before {
content: "\f003";
}
.fa-heart:before {
content: "\f004";
}
.fa-star:before {
content: "\f005";
}
.fa-star-o:before {
content: "\f006";
}
.fa-user:before {
content: "\f007";
}
.fa-film:before {
content: "\f008";
}
.fa-th-large:before {
content: "\f009";
}
.fa-th:before {
content: "\f00a";
}
.fa-th-list:before {
content: "\f00b";
}
.fa-check:before {
content: "\f00c";
}
.fa-remove:before,
.fa-close:before,
.fa-times:before {
content: "\f00d";
}
.fa-search-plus:before {
content: "\f00e";
}
.fa-search-minus:before {
content: "\f010";
}
.fa-power-off:before {
content: "\f011";
}
.fa-signal:before {
content: "\f012";
}
.fa-gear:before,
.fa-cog:before {
content: "\f013";
}
.fa-trash-o:before {
content: "\f014";
}
.fa-home:before {
content: "\f015";
}
.fa-file-o:before {
content: "\f016";
}
.fa-clock-o:before {
content: "\f017";
}
.fa-road:before {
content: "\f018";
}
.fa-download:before {
content: "\f019";
}
.fa-arrow-circle-o-down:before {
content: "\f01a";
}
.fa-arrow-circle-o-up:before {
content: "\f01b";
}
.fa-inbox:before {
content: "\f01c";
}
.fa-play-circle-o:before {
content: "\f01d";
}
.fa-rotate-right:before,
.fa-repeat:before {
content: "\f01e";
}
.fa-refresh:before {
content: "\f021";
}
.fa-list-alt:before {
content: "\f022";
}
.fa-lock:before {
content: "\f023";
}
.fa-flag:before {
content: "\f024";
}
.fa-headphones:before {
content: "\f025";
}
.fa-volume-off:before {
content: "\f026";
}
.fa-volume-down:before {
content: "\f027";
}
.fa-volume-up:before {
content: "\f028";
}
.fa-qrcode:before {
content: "\f029";
}
.fa-barcode:before {
content: "\f02a";
}
.fa-tag:before {
content: "\f02b";
}
.fa-tags:before {
content: "\f02c";
}
.fa-book:before {
content: "\f02d";
}
.fa-bookmark:before {
content: "\f02e";
}
.fa-print:before {
content: "\f02f";
}
.fa-camera:before {
content: "\f030";
}
.fa-font:before {
content: "\f031";
}
.fa-bold:before {
content: "\f032";
}
.fa-italic:before {
content: "\f033";
}
.fa-text-height:before {
content: "\f034";
}
.fa-text-width:before {
content: "\f035";
}
.fa-align-left:before {
content: "\f036";
}
.fa-align-center:before {
content: "\f037";
}
.fa-align-right:before {
content: "\f038";
}
.fa-align-justify:before {
content: "\f039";
}
.fa-list:before {
content: "\f03a";
}
.fa-dedent:before,
.fa-outdent:before {
content: "\f03b";
}
.fa-indent:before {
content: "\f03c";
}
.fa-video-camera:before {
content: "\f03d";
}
.fa-photo:before,
.fa-image:before,
.fa-picture-o:before {
content: "\f03e";
}
.fa-pencil:before {
content: "\f040";
}
.fa-map-marker:before {
content: "\f041";
}
.fa-adjust:before {
content: "\f042";
}
.fa-tint:before {
content: "\f043";
}
.fa-edit:before,
.fa-pencil-square-o:before {
content: "\f044";
}
.fa-share-square-o:before {
content: "\f045";
}
.fa-check-square-o:before {
content: "\f046";
}
.fa-arrows:before {
content: "\f047";
}
.fa-step-backward:before {
content: "\f048";
}
.fa-fast-backward:before {
content: "\f049";
}
.fa-backward:before {
content: "\f04a";
}
.fa-play:before {
content: "\f04b";
}
.fa-pause:before {
content: "\f04c";
}
.fa-stop:before {
content: "\f04d";
}
.fa-forward:before {
content: "\f04e";
}
.fa-fast-forward:before {
content: "\f050";
}
.fa-step-forward:before {
content: "\f051";
}
.fa-eject:before {
content: "\f052";
}
.fa-chevron-left:before {
content: "\f053";
}
.fa-chevron-right:before {
content: "\f054";
}
.fa-plus-circle:before {
content: "\f055";
}
.fa-minus-circle:before {
content: "\f056";
}
.fa-times-circle:before {
content: "\f057";
}
.fa-check-circle:before {
content: "\f058";
}
.fa-question-circle:before {
content: "\f059";
}
.fa-info-circle:before {
content: "\f05a";
}
.fa-crosshairs:before {
content: "\f05b";
}
.fa-times-circle-o:before {
content: "\f05c";
}
.fa-check-circle-o:before {
content: "\f05d";
}
.fa-ban:before {
content: "\f05e";
}
.fa-arrow-left:before {
content: "\f060";
}
.fa-arrow-right:before {
content: "\f061";
}
.fa-arrow-up:before {
content: "\f062";
}
.fa-arrow-down:before {
content: "\f063";
}
.fa-mail-forward:before,
.fa-share:before {
content: "\f064";
}
.fa-expand:before {
content: "\f065";
}
.fa-compress:before {
content: "\f066";
}
.fa-plus:before {
content: "\f067";
}
.fa-minus:before {
content: "\f068";
}
.fa-asterisk:before {
content: "\f069";
}
.fa-exclamation-circle:before {
content: "\f06a";
}
.fa-gift:before {
content: "\f06b";
}
.fa-leaf:before {
content: "\f06c";
}
.fa-fire:before {
content: "\f06d";
}
.fa-eye:before {
content: "\f06e";
}
.fa-eye-slash:before {
content: "\f070";
}
.fa-warning:before,
.fa-exclamation-triangle:before {
content: "\f071";
}
.fa-plane:before {
content: "\f072";
}
.fa-calendar:before {
content: "\f073";
}
.fa-random:before {
content: "\f074";
}
.fa-comment:before {
content: "\f075";
}
.fa-magnet:before {
content: "\f076";
}
.fa-chevron-up:before {
content: "\f077";
}
.fa-chevron-down:before {
content: "\f078";
}
.fa-retweet:before {
content: "\f079";
}
.fa-shopping-cart:before {
content: "\f07a";
}