ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update Makefile, use tabs and remove duplicate js

Browse Source
This commit is contained in:
Julius Haertl
2017-01-31 16:16:48 +01:00
parent be6a2f72dc
commit 76e9dc15a1
3 changed files with 106 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -12,7 +12,7 @@ sign_dir=$(build_dir)/sign
cert_dir=$(HOME)/.nextcloud/certificates cert_dir=$(HOME)/.nextcloud/certificates
all: appstore default: build
clean-build: clean-build:
rm -rf $(build_dir) rm -rf $(build_dir)
@@ -21,10 +21,6 @@ clean-dist:
rm -rf js/node_modules rm -rf js/node_modules
rm -rf js/vendor rm -rf js/vendor
install-npm-deps-dev:
cd js && npm install --deps
cd js && bower install
install-deps: install-deps:
cd js && npm install --deps cd js && npm install --deps
cd js && bower install cd js && bower install
@@ -34,6 +30,9 @@ build: build-js
build-js: build-js:
$(MAKE) -C js build $(MAKE) -C js build
watch:
$(make) -C js watch
# appstore: clean install-deps # appstore: clean install-deps
appstore: clean-build build appstore: clean-build build
rm -rf $(appstore_build_directory) rm -rf $(appstore_build_directory)

2
templates/main.php
View File

@@ -24,8 +24,6 @@
use OCP\Util; use OCP\Util;
Util::addStyle('deck', 'style'); Util::addStyle('deck', 'style');
Util::addStyle('deck', '../js/vendor/ng-sortable/dist/ng-sortable.min');
Util::addStyle('deck', '../js/vendor/angular-ui-select/dist/select.min');
Util::addScript('deck', 'vendor/angular/angular.min'); Util::addScript('deck', 'vendor/angular/angular.min');
Util::addScript('deck', 'vendor/angular-route/angular-route.min'); Util::addScript('deck', 'vendor/angular-route/angular-route.min');
Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min'); Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min');