Permalink
Browse files

LISP scripting nearly working.

  • Loading branch information...
1 parent 048c138 commit e1f2cfdba893b0a77d10333b00bed5965f20320c @meh meh committed Apr 14, 2011
Showing with 32 additions and 4,751 deletions.
  1. +9 −9 Rakefile
  2. +3 −3 craftd.conf.dist.in
  3. +0 −43 plugins/http/htdocs/LICENSES.txt
  4. +0 −1 plugins/http/htdocs/css/960.css
  5. +0 −631 plugins/http/htdocs/css/default.css
  6. +0 −102 plugins/http/htdocs/css/html5reset-1.6.1.css
  7. +0 −1 plugins/http/htdocs/css/jquery.jqplot.min.css
  8. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  9. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  10. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  11. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  12. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  13. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
  14. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  15. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  16. BIN plugins/http/htdocs/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  17. BIN plugins/http/htdocs/css/ui-lightness/images/ui-icons_222222_256x240.png
  18. BIN plugins/http/htdocs/css/ui-lightness/images/ui-icons_228ef1_256x240.png
  19. BIN plugins/http/htdocs/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
  20. BIN plugins/http/htdocs/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
  21. BIN plugins/http/htdocs/css/ui-lightness/images/ui-icons_ffffff_256x240.png
  22. +0 −573 plugins/http/htdocs/css/ui-lightness/jquery-ui-1.8.9.custom.css
  23. +0 −132 plugins/http/htdocs/help.html
  24. BIN plugins/http/htdocs/images/arrow_left.png
  25. BIN plugins/http/htdocs/images/arrow_right.png
  26. BIN plugins/http/htdocs/images/bg_content.jpg
  27. BIN plugins/http/htdocs/images/db_console.png
  28. BIN plugins/http/htdocs/images/db_default.png
  29. BIN plugins/http/htdocs/images/db_plugin.png
  30. BIN plugins/http/htdocs/images/db_stats.png
  31. BIN plugins/http/htdocs/images/db_wiki.png
  32. BIN plugins/http/htdocs/images/icon_16.png
  33. BIN plugins/http/htdocs/images/icon_64.png
  34. BIN plugins/http/htdocs/images/icon_64_off.png
  35. BIN plugins/http/htdocs/images/logo_64.png
  36. BIN plugins/http/htdocs/images/nav_selected.png
  37. BIN plugins/http/htdocs/images/restart.png
  38. BIN plugins/http/htdocs/images/restart_off.png
  39. BIN plugins/http/htdocs/images/save.png
  40. BIN plugins/http/htdocs/images/save_off.png
  41. BIN plugins/http/htdocs/images/start.png
  42. BIN plugins/http/htdocs/images/start_off.png
  43. BIN plugins/http/htdocs/images/stop.png
  44. BIN plugins/http/htdocs/images/stop_off.png
  45. +0 −196 plugins/http/htdocs/index.html
  46. +0 −140 plugins/http/htdocs/js/custom.js
  47. +0 −35 plugins/http/htdocs/js/excanvas.min.js
  48. +0 −34 plugins/http/htdocs/js/jqplot.barRenderer.min.js
  49. +0 −34 plugins/http/htdocs/js/jqplot.categoryAxisRenderer.min.js
  50. +0 −34 plugins/http/htdocs/js/jqplot.cursor.min.js
  51. +0 −34 plugins/http/htdocs/js/jqplot.dateAxisRenderer.min.js
  52. +0 −34 plugins/http/htdocs/js/jqplot.pointLabels.min.js
  53. +0 −16 plugins/http/htdocs/js/jquery-1.5.min.js
  54. +0 −781 plugins/http/htdocs/js/jquery-ui-1.8.9.custom.min.js
  55. +0 −34 plugins/http/htdocs/js/jquery.jqplot.min.js
  56. +0 −172 plugins/http/htdocs/logs.html
  57. +0 −144 plugins/http/htdocs/logs_graphs.html
  58. +0 −257 plugins/http/htdocs/players.html
  59. +0 −177 plugins/http/htdocs/players_blacklist.html
  60. +0 −201 plugins/http/htdocs/schedule.html
  61. +0 −285 plugins/http/htdocs/settings.html
  62. +0 −194 plugins/http/htdocs/settings_account.html
  63. +0 −89 plugins/http/include/HTTPd.h
  64. +0 −78 plugins/http/main.c
  65. +0 −279 plugins/http/src/HTTPd.c
  66. +5 −0 scripting/javascript/src/Dynamic.c
  67. +2 −2 scripting/lisp/helpers.c
  68. +1 −1 scripting/lisp/lib/client.lisp
  69. +1 −1 scripting/lisp/lib/wrap.lisp
  70. +11 −4 scripting/lisp/main.c
