From a36cf13e52f0b4fffeed147171fc7e2937d0271d Mon Sep 17 00:00:00 2001 From: Colin Dean Date: Sun, 8 Apr 2018 12:27:39 -0400 Subject: [PATCH 1/5] Moves some vars in the Makefile --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cd6b04c..1336f62 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,15 @@ CFLAGS=-O3 -Wall -Wuninitialized \ $(SPECIFIC_CFLAGS) \ -DNODEBUG `libpng-config --I_opts` +LIBPNG_PATH ?= /usr/local/include/libpng +INCLUDES = $(LIBPNG_PATH) +INCLUDES_CMD = $(foreach d, $(INCLUDES), -I$d) + +VERSION=$(shell git describe) +ARCHIVE_PATH=optar-$(VERSION).tar.gz +BINARIES=optar unoptar +EXECUTABLES=$(BINARIES) pgm2ps + all: optar unoptar install: @@ -23,7 +32,7 @@ uninstall: rm /usr/local/bin/pgm2ps clean: - rm -f optar unoptar golay golay_codes.c *.o + rm -f $(BINARIES) optar-*.tar.gz golay_codes.c *.o common.o: common.c optar.h $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< @@ -41,7 +50,7 @@ golay.o: golay.c parity.h $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< unoptar.o: unoptar.c optar.h parity.h - $(CC) -c -I/usr/local/include/libpng $(CPPFLAGS) $(CFLAGS) -o $@ $< + $(CC) -c $(INCLUDES_CMD) $(CPPFLAGS) $(CFLAGS) -o $@ $< optar: optar.o common.o golay_codes.o parity.o $(CC) $(LDFLAGS) -o $@ $^ From 1bed801fe771c26577c1337490485dcab35e711c Mon Sep 17 00:00:00 2001 From: Colin Dean Date: Sun, 8 Apr 2018 12:30:28 -0400 Subject: [PATCH 2/5] Removes redundant libpng include It's gotten from the libpng-config command --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1336f62..6c54278 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,6 @@ CFLAGS=-O3 -Wall -Wuninitialized \ $(SPECIFIC_CFLAGS) \ -DNODEBUG `libpng-config --I_opts` -LIBPNG_PATH ?= /usr/local/include/libpng -INCLUDES = $(LIBPNG_PATH) -INCLUDES_CMD = $(foreach d, $(INCLUDES), -I$d) - VERSION=$(shell git describe) ARCHIVE_PATH=optar-$(VERSION).tar.gz BINARIES=optar unoptar @@ -50,7 +46,7 @@ golay.o: golay.c parity.h $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< unoptar.o: unoptar.c optar.h parity.h - $(CC) -c $(INCLUDES_CMD) $(CPPFLAGS) $(CFLAGS) -o $@ $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< optar: optar.o common.o golay_codes.o parity.o $(CC) $(LDFLAGS) -o $@ $^ From 4bbe161c8aea1afb1559e56b0a40a61e3b6297a9 Mon Sep 17 00:00:00 2001 From: Colin Dean Date: Sun, 8 Apr 2018 12:33:45 -0400 Subject: [PATCH 3/5] Ignore some things These were getting annoying --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3b62c57 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.o +golay +golay_codes.c +optar +unoptar From a3266f26ea66ebe12ba864a3e7c95fa369176997 Mon Sep 17 00:00:00 2001 From: Colin Dean Date: Sun, 8 Apr 2018 12:40:49 -0400 Subject: [PATCH 4/5] Builds an archive --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 6c54278..7caaaeb 100644 --- a/Makefile +++ b/Makefile @@ -59,3 +59,8 @@ golay: golay.o parity.o unoptar: unoptar.o common.o golay_codes.o parity.o $(CC) -o $@ -L/usr/local/lib $^ -lm -lpng -lz + +archive: $(ARCHIVE_PATH) + +$(ARCHIVE_PATH): $(EXECUTABLES) + tar czvf $@ $^ From e7b7d26bfa60b419cda97caf37b562741df13715 Mon Sep 17 00:00:00 2001 From: Colin Dean Date: Sun, 8 Apr 2018 12:43:25 -0400 Subject: [PATCH 5/5] Adds travis deployment --- .travis.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf0c0d5..d3a6cff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,15 @@ language: c compiler: - - clang - - gcc -script: "make" +- clang +- gcc +script: make -j +before_deploy: make -j archive +deploy: + provider: releases + api_key: + secure: mz4/p8VB7qn6F3M8uPT2/mJmU/nEWRGgsxN+KM/Gg1isSVrRpWP0xYfPTOdU6o9f0IVBRIW7SjHuq1H9kqGhmWx+Aycs8gE905ORYidLRjbkPN/fiS2jL6CcRzolkprvK7btIRhxfFGB/y3L0MELh+kXo1A6oIm+2a+OwNpdi4c= + file: optar-*.tar.gz + file_glob: true + on: + repo: colindean/optar + tags: true