# HG changeset patch
# User jbe
# Date 1404944797 -7200
# Node ID 30391b40722f6c0f4829d9c3b692241de5dc4478
# Parent 0de41d8e2cf888b4e981012f6ac8e30964b43545
Improved Makefile for lua51/lua52; Updated version number
diff -r 0de41d8e2cf8 -r 30391b40722f Makefile
--- a/Makefile Thu Jul 10 00:04:45 2014 +0200
+++ b/Makefile Thu Jul 10 00:26:37 2014 +0200
@@ -9,7 +9,7 @@
documentation::
rm -f doc/autodoc.tmp
- lua framework/bin/autodoc.lua framework/cgi-bin/ framework/env/ libraries/ > doc/autodoc.tmp
+ $(LUA_BIN) framework/bin/autodoc.lua framework/cgi-bin/ framework/env/ libraries/ > doc/autodoc.tmp
cat doc/autodoc-header.htmlpart doc/autodoc.tmp doc/autodoc-footer.htmlpart > doc/autodoc.html
rm -f doc/autodoc.tmp
@@ -35,11 +35,11 @@
precompile::
rm -Rf framework.precompiled
rm -Rf demo-app.precompiled
- sh framework/bin/recursive-luac framework/ framework.precompiled/
+ sh framework/bin/recursive-luac $(LUAC_BIN) framework/ framework.precompiled/
rm -f framework.precompiled/accelerator/Makefile
rm -f framework.precompiled/accelerator/webmcp_accelerator.c
rm -f framework.precompiled/accelerator/webmcp_accelerator.o
- framework/bin/recursive-luac demo-app/ demo-app.precompiled/
+ framework/bin/recursive-luac $(LUAC_BIN) demo-app/ demo-app.precompiled/
clean::
rm -f doc/autodoc.tmp doc/autodoc.html
diff -r 0de41d8e2cf8 -r 30391b40722f Makefile.options
--- a/Makefile.options Thu Jul 10 00:04:45 2014 +0200
+++ b/Makefile.options Thu Jul 10 00:26:37 2014 +0200
@@ -7,16 +7,20 @@
# filename extension for shared libraries
SLIB_EXT = so
+# Lua binaries
+LUA_BIN = lua52
+LUAC_BIN = luac52
+
# C compiler flags
# TODO: check alternatives to -D_GNU_SOURCE -fPIC
# using libtool?
-CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include
+CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include -I /usr/local/include/lua52
# additional C compiler flags for parts which depend on PostgreSQL
-CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
+CFLAGS_PGSQL = -I /usr/local/include/postgresql/server -I /usr/local/include/postgresql
# linker flags
-LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
+LDFLAGS = -shared -L /usr/lib -L /usr/local/lib -L /usr/local/include/lua52
# additional linker flags for parts which depend on PostgreSQL
-LDFLAGS_PGSQL =
+LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
diff -r 0de41d8e2cf8 -r 30391b40722f doc/autodoc-header.htmlpart
--- a/doc/autodoc-header.htmlpart Thu Jul 10 00:04:45 2014 +0200
+++ b/doc/autodoc-header.htmlpart Thu Jul 10 00:26:37 2014 +0200
@@ -55,10 +55,10 @@
color: #505050;
}
- WebMCP 1.2.5 Documentation
+ WebMCP 1.2.6 Documentation
- WebMCP 1.2.5 Documentation
+ WebMCP 1.2.6 Documentation
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.
diff -r 0de41d8e2cf8 -r 30391b40722f framework/bin/recursive-luac
--- a/framework/bin/recursive-luac Thu Jul 10 00:04:45 2014 +0200
+++ b/framework/bin/recursive-luac Thu Jul 10 00:26:37 2014 +0200
@@ -1,14 +1,15 @@
#!/bin/sh
-src=$1
-dst=$2
+luacbin=$1
+src=$2
+dst=$3
if [ "$src" = "" -o "$dst" = "" ]
then
- echo "Usage: recursive-luac "
+ echo "Usage: recursive-luac "
exit 1
fi
cp -RL "$src" "$dst"
# TODO: handle whitespace in directory or file names correctly
for file in `find "$dst" -name '*.lua'`
do
- luac -s -o "$file" "$file"
+ $1 -s -o "$file" "$file"
done
diff -r 0de41d8e2cf8 -r 30391b40722f framework/cgi-bin/webmcp.lua
--- a/framework/cgi-bin/webmcp.lua Thu Jul 10 00:04:45 2014 +0200
+++ b/framework/cgi-bin/webmcp.lua Thu Jul 10 00:26:37 2014 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env lua
-_WEBMCP_VERSION = "1.2.5"
+_WEBMCP_VERSION = "1.2.6"
-- Lua 5.1 compatibility
if not table.unpack then
diff -r 0de41d8e2cf8 -r 30391b40722f libraries/mondelefant/Makefile
--- a/libraries/mondelefant/Makefile Thu Jul 10 00:04:45 2014 +0200
+++ b/libraries/mondelefant/Makefile Thu Jul 10 00:26:37 2014 +0200
@@ -7,7 +7,7 @@
$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
test:: mondelefant_native.so mondelefant.lua
- lua -l mondelefant
+ $(LUA_BIN) -l mondelefant
clean::
rm -f mondelefant_native.so mondelefant_native.o