@@ -9,6 +9,10 @@ docs: -noshell -run edoc_run application "'ErlyWeb'" '"."' '[no_packages]' +install: + + cp -r . `erl -noshell -eval 'io:format(code:lib_dir()).' -s erlang halt`/erlyweb-0.7.3 + clean: rm ebin/*.beam Makefile @@ -4,3 +4,15 @@ Date: 10/27/2006 ErlyWeb is a web development framework for Erlang. It lets you quickly and easily build database-driven webapps following the MVC pattern. For more information, visit http://erlyweb.org. + + +=== Installation instructions === + +In the ErlyWeb directory, execute + +./configure +make +sudo make install + + +This assumes you have yaws installed under your Erlang lib directory (which you can find by calling code:lib_dir() in the Erlang shell). README.txt @@ -98,33 +98,30 @@ start_link(Options) -> start(Options, Fun, LinkConnections) -> [PoolId, Hostname, Port, Username, Password, Database, LogFun, - Encoding, PoolSize] = + Encoding, PoolSize, Reconnect] = lists:foldl( fun(Key, Acc) -> [proplists:get_value(Key, Options) | Acc] end, [], lists:reverse([pool_id, hostname, port, username, - password, database, logfun, encoding, poolsize])), + password, database, logfun, encoding, poolsize, reconnect])), PoolId1 = if PoolId == undefined -> ?Epid; true -> PoolId end, - PoolSize1 = if PoolSize == undefined -> - 1; - true -> - PoolSize - end, + PoolSize1 = if PoolSize == undefined -> 1; true -> PoolSize end, Fun(PoolId1, Hostname, Port, Username, Password, Database, LogFun, Encoding), + Reconnect1 = if Reconnect == undefined -> true; true -> Reconnect end, make_connection(PoolSize1-1, PoolId, Database, Hostname, Port, - Username, Password, Encoding, LinkConnections). + Username, Password, Encoding, Reconnect1, LinkConnections). %% @doc Create a a number of database connections in the pool. make_connection(PoolSize, PoolId, Database, Hostname, Port, - Username, Password, Encoding, LinkConnections) -> + Username, Password, Encoding, Reconnect, LinkConnections) -> if PoolSize > 0 -> connect(PoolId, Hostname, Port, Username, Password, Database, - Encoding, LinkConnections), + Encoding, Reconnect, LinkConnections), make_connection(PoolSize-1, PoolId, Database, Hostname, Port, - Username, Password, Encoding, + Username, Password, Encoding, Reconnect, LinkConnections); true -> ok src/erlydb/erlydb_mysql.erl @@ -580,7 +580,7 @@ compile(MetaMod, Options) -> Forms1 = [{attribute, 1, file, {FileName, 1}} | Forms], Forms2 = Forms1 ++ lists:reverse(MetaMod#meta_mod.forms), - + case compile:forms(Forms2, Options) of {ok, Module, Bin} -> Res = src/smerl/smerl.erl Emakefile fcd1453e36621b6465319e1e67bed009f9d835b6 yarivvv yarivvv http://github.com/yariv/erlyweb/commit/093a8f5830992865be751cd06b08f2002c3b26e6 093a8f5830992865be751cd06b08f2002c3b26e6 2008-10-04T15:35:08-07:00 2008-10-04T15:35:08-07:00 fixed mysql connection functions, and added a proper configure file and a make install script 552f6b0da03354a7c09471f704cf03c3f6f32bd0 yarivvv yarivvv