awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Makefile: get rid of cmake-build (#2547) 

* Makefile: all: only depend on cmake-build

Previously `make` would first run `cmake-build` (`make` in `build/`),
and then run `make -C build awesome` afterwards again (which gets built
by the first step already).

* Makefile: get rid of cmake-build

* Travis: testing previous commits: make distclean

Otherwise it might fail due to permission errors for existing files:

https://travis-ci.org/awesomeWM/awesome/jobs/476612117#L2785

    -- Build files have been written to: /home/travis/build/awesomeWM/awesome/build
    [  1%] Generating manpages/man1/awesome.1
    [  2%] Generating manpages/man1/awesome.1.gz
    /bin/sh: 1: cannot create /home/travis/build/awesomeWM/awesome/build/manpages/man1/awesome.1.gz: Permission denied
    make[3]: *** [manpages/man1/awesome.1.gz] Error 2
    make[2]: *** [CMakeFiles/man.dir/all] Error 2
    make[1]: *** [all] Error 2
    make: *** [cmake-build] Error 2
This commit is contained in:
Daniel Hahler 2019-01-11 17:04:04 +01:00 committed by GitHub
parent d00d3d4702
commit 0b36da2730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -246,6 +246,10 @@ script:
echo "Testing commit $commit" echo "Testing commit $commit"
git checkout "$commit" git checkout "$commit"
git --no-pager show --stat git --no-pager show --stat
# Remove/clean any existing build dir.
sudo make distclean
if ! make all check CMAKE_ARGS+="-D DO_COVERAGE=0"; then if ! make all check CMAKE_ARGS+="-D DO_COVERAGE=0"; then
failed="$failed $commit" failed="$failed $commit"
fi fi

9
Makefile
View File

@ -5,12 +5,9 @@ else
ECHO=@: ECHO=@:
endif endif
TARGETS=awesome
BUILDDIR=build BUILDDIR=build
all: $(TARGETS) ; all: awesome ;
$(TARGETS): cmake-build
$(BUILDDIR)/Makefile: $(BUILDDIR)/Makefile:
$(ECHO) "Creating build directory and running cmake in it. You can also run CMake directly, if you want." $(ECHO) "Creating build directory and running cmake in it. You can also run CMake directly, if you want."
@ -19,10 +16,6 @@ $(BUILDDIR)/Makefile:
$(ECHO) "Running cmake…" $(ECHO) "Running cmake…"
cd $(BUILDDIR) && cmake $(CMAKE_ARGS) "$(CURDIR)" cd $(BUILDDIR) && cmake $(CMAKE_ARGS) "$(CURDIR)"
cmake-build: $(BUILDDIR)/Makefile
$(ECHO) "Building…"
$(MAKE) -C $(BUILDDIR)
tags: tags:
git ls-files | xargs ctags git ls-files | xargs ctags