From 3141699a8bd76ba75c435438e847d6c57a6ae61b Mon Sep 17 00:00:00 2001 From: Pablo Zmdl Date: Mon, 27 Oct 2025 13:57:32 +0100 Subject: [PATCH] Combine some install-steps in one make target --- Makefile | 8 ++++++++ docs/INSTALL.md | 19 +++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d6dcf7b11..82bfd73c0 100644 --- a/Makefile +++ b/Makefile @@ -112,3 +112,11 @@ downloads-json-data: @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" release: edit-changelog git-tag all sign verify downloads-json-data git-tag-push + +composer-update: /tmp/composer.phar + php /tmp/composer.phar update --no-dev + +install-jsdeps: npm-install + ./bin/install-jsdeps.sh + +build: composer-update install-jsdeps css-elastic diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 7d05b66c3..e9acbb341 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -35,18 +35,13 @@ INSTALLATION 1. Decompress and put this folder somewhere inside your server's filesystem. Note: Make sure files have proper owner/group for your setup. If you use tar command `--no-same-owner` option might be helpful. -2. In case you don't use the so-called "complete" release package, - you have to install PHP and javascript dependencies. - - Install PHP dependencies using composer: - - get composer from [getcomposer.org][getcomposer] - - if you want to use LDAP address books, enable the LDAP libraries in your - composer.json file by moving the items from "suggest" to the "require" - section (remove the explanation texts after the version!). - - run `php composer.phar update --no-dev` - - Install Javascript dependencies by executing `./bin/install-jsdeps.sh` script. - - Install some developer tools by executing `npm install`. - - If you use git sources, compile css files for the Elastic skin as described - in the [skins/elastic/README.md](../skins/elastic/README.md) file. +2. In case you don't use the so-called "complete" release package, you have to + install PHP- and JavaScript-dependencies, as well as build some files by + running `make -B build`. + - If you want to use LDAP address books, enable the LDAP libraries in your + composer.json file by moving the items from "suggest" to the "require" + section (remove the explanation texts after the version!), and afterwards + run `make -B composer-update`. 3. Make sure that the following directories (and the files within) are writable by the webserver - `/temp`