Merge pull request #10 from colindean/matrix

Uses a build matrix to get binaries for Linux and macOS
Fixes YAML for travis
2025-03-11 22:17:40 +13:00 · 2018-04-08 13:43:14 -04:00 · 2018-04-08 13:39:28 -04:00 · 2018-04-08 13:36:54 -04:00 · 2018-04-08 13:32:07 -04:00 · 2018-04-08 13:21:25 -04:00
2 changed files with 17 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,7 +1,12 @@
 language: c
-compiler:
- clang
- gcc
+
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+    - os: osx
+      compiler: clang
+
 script: make -j
 before_deploy: make -j archive
 deploy:
--- a/11
+++ b/11
@ -5,13 +5,20 @@ ifeq ($(CC), gcc)
 else
  SPECIFIC_CFLAGS=
 endif
+INCLUDE_PATHS=$(shell libpng-config --I_opts)
 CFLAGS=-O3 -Wall -Wuninitialized \
       -fomit-frame-pointer -funroll-loops \
 			 $(SPECIFIC_CFLAGS) \
-	     -DNODEBUG `libpng-config --I_opts`
+	     -DNODEBUG $(INCLUDE_PATHS)

 VERSION=$(shell git describe)
-ARCHIVE_PATH=optar-$(VERSION).tar.gz
+ifdef TRAVIS_OS_NAME
+  OS=$(TRAVIS_OS_NAME)
+else
+  OS=$(shell uname -s)
+endif
+ARCH=$(shell uname -m)
+ARCHIVE_PATH=optar-$(VERSION)-$(OS)-$(ARCH).tar.gz
 BINARIES=optar unoptar
 EXECUTABLES=$(BINARIES) pgm2ps
Author	SHA1	Message	Date
Colin Dean	59da44cbed	Merge pull request #10 from colindean/matrix Uses a build matrix to get binaries for Linux and macOS	2018-04-08 13:43:14 -04:00
Colin Dean	ca2ae12337	Fixes YAML for travis Apparently, one element confuses Travis	2018-04-08 13:39:28 -04:00
Colin Dean	1d0b87c6c5	Uses a build matrix to get binaries for Linux and macOS	2018-04-08 13:36:54 -04:00
Colin Dean	2a6de7550f	Adds OS and architecture to archive name	2018-04-08 13:32:07 -04:00
Colin Dean	b3270e4537	Executes libpng-config once Instead of at each CC invocation	2018-04-08 13:21:25 -04:00