Skip to content

Commit 68142ca

Browse files
authored
Merge pull request #6 from abranhe/1.0.4-dev
Jump to 1.0.4 dev
2 parents b88a86f + f5416d6 commit 68142ca

File tree

7 files changed

+23
-116
lines changed

7 files changed

+23
-116
lines changed

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
*.DS_STORE
1+
*.DS_Store
22
*.o
33
*.log
44
*.gcov
55
*.gcda
66
*.gcno
77
binary
88
test
9-
example
10-
coverage
9+
deps/

.travis.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
language: c
2+
3+
services:
4+
- docker
5+
26
compiler:
3-
- clang
4-
- gcc
5-
script: make run-test
7+
- clang
8+
- gcc
9+
10+
before_install:
11+
- docker pull abranhe/clib
12+
- docker run -it -v $(pwd):/src -w /src abranhe/clib sh -c "clib install"
13+
14+
script: docker run -it -v $(pwd):/src -w /src abranhe/clib sh -c "make run-test"
15+
616
notifications:
7-
email: false
17+
email: false

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PREFIX ?= /usr/local
22

3-
SRC = binary-cli.c deps/binary.c/binary.c
3+
SRC = cli.c deps/binary.c/binary.c
44

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

cli.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
#include <stdlib.h>
1414
#include "binary.h"
1515

16-
const char
17-
*show_help() {
16+
#define VERSION "1.0.4"
17+
18+
const char*
19+
show_help(void) {
1820
return "\n\
1921
An small library to work with binary numbers\n\n\
2022
Usage:\n\n\
@@ -40,7 +42,7 @@ main(int argc, char **argv) {
4042

4143
if (argc == 2) {
4244
if (!strcmp(a, "-v") || !strcmp(a, "--version")) {
43-
printf("%s", "1.0.3\n");
45+
printf("%s\n", VERSION);
4446
return 0;
4547
}
4648

@@ -78,4 +80,4 @@ main(int argc, char **argv) {
7880
return 1;
7981
}
8082
return 0;
81-
}
83+
}

deps/binary.c/binary.c

Lines changed: 0 additions & 61 deletions
This file was deleted.

deps/binary.c/binary.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

deps/binary.c/package.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)