Skip to content

Commit

Permalink
Use (spell-)lintian from package repositories in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
cbdevnet committed Feb 25, 2020
1 parent 0a59a6b commit 1b38789
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -23,6 +23,7 @@ addons:
- libjack-jackd2-dev
- liblua5.3-dev
- libssl-dev
- lintian
packages: &core_build_gpp_latest
- *core_build
- gcc-8
Expand Down Expand Up @@ -197,7 +198,6 @@ before_install:
- $CC --version
#OS X uses something other than $CXX variable
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) ]; then $CXX --version; fi
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then wget "http://archive.ubuntu.com/ubuntu/pool/main/l/lintian/lintian_2.5.104_all.deb"; sudo dpkg -i lintian_*.deb; sudo apt-get install -f -y; fi # Install a later lintian
# Download libraries to link with on Windows
- if [ "$TASK" == "windows" ]; then mkdir libs; wget "https://downloads.sourceforge.net/project/luabinaries/5.3.5/Windows%20Libraries/Dynamic/lua-5.3.5_Win64_dllw6_lib.zip" -O lua53.zip; unzip lua53.zip lua53.dll; mv lua53.dll libs; fi

Expand Down
9 changes: 7 additions & 2 deletions Makefile
Expand Up @@ -55,10 +55,14 @@ backends-full:
midimonster: midimonster.c portability.h $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) $(LDLIBS) -o $@

resource.o: midimonster.rc
x86_64-w64-mingw32-windres $(RCCFLAGS) $< -o $@ --output-format=coff
resource.o: midimonster.rc midimonster.ico
$(RCC) $(RCCFLAGS) $< -o $@ --output-format=coff

midimonster.ico: MIDIMonster.svg
convert -density 384 $< -define icon:auto-resize $@

midimonster.exe: export CC = x86_64-w64-mingw32-gcc
midimonster.exe: RCC ?= x86_64-w64-mingw32-windres
midimonster.exe: CFLAGS += -Wno-format
midimonster.exe: LDLIBS = -lws2_32
midimonster.exe: LDFLAGS += -Wl,--out-implib,libmmapi.a
Expand All @@ -84,6 +88,7 @@ install:
install -d "$(DESTDIR)$(EXAMPLES)"
install -m 0644 configs/* "$(DESTDIR)$(EXAMPLES)"
ifdef DEFAULT_CFG
# Only install the default configuration if it is not already present to avoid overwriting it
ifeq (,$(wildcard $(DEFAULT_CFG)))
install -Dm 0644 monster.cfg "$(DESTDIR)$(DEFAULT_CFG)"
endif
Expand Down
1 change: 1 addition & 0 deletions backends/loopback.c
Expand Up @@ -102,6 +102,7 @@ static int loopback_shutdown(size_t n, instance** inst){
}
free(data->name);
free(inst[u]->impl);
inst[u]->impl = NULL;
}

LOG("Backend shut down");
Expand Down

0 comments on commit 1b38789

Please sign in to comment.