commit 047179472b30a430c1ec34b7274fe634323f99ef
parent 7493c0beada63ab22a51408dac8db457824d31d1
Author: Raymond Li <hi@raymond.li>
Date: Sun, 10 May 2020 15:33:28 -0400
Overhaul build, install and buildtest
Diffstat:
11 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/Build Test.yml b/.github/workflows/Build Test.yml
@@ -15,12 +15,10 @@ jobs:
- uses: actions/checkout@v2
- name: Install dependencies
run: sudo apt install pkg-config libpam0g-dev libcairo2-dev libfontconfig1-dev libxcb-composite0-dev libev-dev libx11-xcb-dev libxcb-xkb-dev libxcb-xinerama0-dev libxcb-randr0-dev libxcb-image0-dev libxcb-util-dev libxcb-xrm-dev libxkbcommon-dev libxkbcommon-x11-dev libjpeg-dev
- - name: autoreconf
- run: autoreconf -fiv
- - name: configure
- run: ./configure --prefix=/usr --sysconfdir=/etc
- - name: make
- run: make
+ - name: Make build script executable
+ run: chmod +x build.sh
+ - name: Run build script
+ run: ./build.sh
- name: make check
run: make check
- name: make distcheck
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
Copyright © 2010-2011, Michael Stapelberg
Copyright © 2015, Cassandra Fox
-Copyright © 2015, Raymond Li
+Copyright © 2020, Raymond Li
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/build.sh b/build.sh
@@ -4,6 +4,6 @@ autoreconf -fiv
rm -rf build/
mkdir -p build && cd build/
-../configure --prefix=/usr --sysconfdir=/etc --disable-sanitizers
+../configure --prefix=/usr --sysconfdir=/etc
make
diff --git a/i3lock.1 b/i3lock.1
@@ -107,7 +107,7 @@ gets you the current screen dimensions in the wxh (e.g. 1920x1080) format.
.BI \-c\ rrggbbaa \fR,\ \fB\-\-color= rrggbbaa
Turn the screen into the given color instead of white. Color must be given in 4-byte
format: rrggbbaa (i.e. ff0000ff is opaque red).
-Use the last byte for alpha. Setting this below FF (i.e. ff000088) will allow your screen to be shown translucently if you use a compositor (e.g. compton, xcompmgr).
+Use the last byte for alpha. Setting this below FF (i.e. ff000088) will allow your screen to be shown translucently if you use a compositor (e.g. compton, xcompmgr).
.TP
.B \-t, \-\-tiling
@@ -459,4 +459,4 @@ Jan-Erik Rediger <badboy at archlinux.us>
Pandora <pandora at techfo dot xyz>
-Raymond Li <hi at raymond.li>
+Raymond Li <i3lock-color at raymond.li>
diff --git a/i3lock.c b/i3lock.c
@@ -3,6 +3,7 @@
*
* © 2010 Michael Stapelberg
* © 2015 Cassandra Fox
+ * © 2020 Raymond Li
*
* See LICENSE for licensing information
*
@@ -1515,7 +1516,7 @@ int main(int argc, char *argv[]) {
while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {
switch (o) {
case 'v':
- errx(EXIT_SUCCESS, "version " I3LOCK_VERSION " © 2010 Michael Stapelberg, © 2015 Cassandra Fox");
+ errx(EXIT_SUCCESS, "version " I3LOCK_VERSION " © 2010 Michael Stapelberg, © 2015 Cassandra Fox, © 2020 Raymond Li");
case 'n':
dont_fork = true;
break;
diff --git a/install-i3lock-color.sh b/install-i3lock-color.sh
@@ -4,8 +4,8 @@ autoreconf -fiv
rm -rf build/
mkdir -p build && cd build/
-../configure --prefix=/usr --sysconfdir=/etc --disable-sanitizers
+../configure --prefix=/usr --sysconfdir=/etc
sudo make install
-sudo install -Dm644 LICENSE "/usr/share/licenses/i3lock-color/LICENSE"
+sudo install -Dm644 ../LICENSE "/usr/share/licenses/i3lock-color/LICENSE"
diff --git a/m4/ax_extend_srcdir.m4 b/m4/ax_extend_srcdir.m4
@@ -63,6 +63,7 @@
# LICENSE
#
# Copyright (c) 2016 Michael Stapelberg <michael@i3wm.org>
+# Copyright (c) 2020 Raymond Li <i3lock-color@raymond.li>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
diff --git a/m4/ax_sanitizers.m4 b/m4/ax_sanitizers.m4
@@ -69,6 +69,7 @@
# LICENSE
#
# Copyright (c) 2016 Michael Stapelberg <michael@i3wm.org>
+# Copyright (c) 2020 Raymond Li <i3lock-color@raymond.li>
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
diff --git a/randr.c b/randr.c
@@ -2,6 +2,7 @@
* vim:ts=4:sw=4:expandtab
*
* © 2010 Michael Stapelberg
+ * © 2020 Raymond Li
*
* See LICENSE for licensing information
*
diff --git a/unlock_indicator.c b/unlock_indicator.c
@@ -2,7 +2,8 @@
* vim:ts=4:sw=4:expandtab
*
* © 2010 Michael Stapelberg
- * © 2010 Cassandra Fox
+ * © 2015 Cassandra Fox
+ * © 2020 Raymond Li
*
* See LICENSE for licensing information
*
diff --git a/xcb.c b/xcb.c
@@ -1,7 +1,8 @@
/*
* vim:ts=4:sw=4:expandtab
*
- * © 2010 Michael Stapelberg
+ * © 2010 Michael
+ * @ © 2020 Raymond Li
*
* xcb.c: contains all functions which use XCB to talk to X11. Mostly wrappers
* around the rather complicated/ugly parts of the XCB API.
