Skip to content

Commit

Permalink
Merge pull request #14365 from nextcloud/enh/npm-makefile
Browse files Browse the repository at this point in the history
Makefile to root folder
  • Loading branch information
MorrisJobke authored Feb 25, 2019
2 parents d7538f9 + f7de518 commit 25bb091
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
6 changes: 1 addition & 5 deletions settings/Makefile → Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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!**
Expand Down
1 change: 1 addition & 0 deletions build/files-checker.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
'index.html',
'index.php',
'lib',
'Makefile',
'occ',
'ocs',
'ocs-provider',
Expand Down

0 comments on commit 25bb091

Please sign in to comment.