update scm rockspec, Makefile

6 files changed, 98 insertions, 53 deletions

diff --git a/Makefile b/Makefile
index 0473f69..2643a30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MODULES:=$(sort $(wildcard alv-lib/*.moon)) alv-lib/midi/launchctl.moon
+MODULES:=$(sort $(wildcard alv-lib/*.moon))
 MODULES:=$(MODULES:alv-lib/%.moon=docs/reference/module/%.html)
 REFERENCE=docs/reference/index.md $(sort $(wildcard docs/reference/[01]*.md)) docs/reference/builtins.html $(MODULES)
 REFTOC=$(REFERENCE:%.md=%.html)
diff --git a/README.md b/README.md
index fa5b863..cd955ad 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,11 @@ processes. For more information, visit the full [online documentation][docs].
 - [MoonScript][moonscript]: `luarocks install moonscript`
 - [luafilesystem][lfs]*:    `luarocks install luafilesystem`
 - [LPeg][lpeg]*:            `luarocks install lpeg`
-- [osc][osc]:               `luarocks install osc`
 - [socket][socket]:         `luarocks install luasocket`
 - [system][system]:         `luarocks install luasystem`
+- [oscpack][oscpack]:       `luarocks install oscpack` (optional)
 - [lua-rtmidi][rtmidi]:     `luarocks install
-  https://raw.githubusercontent.com/s-ol/lua-rtmidi/master/lua-rtmidi-dev-1.rockspec`
+  https://raw.githubusercontent.com/s-ol/lua-rtmidi/master/lua-rtmidi-dev-1.rockspec` (optional)
 - [busted][busted]:         `luarocks install busted` (optional, for tests)
 - [discount][discount]:     `luarocks install discount` (optional, for docs)
 - [ldoc][ldoc]:             `luarocks install
@@ -54,7 +54,7 @@ development, simply pass the files as arguments:
 [moonscript]: https://moonscript.org/
 [lfs]:        https://keplerproject.github.io/luafilesystem/
 [lpeg]:       http://www.inf.puc-rio.br/~roberto/lpeg/
-[osc]:        https://github.com/lubyk/osc
+[oscpack]:        https://github.com/s-ol/lua-oscpack
 [system]:     https://github.com/o-lim/luasystem
 [socket]:     http://w3.impa.br/~diego/software/luasocket/
 [rtmidi]:     https://github.com/s-ol/lua-rtmidi/
diff --git a/alv-lib/sc.moon b/alv-lib/sc.moon
index 110c019..fbc4588 100644
--- a/alv-lib/sc.moon
+++ b/alv-lib/sc.moon
@@ -1,5 +1,5 @@
 import Op, Constant, Input, sig, evt from require 'alv.base'
-import pack from require 'osc'
+import pack from require 'oscpack'
 import dns, udp from require 'socket'
 
 unpack or= table.unpack
diff --git a/dist/rocks/alive-scm-9.rockspec b/dist/rocks/alive-scm-9.rockspec
new file mode 100644
index 0000000..5750d55
--- /dev/null
+++ b/dist/rocks/alive-scm-9.rockspec
@@ -0,0 +1,92 @@
+package = "alive"
+version = "scm-9"
+
+source = {
+  url = "git://github.com/s-ol/alive.git",
+}
+
+description = {
+  summary = "Experimental livecoding environment with persistent expressions",
+  detailed = [[
+This is an experimental livecoding language and environment, in which
+expressions persist and update until they are removed from the source code, and
+the interpreter keeps no state that you cannot manipulate directly in the
+source. This yields a direct-manipulation like experience with a purely
+text-based language and works without special editor support.]],
+  homepage = "https://alv.s-ol.nu",
+  license = "GPL-3",
+}
+
+dependencies = {
+  "lua",
+  "moonscript >= 0.5.0",
+  "lpeg",
+  "luafilesystem",
+  "luasystem",
+  "luasocket",
+}
+
+build = {
+  type = "builtin",
+  modules = {},
+  copy_directories = { "docs" },
+  install = {
+    lua = {
+      ["alv.ast"] = "alv/ast.moon",
+      ["alv.base.builtin"] = "alv/base/builtin.moon",
+      ["alv.base.fndef"] = "alv/base/fndef.moon",
+      ["alv.base.init"] = "alv/base/init.moon",
+      ["alv.base.input"] = "alv/base/input.moon",
+      ["alv.base.match"] = "alv/base/match.moon",
+      ["alv.base.op"] = "alv/base/op.moon",
+      ["alv.base.pureop"] = "alv/base/pureop.moon",
+      ["alv.builtins"] = "alv/builtins.moon",
+      ["alv.cell"] = "alv/cell.moon",
+      ["alv.copilot.base"] = "alv/copilot/base.moon",
+      ["alv.copilot.cli"] = "alv/copilot/cli.moon",
+      ["alv.copilot.fltk"] = "alv/copilot/fltk.moon",
+      ["alv.copilot.udp"] = "alv/copilot/udp.moon",
+      ["alv.copilot.wx"] = "alv/copilot/wx.moon",
+      ["alv.cycle"] = "alv/cycle.moon",
+      ["alv.error"] = "alv/error.moon",
+      ["alv.init"] = "alv/init.moon",
+      ["alv.invoke"] = "alv/invoke.moon",
+      ["alv.logger"] = "alv/logger.moon",
+      ["alv.module"] = "alv/module.moon",
+      ["alv.parsing"] = "alv/parsing.moon",
+      ["alv.registry"] = "alv/registry.moon",
+      ["alv.result.base"] = "alv/result/base.moon",
+      ["alv.result.const"] = "alv/result/const.moon",
+      ["alv.result.evt"] = "alv/result/evt.moon",
+      ["alv.result.init"] = "alv/result/init.moon",
+      ["alv.result.sig"] = "alv/result/sig.moon",
+      ["alv.rtnode"] = "alv/rtnode.moon",
+      ["alv.scope"] = "alv/scope.moon",
+      ["alv.tag"] = "alv/tag.moon",
+      ["alv.type"] = "alv/type.moon",
+      ["alv.util"] = "alv/util.moon",
+      ["alv.version"] = "alv/version.moon",
+
+      ["alv-lib.array"] = "alv-lib/array.moon",
+      ["alv-lib.logic"] = "alv-lib/logic.moon",
+      ["alv-lib.math"] = "alv-lib/math.moon",
+      ["alv-lib.midi"] = "alv-lib/midi.moon",
+      ["alv-lib.midi.core"] = "alv-lib/midi/core.moon",
+      ["alv-lib.osc"] = "alv-lib/osc.moon",
+      ["alv-lib.pilot"] = "alv-lib/pilot.moon",
+      ["alv-lib.random"] = "alv-lib/random.moon",
+      ["alv-lib.rhythm"] = "alv-lib/rhythm.moon",
+      ["alv-lib.sc"] = "alv-lib/sc.moon",
+      ["alv-lib.string"] = "alv-lib/string.moon",
+      ["alv-lib.struct"] = "alv-lib/struct.moon",
+      ["alv-lib.time"] = "alv-lib/time.moon",
+      ["alv-lib.util"] = "alv-lib/util.moon",
+      ["alv-lib.vis"] = "alv-lib/vis.moon",
+    },
+    bin = {
+      "bin/alv",
+      "bin/alv-wx",
+      "bin/alv-fltk",
+    },
+  },
+}
diff --git a/dist/win/deps/osc-1.0.1-1.rockspec b/dist/win/deps/osc-1.0.1-1.rockspec
deleted file mode 100644
index 77c2dc0..0000000
--- a/dist/win/deps/osc-1.0.1-1.rockspec
+++ /dev/null
@@ -1,47 +0,0 @@
-package = "osc"
-version = "1.0.1-1"
-source = {
-  url = 'git://github.com/lubyk/osc',
-  tag = 'REL-1.0.1',
-  dir = 'osc',
-}
-description = {
-  summary = "OpenSoundControl for Lua with some wrappers around lens.Socket.",
-  detailed = [[
-  Simply packs/unpacks between Lua values and binary strings ready to be sent
-  on the network or other transports.
-
-  Uses Ross Bencina oscpack library.
-  ]],
-  homepage = "http://doc.lubyk.org/osc.html",
-  license = "MIT"
-}
-
-dependencies = {
-  "lua >= 5.1, < 5.4",
-  "lub >= 1.0.3, < 2.0",
-}
-build = {
-  type = 'builtin',
-  modules = {
-    -- Plain Lua files
-    ['osc'            ] = 'osc/init.lua',
-    ['osc.Client'     ] = 'osc/Client.lua',
-    ['osc.Server'     ] = 'osc/Server.lua',
-    -- C module
-    ['osc.core'       ] = {
-      defines = {'OSC_HOST_LITTLE_ENDIAN'},
-      sources = {
-        'src/bind/dub/dub.cpp',
-        'src/bind/osc_core.cpp',
-        'src/osc.cpp',
-        'src/vendor/osc/OscOutboundPacketStream.cpp',
-        'src/vendor/osc/OscPrintReceivedElements.cpp',
-        'src/vendor/osc/OscReceivedElements.cpp',
-        'src/vendor/osc/OscTypes.cpp',
-      },
-      incdirs   = {'include', 'src/bind', 'src/vendor'},
-    },
-  },
-}
-
diff --git a/docs/gen/shim.moon b/docs/gen/shim.moon
index 01a96cc..2a69f52 100644
--- a/docs/gen/shim.moon
+++ b/docs/gen/shim.moon
@@ -4,7 +4,7 @@ export require
 
 require = do
   old_require = require
-  blacklist = {k, true for k in *{'osc', 'socket', 'system', 'luartmidi'}}
+  blacklist = {k, true for k in *{'oscpack', 'socket', 'system', 'luartmidi'}}
   (mod, ...) ->
     return {} if blacklist[mod]
     old_require mod, ...