Merge remote-tracking branch 'steam/master'

2020-01-17 20:04:19 +01:00 · 2020-01-17 20:04:19 +01:00 · ae4b7142bf
parent 6de8c22e58 f22d041c88
commit ae4b7142bf
3 changed files with 14 additions and 2 deletions
--- a/osx-server-gui/icon/icon.html
+++ b/osx-server-gui/icon/icon.html
@ -1,6 +1,6 @@
 <html>
  <head>
-    <link rel="stylesheet" type="text/css" href="t.css">
+    <link rel="stylesheet" type="text/css" href="icon.css">
  </head>
  <body>
    <div class="icon">
--- a/server/Makefile
+++ b/server/Makefile
@ -1,7 +1,10 @@
 APP=hop_server
 TEMPLATES=$(wildcard web/bootstrap/templates/*.xml)
 HTML=$(subst web/bootstrap/templates/,web/,$(subst .xml,.html,$(TEMPLATES)))
-OCAMLBUILD=ocamlbuild -classic-display -use-ocamlfind -X scratch -lflag -cclib -lflag -static
+
+# Static builds. So far I've only seen this work on Linux. OS X complains about missing -lcrt0.o.
+# OCAMLBUILD=ocamlbuild -classic-display -use-ocamlfind -X scratch -lflag -cclib -lflag -static
+OCAMLBUILD=ocamlbuild -classic-display -use-ocamlfind -X scratch

 all: \
 	message.ml amqp_spec.ml \
--- a/server/TODO
+++ b/server/TODO
@ -112,3 +112,12 @@ display purposes. Perhaps it comes down to the fact that this is a

 Don't forget the "five minute rule":
 http://cacm.acm.org/magazines/2009/7/32091-the-five-minute-rule-20-years-later/fulltext
+
+
+Might be nice to support, among other transports,
+ - http (natch)
+ - websockets
+ - polling the file system for existence of signal files
+    - existence = offered message
+    - deletion = acknowledgement
+ - maildir??