diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-25 17:16:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 17:16:39 +0100 |
| commit | 25bb0918fd8ac3f5c69c8d53494d6167d9531866 (patch) | |
| tree | 921c83705c602ed0a2e237cb6725e27b0b6ab0e2 | |
| parent | d7538f9a61a2af288d82fc257524aee5c2f86769 (diff) | |
| parent | f7de518ec0cf2d30c23e34a3c058dd7819f7d167 (diff) | |
| download | nextcloud-server-25bb0918fd8ac3f5c69c8d53494d6167d9531866.tar.gz nextcloud-server-25bb0918fd8ac3f5c69c8d53494d6167d9531866.zip | |
Merge pull request #14365 from nextcloud/enh/npm-makefile
Makefile to root folder
| -rw-r--r-- | Makefile (renamed from settings/Makefile) | 6 | ||||
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | build/files-checker.php | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/settings/Makefile b/Makefile index 666e99f1e06..7e6b37af669 100644 --- a/settings/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: dev-setup build-js-production -dev-setup: clean clean-dev npm-init +dev-setup: clean-dev npm-init npm-init: npm install @@ -17,10 +17,6 @@ build-js-production: watch-js: npm run watch -clean: - rm -f js/vue-*.js - rm -f js/vue-*.js.map - clean-dev: rm -rf node_modules diff --git a/README.md b/README.md index 1ddfd2facb7..a18323756e0 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Otherwise, git checkouts can be handled the same as release archives, by using t ### Building front-end code 🏗 -We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the `settings` subfolder: +We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder: ``` bash # install dependencies @@ -75,9 +75,6 @@ make watch-js # build for production with minification make build-js-production - -# clean output files -make clean ``` **When making changes, also commit the compiled files!** diff --git a/build/files-checker.php b/build/files-checker.php index 2ca726c3b14..8133b96667d 100644 --- a/build/files-checker.php +++ b/build/files-checker.php @@ -59,6 +59,7 @@ $expectedFiles = [ 'index.html', 'index.php', 'lib', + 'Makefile', 'occ', 'ocs', 'ocs-provider', |