Commit a70ae7ea605ea36bcb6ca45031e30f750a58f032

Parents: a3c0f6c0e1f8955b53d4fa3598b9b17feb5b3363

From: Moritz Poldrack <git@moritz.sh>
Date: Thu Sep 14 15:17:53 2023 +0700

chore: integrate webinterface into project
Implements: https://todo.sr.ht/~mpldr/uniview/15

Stats

LICENSES/BSD-4-Clause.txt +14/-0
Makefile +5/-1
go.work +9/-0
go.work.sum +1/-0
go.work.sum.license +2/-0

Changeset

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
diff --git a/LICENSES/BSD-4-Clause.txt b/LICENSES/BSD-4-Clause.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b2868dbdedfd72d68339c152e16ad138c7b18231
--- /dev/null
+++ b/LICENSES/BSD-4-Clause.txt
@@ -0,0 +1,14 @@
+Copyright (c) 2023 donuts-are-good and Moritz Poldrack. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+This product includes software developed by the Uniview contributors.
+
+4. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile b/Makefile
index 8ef850073cbbbd5c41ca74412261d0843a98ee05..726f19b4aa30404239ab915d556dbf2e966ab1c1 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 doc/%.gz: doc/%.scd
 	scdoc < $< | gzip > $@
 
-uniview$(GOEXE): $(GOSRC) protocol/uniview.pb.go protocol/uniview_grpc.pb.go Makefile internal/client/index.html internal/client/api/
+uniview$(GOEXE): $(GOSRC) protocol/uniview.pb.go protocol/uniview_grpc.pb.go Makefile internal/client/index.html internal/client/api/ webinterface/dist
 	$(GO) build $(BUILD_OPTS) -ldflags "$(GO_LDFLAGS)" -o $@
 
 univiewd$(GOEXE): uniview$(GOEXE)
@@ -66,6 +66,10 @@ 	$(GO) build -o $@ -v google.golang.org/grpc/cmd/protoc-gen-go-grpc
 
 AUTHORS: .git/index
 	git log '--pretty=format:%an%n%(trailers:key=co-authored-by,valueonly)' | sed -e 's/ <.*//' | sort -f | uniq | tail -n+2 > $@
+
+.PHONY: webinterface/dist
+webinterface/dist:
+	$(MAKE) -C webinterface dist
 
 .PHONY: install
 install:
diff --git a/go.work b/go.work
new file mode 100644
index 0000000000000000000000000000000000000000..5d6a5e2b778e1b919024555fc95a41cbc1563952
--- /dev/null
+++ b/go.work
@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: © nobody
+// SPDX-License-Identifier: CC0-1.0
+
+go 1.21.1
+
+use (
+	.
+	./webinterface
+)
diff --git a/go.work.sum b/go.work.sum
new file mode 100644
index 0000000000000000000000000000000000000000..6a07974a247b630caeecc0cf831e04c2cb82da32
--- /dev/null
+++ b/go.work.sum
@@ -0,0 +1 @@
+google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
diff --git a/go.work.sum.license b/go.work.sum.license
new file mode 100644
index 0000000000000000000000000000000000000000..c1464e9a3503b28f5445fd1f5b5ff3452b8d2247
--- /dev/null
+++ b/go.work.sum.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: © nobody
+SPDX-License-Identifier: CC0-1.0