building with fpm, deploying to packagecloud

Author: Kareem Zidane

.travis.yml

@@ -1,28 +1,71 @@
-dist: trusty
-sudo: required
+packagecloud: &packagecloud
+  provider: packagecloud
+  username: cs50
+  repository: libcs50
+  token: $PACKAGECLOUD_TOKEN
+  local-dir: build/deb
+  package_glob: *.deb
+  skip_cleanup: true
+  on:
+    branch: master
+
 branches:
   except: "/^v\\d/"
-env:
-  matrix:
-  - DIST=precise DIST_VERSION=12.04
-  - DIST=trusty DIST_VERSION=14.04
-  - DIST=vivid DIST_VERSION=15.04
-  - DIST=xenial DIST_VERSION=16.04
-  - DIST=zesty DIST_VERSION=17.04
-before_install:
-- sudo apt-get install build-essential debhelper devscripts dh-make lintian
-- gem install asciidoctor
+before_install: gem install fpm
 install: true
-script: if [ "$TRAVIS_BRANCH" != "master" ]; then SIGNING_OPTS="-uc -us" make deb; fi
-before_deploy:
-  - echo -e $GPG_SECRET | gpg --import
-  - make deb
+script: make deb
 deploy:
-  provider: script
-  script: dput ppa:cs50/ppa build/deb/*.changes
-  skip_cleanup: true
-  on:
-    branch: master
+  # 12.04
+  - <<: *packagecloud
+    dist: ubuntu/precise
+
+  # 12.10
+  - <<: *packagecloud
+    dist: ubuntu/quantal
+
+  # 13.04
+  - <<: *packagecloud
+    dist: ubuntu/raring
+
+  # 13.10
+  - <<: *packagecloud
+    dist: ubuntu/saucy
+
+  # 14.04
+  - <<: *packagecloud
+    dist: ubuntu/trusty
+
+  # 14.10
+  - <<: *packagecloud
+    dist: ubuntu/utopic
+
+  # 15.04
+  - <<: *packagecloud
+    dist: ubuntu/vivid
+
+  # 15.10
+  - <<: *packagecloud
+    dist: ubuntu/wily
+
+  # 16.04
+  - <<: *packagecloud
+    dist: ubuntu/xenial
+
+  # 16.10
+  - <<: *packagecloud
+    dist: ubuntu/yakkety
+
+  # 17.04
+  - <<: *packagecloud
+    dist: ubuntu/zesty
+
+  # 17.10
+  - <<: *packagecloud
+    dist: ubuntu/artful
+
+  # 18.04
+  - <<: *packagecloud
+    dist: ubuntu/bionic
 notifications:
   slack:
     secure: ISOGlNSGXOrMBrKTnjTWQXVjjoBn78++xF1mUv/PYZxn3J4L4WpybLLjAuBENsD7YeHSaXUnSbIV5mDzlx5Q1cyrS+auGOHqi5xGV01zNBB1Fig1SkUf7zJS8KyjiPKyi+DexnTt1BY4xaA1uGzq9hoGZEPXKHNlz4v1I6f6fHQ=

Makefile

@@ -7,12 +7,12 @@ MANDIR ?= share/man/man3
 
 SRC := src/cs50.c
 INCLUDE := src/cs50.h
-DOCS := $(wildcard docs/*.adoc)
-MANS := $(addprefix debian/, $(DOCS:%.adoc=%.3))
+MANS := $(wildcard docs/*.3)
 
 CFLAGS=-Wall -Wextra -Werror -pedantic -std=c99
 
 OS := $(shell uname)
+
 # Linux
 ifeq ($(OS),Linux)
 	LIB_BASE := libcs50.so
@@ -30,56 +30,64 @@ endif
 LIBS := $(addprefix build/lib/, $(LIB_BASE) $(LIB_MAJOR) $(LIB_VERSION))
 
 .PHONY: all
-all: $(LIBS) $(MANS)
+all: $(LIBS)
 
 $(LIBS): $(SRC) $(INCLUDE) Makefile
 	$(CC) $(CFLAGS) -fPIC -shared $(LINKER_FLAGS) -o $(LIB_VERSION) $(SRC)
 	ln -s $(LIB_VERSION) $(LIB_MAJOR)
 	ln -s $(LIB_MAJOR) $(LIB_BASE)
-	mkdir -p src build/include
-	install -m 644 src/cs50.h build/include/cs50.h
-	mkdir -p build/lib build/src/libcs50
+	mkdir -p $(addprefix build/, include lib src)
+	install -m 644 $(SRC) build/src
+	install -m 644 $(INCLUDE) build/include
 	mv $(LIB_VERSION) $(LIB_MAJOR) $(LIB_BASE) build/lib
-	cp -r $(SRC) $(INCLUDE) build/src/libcs50
 
 .PHONY: install
 install: all
 	mkdir -p $(addprefix $(DESTDIR)/, src lib include $(MANDIR))
-	cp -r build/* $(DESTDIR)
-	cp debian/docs/* $(DESTDIR)/$(MANDIR)
+	cp -r $(filter-out deb, $(wildcard build/*)) $(DESTDIR)
+	cp -r $(MANS) $(DESTDIR)/$(MANDIR)
+
 ifeq ($(OS),Linux)
 	ldconfig
 endif
 
 .PHONY: clean
 clean:
-	rm -rf build debian/docs/
-
-# requires asciidoctor (gem install asciidoctor)
-$(MANS): $(DOCS) Makefile
-	asciidoctor -d manpage -b manpage -D debian/docs/ $(DOCS)
+	rm -rf build
 
 .PHONY: deb
 deb: $(LIBS) $(MANS)
-	rm -rf build/deb &>/dev/null
-	@echo "libcs50 ($(VERSION)-0ubuntu$(DIST_VERSION)) $(DIST); urgency=low" > debian/changelog
-	@echo "  * v$(VERSION)" >> debian/changelog
-	@echo " -- CS50 Sysadmins <[email protected]>  $$(date --rfc-2822)" >> debian/changelog
-	mkdir -p libcs50-$(VERSION)/usr
-	cp -r build/* libcs50-$(VERSION)/usr
-	GZIP=-n tar --mtime='2017-01-01' -cvzf libcs50_$(VERSION).orig.tar.gz libcs50-$(VERSION)
-	cp -r debian libcs50-$(VERSION)
-	cd libcs50-$(VERSION) && debuild $(SIGNING_OPTS) -S -sa --lintian-opts --display-info --info --show-overrides
-	mkdir -p build/deb
-	mv libcs50-* libcs50_* build/deb
+	rm -rf build/deb
 
-.PHONY: hack
-hack:
-	mkdir -p build/hack
-	echo "\n#ifndef _CS50_C\n#define _CS50_C\ntypedef char *string;\n" > build/hack/cs50.h
-	grep -v '^#include "cs50.h"' src/cs50.c >> build/hack/cs50.h
-	echo "\n#endif" >> build/hack/cs50.h
-	cat src/cs50.h >> build/hack/cs50.h
+	# temporary fpm source
+	mkdir -p build/deb/libcs50/usr/local
+	cp -r $(addprefix build/, include lib src) build/deb/libcs50/usr/local
+	mkdir -p build/deb/libcs50/usr/local/share/man/man3
+	cp -r $(MANS) build/deb/libcs50/usr/local/share/man/man3
+	fpm \
+		--category libs \
+		--chdir build/deb/libcs50 \
+		--conflicts lib50-c \
+		--conflicts libcs50 \
+		--conflicts library50-c \
+		--deb-priority optional \
+		--description "CS50 library for C" \
+		--input-type dir \
+		--license "" \
+		--maintainer "CS50 <[email protected]>" \
+		--name libcs50 \
+		--output-type deb \
+		--package build/deb \
+		--provides lib50-c \
+		--provides libcs50 \
+		--provides library50-c \
+		--replaces lib50-c \
+		--replaces libcs50 \
+		--replaces library50-c \
+		--url https://github.com/cs50/libcs50 \
+		--vendor CS50 \
+		--version $(VERSION) \
+		.
 
 # used by .travis.yml
 .PHONY: version

debian/compat

@@ -0,0 +1,64 @@
+'\" t
+.\"     Title: eprintf
+.\"    Author: [see the "AUTHOR(S)" section]
+.\" Generator: Asciidoctor 1.5.7.1
+.\"      Date: 2017-09-16
+.\"    Manual: CS50 Programmer's Manual
+.\"    Source: CS50
+.\"  Language: English
+.\"
+.TH "EPRINTF" "3" "2017-09-16" "CS50" "CS50 Programmer\(aqs Manual"
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.ss \n[.ss] 0
+.nh
+.ad l
+.de URL
+\fI\\$2\fP <\\$1>\\$3
+..
+.als MTO URL
+.if \n[.g] \{\
+.  mso www.tmac
+.  am URL
+.    ad l
+.  .
+.  am MTO
+.    ad l
+.  .
+.  LINKSTYLE blue R < >
+.\}
+.SH "NAME"
+eprintf \- prints an error message to stderr
+.SH "SYNOPSIS"
+.sp
+\fB#include <cs50.h>\fP
+.sp
+\fBvoid eprintf(const string format, ...);\fP
+.SH "DESCRIPTION"
+.sp
+Prints an error message formatted like \fBprintf(3)\fP to standard error, prefixing it with file and line number from which the function was called. See \fBprintf(3)\fP for more on formatting.
+.SH "EXAMPLE"
+.sp
+.if n .RS 4
+.nf
+int main(void)
+{
+    eprintf("This line of code should be executed\(rsn");
+
+    int i;
+    for (i = 0; i < 50; i++)
+    {
+        printf("i is %d\(rsn", i);
+    }
+
+    eprintf("Expected i to be 49 but it is actually %d\(rsn", i);
+}
+.fi
+.if n .RE
+.SH "SEE ALSO"
+.sp
+.if n .RS 4
+.nf
+printf(3)
+.fi
+.if n .RE