gsl-shell.git - gsl-shell

diff --git a/Makefile b/Makefile
index 68c289c2..e13cbd3b 100644
--- a/Makefile
+++ b/Makefile

@@ -44,11 +44,13 @@ SUBDIRS = $(LUADIR)

C_SRC_FILES = gs-types.c lua-utils.c lua-rng.c randist.c sf.c lua-graph.c \

lua-gsl.c

-LUA_BASE_FILES = base.lua matrix-init.lua misc.lua integ-init.lua fft-init.lua import.lua bspline.lua cgsl.lua check.lua csv.lua demo-init.lua gsl-check.lua gslext.lua linfit.lua roots.lua strict.lua template.lua time.lua

+LUA_BASE_FILES = bspline.lua fft-init.lua integ-init.lua randist-init.lua template.lua check.lua graph-init.lua iter.lua time.lua gsl-check.lua linfit.lua roots.lua contour.lua gsl.lua matrix.lua strict.lua csv.lua gslext.lua num.lua demo-init.lua import.lua plot3d.lua

-DEMOS_LIST = bspline fft plot wave-particle fractals ode nlinfit integ anim

+DEMOS_LIST = bspline fft plot wave-particle fractals ode nlinfit integ anim linfit contour

+LUA_TEMPLATES = gauss-kronrod-x-wgs qag rk8pd lmfit qng rkf45 ode-defs rk4

LUA_BASE_FILES += $(DEMOS_LIST:%=demos/%.lua)

+LUA_BASE_FILES += $(LUA_TEMPLATES:%=templates/%.lua.in)

LUAGSL_LIBS = $(LUADIR)/src/libluajit.a

C_SRC_FILES += gsl-shell-jit.c

@@ -56,8 +58,8 @@ C_SRC_FILES += gsl-shell-jit.c

DEFS += -DGSL_SHELL_LUA -DLUA_ROOT=$(PREFIX)

TARGETS = $(GSL_SHELL)

-# files and flags related to the graphics modules

-LUA_BASE_FILES += graph-init.lua contour.lua hpcontour.lua plcurve.lua plot3d.lua pre3d/pre3d.lua pre3d/pre3d_shape_utils.lua

+# files and flags related to the pre3d modules

+LUA_BASE_FILES += pre3d/pre3d.lua pre3d/pre3d_shape_utils.lua

INCLUDES += $(PTHREADS_CFLAGS) -Iagg-plot

SUBDIRS += agg-plot

LUAGSL_LIBS += agg-plot/libaggplot.a

@@ -84,8 +86,8 @@ $(GSL_SHELL): $(LUAGSL_OBJ_FILES) $(LUAGSL_LIBS)

install: $(GSL_SHELL)

mkdir -p $(DESTDIR)$(PREFIX)/bin

- cp gsl-shell $(DESTDIR)$(PREFIX)/bin

- strip $(DESTDIR)$(PREFIX)/bin/gsl-shell

+ cp $(GSL_SHELL) $(DESTDIR)$(PREFIX)/bin

+ strip $(DESTDIR)$(PREFIX)/bin/$(GSL_SHELL)

mkdir -p $(DESTDIR)$(PREFIX)/lib/gsl-shell

cp --parents $(LUA_BASE_FILES) $(DESTDIR)$(PREFIX)/lib/gsl-shell

diff --git a/luajit2/src/luaconf.h b/luajit2/src/luaconf.h
index 6fd82efd..4b21800f 100644
--- a/luajit2/src/luaconf.h
+++ b/luajit2/src/luaconf.h

@@ -28,7 +28,7 @@

#ifndef LUA_STRICT

#define STDLIB_NAME "gsl-shell"

#else

- #define STDLIB_NAME "lua/5.1"

+ #define STDLIB_NAME "lua"

#endif

#ifdef LUA_USE_WIN

/*

@@ -38,15 +38,17 @@

#define LUA_LDIR "!\\" STDLIB_NAME "\\"

#define LUA_CDIR "!\\"

#define LUA_PATH_DEFAULT \

- ".\\?.lua;" LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" LUA_CDIR"templates\\?.lua.in"

+ ".\\?.lua;" ".\\templates\\?.lua.in;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" LUA_CDIR"templates\\?.lua.in"

#define LUA_CPATH_DEFAULT \

".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"

#else

#define LUA_ROOT_Q QUOTEME(LUA_ROOT) "/"

#define LUA_LDIR LUA_ROOT_Q "share/" STDLIB_NAME "/"

#define LUA_CDIR LUA_ROOT_Q "lib/" STDLIB_NAME "/"

-#define LUA_PATH_DEFAULT "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua" \

- ";" LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"

+#define LUA_PATH_DEFAULT "./?.lua;" "./templates/?.lua.in;" \

+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \

+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \

+ LUA_CDIR"templates/?.lua.in"

#define LUA_CPATH_DEFAULT "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"

#endif

diff --git a/makeconfig b/makeconfig
index 80db7677..592d9be9 100644
--- a/makeconfig
+++ b/makeconfig

@@ -8,5 +8,5 @@ DISABLE_GAMMA_CORR = no

DEBUG = no

-PREFIX= /home/franko/apps

-DESTDIR=

+PREFIX= /usr/local

+DESTDIR=

diff --git a/template.lua b/template.lua
index 89242761..6db172b9 100644
--- a/template.lua
+++ b/template.lua

@@ -95,13 +95,6 @@ local function template_error(code, filename, err)

error('error loading ' .. filename .. ':' .. err)

end

-local function require(filename)

- local code = process(filename, {})

- local f, err = loadstring(code, filename)

- if not f then template_error(code, filename, err) end

- return f()

-end

-

local function load(filename, defs)

local code = process(filename, defs)

local f, err = loadstring(code, filename)

@@ -110,7 +103,7 @@ local function load(filename, defs)

end

M.process = process

-M.require = require

-M.load = load

+M.load = load

return M

+