View
@@ -150,7 +150,7 @@ namespace :plugins do |plugin|
end
end
- task :build => ['http:build', 'base:build', 'persistence:build', 'mapgen:build', 'commands:build', 'tests:build']
+ task :build => ['httpd:build', 'base:build', 'persistence:build', 'mapgen:build', 'commands:build', 'tests:build']
namespace :base do |base|
base.sources = FileList['plugins/survival/base/main.c']
@@ -296,24 +296,24 @@ namespace :plugins do |plugin|
end
end
- namespace :http do |http|
- http.sources = FileList['plugins/http/main.c', 'plugins/http/src/**.c']
+ namespace :httpd do |httpd|
+ httpd.sources = FileList['plugins/httpd/main.c', 'plugins/httpd/src/**.c']
- CLEAN.include http.sources.ext('o')
- CLOBBER.include "plugins/#{plugin.file('http')}"
+ CLEAN.include httpd.sources.ext('o')
+ CLOBBER.include "plugins/#{plugin.file('httpd')}"
- http.sources.each {|f|
+ httpd.sources.each {|f|
file f.ext('o') => c_file(f) do
sh "#{CC} #{CFLAGS} -Iinclude -o #{f.ext('o')} -c #{f}"
end
}
- file "plugins/#{plugin.file('http')}" => http.sources.ext('o') do
- sh "#{CC} #{CFLAGS} #{http.sources.ext('o')} -shared -Wl,-soname,#{plugin.file('http')} -o plugins/#{plugin.file('http')} #{ldflags} #{ldflags}"
+ file "plugins/#{plugin.file('httpd')}" => httpd.sources.ext('o') do
+ sh "#{CC} #{CFLAGS} #{httpd.sources.ext('o')} -shared -Wl,-soname,#{plugin.file('httpd')} -o plugins/#{plugin.file('httpd')} #{ldflags} #{ldflags}"
end
desc 'Build RPC daemon'
- task :build => "plugins/#{plugin.file('http')}"
+ task :build => "plugins/#{plugin.file('httpd')}"
end
end
View
@@ -98,13 +98,13 @@ server: {
paths: ["scripting", "@libdir@/craftd/scripting"];
engines: (
- /* { name: "lisp";
+ { name: "lisp";
paths: ["scripting/lisp/lib", "scripting/lisp/scripts", "@libdir@/craftd/scripting/lisp", "@libdir@/craftd/scripting/lisp/lib"];
options: [];
- scripts: ["joined"]
- } */
+ scripts: ["joined"];
+ },
{ name: "javascript";
paths: ["scripting/javascript/lib", "scripting/javascript/scripts", "@libdir@/craftd/scripting/javascript", "@libdir@/craftd/scripting/javascript/lib"];
@@ -1,43 +0,0 @@
-htdocs/LICENSE
-
-The craftd software contains code written by third parties. Such
-software will have its own individual license file in the directory in
-which it appears. This file will describe the copyrights, license, and
-restrictions which apply to that code.
-
-* craftd content is licensed under the Simplified BSD License.
-* jquery dual licensed; we prefer the MIT license http://jquery.org/license
-* html5reset was released to the public domain: http://html5doctor.com/html-5-reset-stylesheet/
-* 960 grid system is dual licensed; we prefer the MIT license: http://960.gs
-
-=============================================================================
-craftd Simplified BSD License, see http://www.opensource.org/licenses/
------------------------------------------------------------------------------
-Copyright (c) 2010-2011 Kevin M. Bowling, <kevin.bowling@kev009.com>, USA
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * 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.
- * Neither the name of the Swiss Federal Institute of Technology Zurich
- 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
-=============================================================================

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit e1f2cfd

Please sign in to comment.