mirrors/optar
2
0
Fork 0
mirror of https://github.com/colindean/optar.git synced 2025-03-11 22:17:40 +13:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mirrors:0.0.2
Branches Tags
mirrors:master
mirrors:1.0.0-colindean mirrors:0.0.4 mirrors:0.0.3 mirrors:0.0.2 mirrors:0.0.1
...
compare: mirrors:0.0.4
Branches Tags
mirrors:master
mirrors:1.0.0-colindean mirrors:0.0.4 mirrors:0.0.3 mirrors:0.0.2 mirrors:0.0.1

6 Commits
0.0.2 ... 0.0.4

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
Colin Dean
3956bd04a6 Skips cleanup 
I cannot for the life of me figure out why this is the default other
than to save Travis space when people have huge artifacts.
 2018-04-08 13:18:44 -04:00
2 changed files with 18 additions and 5 deletions
Expand all files Collapse all files

12
.travis.yml
View File

@ -1,7 +1,12 @@
language: c language: c
compiler:
- clang matrix:
- gcc include:
- os: linux
compiler: gcc
- os: osx
compiler: clang
script: make -j script: make -j
before_deploy: make -j archive before_deploy: make -j archive
deploy: deploy:
@ -10,6 +15,7 @@ deploy:
secure: mz4/p8VB7qn6F3M8uPT2/mJmU/nEWRGgsxN+KM/Gg1isSVrRpWP0xYfPTOdU6o9f0IVBRIW7SjHuq1H9kqGhmWx+Aycs8gE905ORYidLRjbkPN/fiS2jL6CcRzolkprvK7btIRhxfFGB/y3L0MELh+kXo1A6oIm+2a+OwNpdi4c= secure: mz4/p8VB7qn6F3M8uPT2/mJmU/nEWRGgsxN+KM/Gg1isSVrRpWP0xYfPTOdU6o9f0IVBRIW7SjHuq1H9kqGhmWx+Aycs8gE905ORYidLRjbkPN/fiS2jL6CcRzolkprvK7btIRhxfFGB/y3L0MELh+kXo1A6oIm+2a+OwNpdi4c=
file: optar-*.tar.gz file: optar-*.tar.gz
file_glob: true file_glob: true
skip_cleanup: true
on: on:
repo: colindean/optar repo: colindean/optar
tags: true tags: true

11
Makefile
View File

@ -5,13 +5,20 @@ ifeq ($(CC), gcc)
else else
SPECIFIC_CFLAGS= SPECIFIC_CFLAGS=
endif endif
INCLUDE_PATHS=$(shell libpng-config --I_opts)
CFLAGS=-O3 -Wall -Wuninitialized \ CFLAGS=-O3 -Wall -Wuninitialized \
-fomit-frame-pointer -funroll-loops \ -fomit-frame-pointer -funroll-loops \
$(SPECIFIC_CFLAGS) \ $(SPECIFIC_CFLAGS) \
-DNODEBUG `libpng-config --I_opts` -DNODEBUG $(INCLUDE_PATHS)
VERSION=$(shell git describe) 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 BINARIES=optar unoptar
EXECUTABLES=$(BINARIES) pgm2ps EXECUTABLES=$(BINARIES) pgm2ps