webmcp
changeset 116:30391b40722f
Improved Makefile for lua51/lua52; Updated version number
author | jbe |
---|---|
date | Thu Jul 10 00:26:37 2014 +0200 (2014-07-10) |
parents | 0de41d8e2cf8 |
children | 82c1daccd7cf |
files | Makefile Makefile.options doc/autodoc-header.htmlpart framework/bin/recursive-luac framework/cgi-bin/webmcp.lua libraries/mondelefant/Makefile |
line diff
1.1 --- a/Makefile Thu Jul 10 00:04:45 2014 +0200 1.2 +++ b/Makefile Thu Jul 10 00:26:37 2014 +0200 1.3 @@ -9,7 +9,7 @@ 1.4 1.5 documentation:: 1.6 rm -f doc/autodoc.tmp 1.7 - lua framework/bin/autodoc.lua framework/cgi-bin/ framework/env/ libraries/ > doc/autodoc.tmp 1.8 + $(LUA_BIN) framework/bin/autodoc.lua framework/cgi-bin/ framework/env/ libraries/ > doc/autodoc.tmp 1.9 cat doc/autodoc-header.htmlpart doc/autodoc.tmp doc/autodoc-footer.htmlpart > doc/autodoc.html 1.10 rm -f doc/autodoc.tmp 1.11 1.12 @@ -35,11 +35,11 @@ 1.13 precompile:: 1.14 rm -Rf framework.precompiled 1.15 rm -Rf demo-app.precompiled 1.16 - sh framework/bin/recursive-luac framework/ framework.precompiled/ 1.17 + sh framework/bin/recursive-luac $(LUAC_BIN) framework/ framework.precompiled/ 1.18 rm -f framework.precompiled/accelerator/Makefile 1.19 rm -f framework.precompiled/accelerator/webmcp_accelerator.c 1.20 rm -f framework.precompiled/accelerator/webmcp_accelerator.o 1.21 - framework/bin/recursive-luac demo-app/ demo-app.precompiled/ 1.22 + framework/bin/recursive-luac $(LUAC_BIN) demo-app/ demo-app.precompiled/ 1.23 1.24 clean:: 1.25 rm -f doc/autodoc.tmp doc/autodoc.html
2.1 --- a/Makefile.options Thu Jul 10 00:04:45 2014 +0200 2.2 +++ b/Makefile.options Thu Jul 10 00:26:37 2014 +0200 2.3 @@ -7,16 +7,20 @@ 2.4 # filename extension for shared libraries 2.5 SLIB_EXT = so 2.6 2.7 +# Lua binaries 2.8 +LUA_BIN = lua52 2.9 +LUAC_BIN = luac52 2.10 + 2.11 # C compiler flags 2.12 # TODO: check alternatives to -D_GNU_SOURCE -fPIC 2.13 # using libtool? 2.14 -CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include 2.15 +CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include -I /usr/local/include/lua52 2.16 2.17 # additional C compiler flags for parts which depend on PostgreSQL 2.18 -CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server 2.19 +CFLAGS_PGSQL = -I /usr/local/include/postgresql/server -I /usr/local/include/postgresql 2.20 2.21 # linker flags 2.22 -LDFLAGS = -shared -L /usr/lib -L /usr/local/lib 2.23 +LDFLAGS = -shared -L /usr/lib -L /usr/local/lib -L /usr/local/include/lua52 2.24 2.25 # additional linker flags for parts which depend on PostgreSQL 2.26 -LDFLAGS_PGSQL = 2.27 +LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
3.1 --- a/doc/autodoc-header.htmlpart Thu Jul 10 00:04:45 2014 +0200 3.2 +++ b/doc/autodoc-header.htmlpart Thu Jul 10 00:26:37 2014 +0200 3.3 @@ -55,10 +55,10 @@ 3.4 color: #505050; 3.5 } 3.6 </style> 3.7 - <title>WebMCP 1.2.5 Documentation</title> 3.8 + <title>WebMCP 1.2.6 Documentation</title> 3.9 </head> 3.10 <body> 3.11 - <h1>WebMCP 1.2.5 Documentation</h1> 3.12 + <h1>WebMCP 1.2.6 Documentation</h1> 3.13 <p> 3.14 WebMCP is a completely new web development framework, and has not been extensively tested yet. The API might change at any time, but in future releases there will be a list of all changes, which break downward compatibility. 3.15 </p>
4.1 --- a/framework/bin/recursive-luac Thu Jul 10 00:04:45 2014 +0200 4.2 +++ b/framework/bin/recursive-luac Thu Jul 10 00:26:37 2014 +0200 4.3 @@ -1,14 +1,15 @@ 4.4 #!/bin/sh 4.5 -src=$1 4.6 -dst=$2 4.7 +luacbin=$1 4.8 +src=$2 4.9 +dst=$3 4.10 if [ "$src" = "" -o "$dst" = "" ] 4.11 then 4.12 - echo "Usage: recursive-luac <source-dir> <destination-dir>" 4.13 + echo "Usage: recursive-luac <luac-binary> <source-dir> <destination-dir>" 4.14 exit 1 4.15 fi 4.16 cp -RL "$src" "$dst" 4.17 # TODO: handle whitespace in directory or file names correctly 4.18 for file in `find "$dst" -name '*.lua'` 4.19 do 4.20 - luac -s -o "$file" "$file" 4.21 + $1 -s -o "$file" "$file" 4.22 done
5.1 --- a/framework/cgi-bin/webmcp.lua Thu Jul 10 00:04:45 2014 +0200 5.2 +++ b/framework/cgi-bin/webmcp.lua Thu Jul 10 00:26:37 2014 +0200 5.3 @@ -1,6 +1,6 @@ 5.4 #!/usr/bin/env lua 5.5 5.6 -_WEBMCP_VERSION = "1.2.5" 5.7 +_WEBMCP_VERSION = "1.2.6" 5.8 5.9 -- Lua 5.1 compatibility 5.10 if not table.unpack then
6.1 --- a/libraries/mondelefant/Makefile Thu Jul 10 00:04:45 2014 +0200 6.2 +++ b/libraries/mondelefant/Makefile Thu Jul 10 00:26:37 2014 +0200 6.3 @@ -7,7 +7,7 @@ 6.4 $(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c 6.5 6.6 test:: mondelefant_native.so mondelefant.lua 6.7 - lua -l mondelefant 6.8 + $(LUA_BIN) -l mondelefant 6.9 6.10 clean:: 6.11 rm -f mondelefant_native.so mondelefant_native.o