diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2016-12-19 00:10:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 00:10:56 +0300 |
| commit | 2c93268d18e53515a8afbd81c98f1f91465fa830 (patch) | |
| tree | 31f51352efc0d30db59adbbc8cfb0de190bac667 | |
| parent | 3df3fd194634049c65983e3440d6ff1454db2626 (diff) | |
| parent | 930e30d806c903e427fccdbff1b323fc26e659d2 (diff) | |
Merge pull request #253 from nextcloud/fix-rync-packagingnightly-20161218
fix rsync excludes to include 'build' directory of dependencies
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ # Makefile for building the project app_name=mail -project_dir=$(CURDIR)/../$(app_name) +project_dir=$(CURDIR) build_dir=$(CURDIR)/build/artifacts appstore_dir=$(build_dir)/appstore source_dir=$(build_dir)/source @@ -55,7 +55,7 @@ appstore: clean install-deps optimize-js rsync -a \ --exclude=bower.json \ --exclude=.bowerrc \ - --exclude=build \ + --exclude=/build \ --exclude=composer.json \ --exclude=composer.lock \ --exclude=composer.phar \ @@ -77,7 +77,7 @@ appstore: clean install-deps optimize-js --exclude=.lgtm \ --exclude=Makefile \ --exclude=nbproject \ - --exclude=node_modules \ + --exclude=/node_modules \ --exclude=package.json \ --exclude=phpunit*xml \ --exclude=screenshots \ @@ -105,7 +105,7 @@ appstore: clean install-deps optimize-js --exclude=vendor/ezyang/htmlpurifier/VERSION \ --exclude=vendor/ezyang/htmlpurifier/WHATSNEW \ --exclude=vendor/ezyang/htmlpurifier/WYSIWYG \ - $(project_dir) $(sign_dir) + $(project_dir)/ $(sign_dir)/$(app_name) @if [ -f $(cert_dir)/$(app_name).key ]; then \ echo "Signing app files…"; \ php ../../occ integrity:sign-app \ |