Skip to content

Commit

Permalink
Merge pull request #6 from abranhe/1.0.4-dev
Browse files Browse the repository at this point in the history
Jump to 1.0.4 dev
  • Loading branch information
abranhe committed Jan 25, 2019
2 parents b88a86f + f5416d6 commit 68142ca
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 116 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
*.DS_STORE
*.DS_Store
*.o
*.log
*.gcov
*.gcda
*.gcno
binary
test
example
coverage
deps/
18 changes: 14 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
language: c

services:
- docker

compiler:
- clang
- gcc
script: make run-test
- clang
- gcc

before_install:
- docker pull abranhe/clib
- docker run -it -v $(pwd):/src -w /src abranhe/clib sh -c "clib install"

script: docker run -it -v $(pwd):/src -w /src abranhe/clib sh -c "make run-test"

notifications:
email: false
email: false
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PREFIX ?= /usr/local

SRC = binary-cli.c deps/binary.c/binary.c
SRC = cli.c deps/binary.c/binary.c

OBJ_SRC = $(SRC:.c=.o)

Expand Down
10 changes: 6 additions & 4 deletions cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#include <stdlib.h>
#include "binary.h"

const char
*show_help() {
#define VERSION "1.0.4"

const char*
show_help(void) {
return "\n\
An small library to work with binary numbers\n\n\
Usage:\n\n\
Expand All @@ -40,7 +42,7 @@ main(int argc, char **argv) {

if (argc == 2) {
if (!strcmp(a, "-v") || !strcmp(a, "--version")) {
printf("%s", "1.0.3\n");
printf("%s\n", VERSION);
return 0;
}

Expand Down Expand Up @@ -78,4 +80,4 @@ main(int argc, char **argv) {
return 1;
}
return 0;
}
}
61 changes: 0 additions & 61 deletions deps/binary.c/binary.c

This file was deleted.

29 changes: 0 additions & 29 deletions deps/binary.c/binary.h

This file was deleted.

14 changes: 0 additions & 14 deletions deps/binary.c/package.json

This file was deleted.

0 comments on commit 68142ca

Please sign in to comment.