Skip to content

Commit e1f2cfd

Browse files
committed
LISP scripting nearly working.
1 parent 048c138 commit e1f2cfd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+32
-4751
lines changed

Rakefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ namespace :plugins do |plugin|
150150
end
151151
end
152152

153-
task :build => ['http:build', 'base:build', 'persistence:build', 'mapgen:build', 'commands:build', 'tests:build']
153+
task :build => ['httpd:build', 'base:build', 'persistence:build', 'mapgen:build', 'commands:build', 'tests:build']
154154

155155
namespace :base do |base|
156156
base.sources = FileList['plugins/survival/base/main.c']
@@ -296,24 +296,24 @@ namespace :plugins do |plugin|
296296
end
297297
end
298298

299-
namespace :http do |http|
300-
http.sources = FileList['plugins/http/main.c', 'plugins/http/src/**.c']
299+
namespace :httpd do |httpd|
300+
httpd.sources = FileList['plugins/httpd/main.c', 'plugins/httpd/src/**.c']
301301

302-
CLEAN.include http.sources.ext('o')
303-
CLOBBER.include "plugins/#{plugin.file('http')}"
302+
CLEAN.include httpd.sources.ext('o')
303+
CLOBBER.include "plugins/#{plugin.file('httpd')}"
304304

305-
http.sources.each {|f|
305+
httpd.sources.each {|f|
306306
file f.ext('o') => c_file(f) do
307307
sh "#{CC} #{CFLAGS} -Iinclude -o #{f.ext('o')} -c #{f}"
308308
end
309309
}
310310

311-
file "plugins/#{plugin.file('http')}" => http.sources.ext('o') do
312-
sh "#{CC} #{CFLAGS} #{http.sources.ext('o')} -shared -Wl,-soname,#{plugin.file('http')} -o plugins/#{plugin.file('http')} #{ldflags} #{ldflags}"
311+
file "plugins/#{plugin.file('httpd')}" => httpd.sources.ext('o') do
312+
sh "#{CC} #{CFLAGS} #{httpd.sources.ext('o')} -shared -Wl,-soname,#{plugin.file('httpd')} -o plugins/#{plugin.file('httpd')} #{ldflags} #{ldflags}"
313313
end
314314

315315
desc 'Build RPC daemon'
316-
task :build => "plugins/#{plugin.file('http')}"
316+
task :build => "plugins/#{plugin.file('httpd')}"
317317
end
318318
end
319319

craftd.conf.dist.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ server: {
9898
paths: ["scripting", "@libdir@/craftd/scripting"];
9999

100100
engines: (
101-
/* { name: "lisp";
101+
{ name: "lisp";
102102
paths: ["scripting/lisp/lib", "scripting/lisp/scripts", "@libdir@/craftd/scripting/lisp", "@libdir@/craftd/scripting/lisp/lib"];
103103

104104
options: [];
105105

106-
scripts: ["joined"]
107-
} */
106+
scripts: ["joined"];
107+
},
108108

109109
{ name: "javascript";
110110
paths: ["scripting/javascript/lib", "scripting/javascript/scripts", "@libdir@/craftd/scripting/javascript", "@libdir@/craftd/scripting/javascript/lib"];

plugins/http/htdocs/LICENSES.txt

-43
This file was deleted.

plugins/http/htdocs/css/960.css

-1
This file was deleted.

0 commit comments

Comments
 (0)