webmcp

changeset 118:92d9218140f7

Cleanup of Makefile.options; Removed wrong escape character in framework/bin/langtool.lua
author jbe
date Thu Jul 10 00:32:08 2014 +0200 (2014-07-10)
parents 82c1daccd7cf
children b59a07b23c2b
files Makefile.options framework/bin/langtool.lua
line diff
     1.1 --- a/Makefile.options	Thu Jul 10 00:27:22 2014 +0200
     1.2 +++ b/Makefile.options	Thu Jul 10 00:32:08 2014 +0200
     1.3 @@ -17,10 +17,10 @@
     1.4  CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include -I /usr/local/include/lua52
     1.5  
     1.6  # additional C compiler flags for parts which depend on PostgreSQL
     1.7 -CFLAGS_PGSQL = -I /usr/local/include/postgresql/server -I /usr/local/include/postgresql
     1.8 +CFLAGS_PGSQL = -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
     1.9  
    1.10  # linker flags
    1.11 -LDFLAGS = -shared -L /usr/lib -L /usr/local/lib -L /usr/local/include/lua52
    1.12 +LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
    1.13  
    1.14  # additional linker flags for parts which depend on PostgreSQL
    1.15  LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
     2.1 --- a/framework/bin/langtool.lua	Thu Jul 10 00:27:22 2014 +0200
     2.2 +++ b/framework/bin/langtool.lua	Thu Jul 10 00:32:08 2014 +0200
     2.3 @@ -88,7 +88,7 @@
     2.4        if string.find(filename, "%.lua$") then
     2.5          for line in io.lines(path .. "/" .. filename) do
     2.6            -- TODO: exact parsing of comments and escape characters
     2.7 -          for key in string.gmatch(line, "_%(?'([^'\]+)'") do
     2.8 +          for key in string.gmatch(line, "_%(?'([^']+)'") do
     2.9              if
    2.10                key ~= "([^" and
    2.11                (not string.find(key, "^%s*%.%.[^%.]")) and
    2.12 @@ -98,7 +98,7 @@
    2.13                translations[key] = false
    2.14              end
    2.15            end
    2.16 -          for key in string.gmatch(line, '_%(?"([^"\]+)"') do
    2.17 +          for key in string.gmatch(line, '_%(?"([^"]+)"') do
    2.18              if
    2.19                key ~= "([^" and
    2.20                (not string.find(key, "^%s*%.%.[^%.]")) and

Impressum / About Us