From 34929a452e4ee1afdc92b98deeda96f9781c4641 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Mon, 21 Jun 2010 14:00:05 -0700 Subject: [PATCH] rewrote build system --- makefile | 21 +++++++++---- priv/jsx_clean.escript | 28 ++++++++++++++++++ priv/{jsx => jsx_compile.escript} | 46 ++--------------------------- priv/jsx_expand.escript | 49 +++++++++++++++++++++++++++++++ priv/jsx_install.escript | 32 ++++++++++++++++++++ 5 files changed, 126 insertions(+), 50 deletions(-) create mode 100755 priv/jsx_clean.escript rename priv/{jsx => jsx_compile.escript} (55%) create mode 100755 priv/jsx_expand.escript create mode 100755 priv/jsx_install.escript diff --git a/makefile b/makefile index cc1be6e..13cccaa 100644 --- a/makefile +++ b/makefile @@ -1,16 +1,25 @@ -compile: - ./priv/jsx compile +compile: expand + ./priv/jsx_compile.escript\ + src/jsx\ + src/jsx_utf8\ + src/jsx_utf16\ + src/jsx_utf16le\ + src/jsx_utf32\ + src/jsx_utf32le + +expand: + ./priv/jsx_expand.escript utf8 utf16 utf16le utf32 utf32le test: compile - ./priv/jsx_test test/cases + ./priv/jsx_test.escript test/cases examples: force - ./priv/jsx examples + ./priv/jsx_compile.escript clean: - ./priv/jsx clean + ./priv/jsx_clean.escript install: clean compile - ./priv/jsx install + ./priv/jsx_install.escript force: \ No newline at end of file diff --git a/priv/jsx_clean.escript b/priv/jsx_clean.escript new file mode 100755 index 0000000..ddd16b5 --- /dev/null +++ b/priv/jsx_clean.escript @@ -0,0 +1,28 @@ +#!/usr/bin/env escript + +%% The MIT License + +%% Copyright (c) 2010 Alisdair Sullivan + +%% Permission is hereby granted, free of charge, to any person obtaining a copy +%% of this software and associated documentation files (the "Software"), to deal +%% in the Software without restriction, including without limitation the rights +%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +%% copies of the Software, and to permit persons to whom the Software is +%% furnished to do so, subject to the following conditions: + +%% The above copyright notice and this permission notice shall be included in +%% all copies or substantial portions of the Software. + +%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +%% THE SOFTWARE. + + +main([]) -> + [ file:delete(Filename) || Filename <- filelib:wildcard("ebin/*.beam") ], + [ file:delete(Filename) || Filename <- filelib:wildcard("src/jsx_u*.erl") ]. diff --git a/priv/jsx b/priv/jsx_compile.escript similarity index 55% rename from priv/jsx rename to priv/jsx_compile.escript index 985682f..94f6984 100755 --- a/priv/jsx +++ b/priv/jsx_compile.escript @@ -22,19 +22,8 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. -main(Args) -> - case Args of - ["compile"|Opts] -> compile(Opts) - ; ["examples"|Opts] -> examples(Opts) - ; ["clean"|Opts] -> clean(Opts) - ; ["install"|Opts] -> install(Opts) - ; ["uninstall"|Opts] -> uninstall(Opts) - end. - -compile([]) -> - Mods = ["src/jsx"], - compile_files(Mods, [{outdir, "ebin"}]), - compile_backend(). +main(Mods) -> + compile_files(Mods, [{outdir, "ebin"}]). compile_files([], _) -> ok; @@ -45,36 +34,5 @@ compile_files([FileName|Rest], Opts) -> end, compile_files(Rest, Opts). -compile_backend() -> - [ compile_files(["src/jsx_decoder"], [binary, {d, Backend}, {d, name, to_modname(Backend)}]) - || Backend <- [utf8, utf16, utf16le, utf32, utf32le] - ]. - -to_modname(Atom) -> - list_to_atom("jsx_" ++ atom_to_list(Atom)). - - -examples([]) -> - Mods = ["examples/jsx_prettify", - "examples/jsx_parser", - "examples/jsx_stream_parser", - "examples/jsx_verify" - ], - compile_files(Mods, [{outdir, "ebin"}]). - -clean([]) -> - [ file:delete(Filename) || Filename <- filelib:wildcard("ebin/*.beam") ]. - -install([]) -> - os:cmd("mkdir -p " ++ appdir()), - os:cmd("cp -r " ++ "ebin " ++ appdir()). - -uninstall([]) -> - os:cmd("rm -rf " ++ appdir()). - -appdir() -> - {ok, [{application, jsx, AppInfo}]} = file:consult("ebin/jsx.app"), - code:lib_dir() ++ "/jsx-" ++ proplists:get_value(vsn, AppInfo). - \ No newline at end of file diff --git a/priv/jsx_expand.escript b/priv/jsx_expand.escript new file mode 100755 index 0000000..0e38fa6 --- /dev/null +++ b/priv/jsx_expand.escript @@ -0,0 +1,49 @@ +#!/usr/bin/env escript + +%% The MIT License + +%% Copyright (c) 2010 Alisdair Sullivan + +%% Permission is hereby granted, free of charge, to any person obtaining a copy +%% of this software and associated documentation files (the "Software"), to deal +%% in the Software without restriction, including without limitation the rights +%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +%% copies of the Software, and to permit persons to whom the Software is +%% furnished to do so, subject to the following conditions: + +%% The above copyright notice and this permission notice shall be included in +%% all copies or substantial portions of the Software. + +%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +%% THE SOFTWARE. + +main(Backends) -> + lists:foreach(fun(X) -> to_src(X) end, [ to_abf(Backend) || Backend <- Backends ]). + +to_abf(Backend) -> + case os:getenv("TMPDIR") of + false -> Out = "/tmp" + ; Out -> Out + end, + Name = to_modname(Backend), + {ok, _, ABF} = compile:file( + "src/jsx_decoder.erl", + [binary, 'P', {outdir, Out}, {d, list_to_atom(Backend)}, {d, name, Name}] + ), + {Name, ABF}. + +to_src({Name, ABF}) -> + {ok, Outfile} = file:open("src/" ++ atom_to_list(Name) ++ ".erl", [write, delayed_write]), + lists:foreach(fun(Form) -> io:put_chars(Outfile, [erl_pp:form(Form), "\n"]) end, ABF), + file:close(Outfile). + +to_modname(Name) -> + list_to_atom("jsx_" ++ Name). + + + \ No newline at end of file diff --git a/priv/jsx_install.escript b/priv/jsx_install.escript new file mode 100755 index 0000000..244d117 --- /dev/null +++ b/priv/jsx_install.escript @@ -0,0 +1,32 @@ +#!/usr/bin/env escript + +%% The MIT License + +%% Copyright (c) 2010 Alisdair Sullivan + +%% Permission is hereby granted, free of charge, to any person obtaining a copy +%% of this software and associated documentation files (the "Software"), to deal +%% in the Software without restriction, including without limitation the rights +%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +%% copies of the Software, and to permit persons to whom the Software is +%% furnished to do so, subject to the following conditions: + +%% The above copyright notice and this permission notice shall be included in +%% all copies or substantial portions of the Software. + +%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +%% THE SOFTWARE. + + +main([]) -> + os:cmd("mkdir -p " ++ appdir()), + os:cmd("cp -r " ++ "ebin " ++ appdir()). + +appdir() -> + {ok, [{application, jsx, AppInfo}]} = file:consult("ebin/jsx.app"), + code:lib_dir() ++ "/jsx-" ++ proplists:get_value(vsn, AppInfo). \ No newline at end of file