Skip to content

Commit 9a2606d

Browse files
committed
Combine some install-steps in one make target
1 parent f64bc6e commit 9a2606d

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,11 @@ downloads-json-data:
112112
@echo "\nRun this command in the directory of your cloned copy of 'https://github.com/roundcube/roundcube.github.com/'\nto generate the data for the file 'releases.json':\n./_bin/generate-downloads-json-data.php $(PWD) $(VERSION)\n"
113113

114114
release: edit-changelog git-tag all sign verify downloads-json-data git-tag-push
115+
116+
composer-update: /tmp/composer.phar
117+
php /tmp/composer.phar update --no-dev
118+
119+
install-jsdeps: npm-install
120+
./bin/install-jsdeps.sh
121+
122+
build: composer-update install-jsdeps css-elastic

docs/INSTALL.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,13 @@ INSTALLATION
3535
1. Decompress and put this folder somewhere inside your server's filesystem.
3636
Note: Make sure files have proper owner/group for your setup. If you use
3737
tar command `--no-same-owner` option might be helpful.
38-
2. In case you don't use the so-called "complete" release package,
39-
you have to install PHP and javascript dependencies.
40-
- Install PHP dependencies using composer:
41-
- get composer from [getcomposer.org][getcomposer]
42-
- if you want to use LDAP address books, enable the LDAP libraries in your
43-
composer.json file by moving the items from "suggest" to the "require"
44-
section (remove the explanation texts after the version!).
45-
- run `php composer.phar update --no-dev`
46-
- Install Javascript dependencies by executing `./bin/install-jsdeps.sh` script.
47-
- Install some developer tools by executing `npm install`.
48-
- If you use git sources, compile css files for the Elastic skin as described
49-
in the [skins/elastic/README.md](../skins/elastic/README.md) file.
38+
2. In case you don't use the so-called "complete" release package, you have to
39+
install PHP- and JavaScript-dependencies, as well as build some files by
40+
running `make -B build`.
41+
- If you want to use LDAP address books, enable the LDAP libraries in your
42+
composer.json file by moving the items from "suggest" to the "require"
43+
section (remove the explanation texts after the version!), and afterwards
44+
run `make -B composer-update`.
5045
3. Make sure that the following directories (and the files within)
5146
are writable by the webserver
5247
- `/temp`

0 commit comments

Comments
 (0)