diff --git a/pkg.info b/pkg.info index b2f20c4..60861d3 100644 --- a/pkg.info +++ b/pkg.info @@ -1,16 +1,17 @@ name: lua-lpeg description: Parsing Expression Grammars For Lua version: 1.1.0 -revision: 1 +revision: 2 url: https://www.inf.puc-rio.br/~roberto/lpeg/ license: MIT architecture: any type: source make_depends: - lua - - lua5.1 - - lua5.2 + - lua5.4 - lua5.3 + - lua5.2 + - lua5.1 downloads: - url: https://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE}/lua5.4 @@ -20,6 +21,9 @@ split_packages: - name: lua-lpeg depends: - lua + - name: lua5.4-lpeg + depends: + - lua5.4 - name: lua5.3-lpeg depends: - lua5.3 diff --git a/source.sh b/source.sh index 0c2afb9..b8725d2 100644 --- a/source.sh +++ b/source.sh @@ -6,19 +6,19 @@ # This function is used for putting downloaded files to the correct location or applying patches prepare() { cd "$BPM_SOURCE" - for ver in 5.3 5.2 5.1; do - cp -a lua5.4 lua$ver + for ver in 5.5 5.4 5.3 5.2 5.1; do + [ -d lua$ver ] || cp -a lua5.4 lua$ver done } # The build function is executed in the source directory # This function is used to compile the source code build() { - pushd lua5.4 + pushd lua5.5 make DLLFLAGS="-I/usr/include -fPIC" LUADIR="/usr/include" popd - for ver in 5.3 5.2 5.1; do + for ver in 5.4 5.3 5.2 5.1; do pushd lua$ver make DLLFLAGS="-I/usr/include/lua${ver} -fPIC" LUADIR="/usr/include/lua${ver}" popd @@ -28,6 +28,17 @@ build() { # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package_lua-lpeg() { + install -Dm755 lua5.5/lpeg.so -t "$BPM_OUTPUT"/usr/lib/lua/5.5 + install -Dm644 lua5.5/re.lua -t "$BPM_OUTPUT"/usr/share/lua/5.5 + + # Install documentation + install -Dm644 lua5.5/lpeg.html "$BPM_OUTPUT"/usr/share/doc/lpeg-lua5.5/lpeg.html + + # Install package license + install -Dm644 "$BPM_WORKDIR"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/lua-lpeg/LICENSE +} + +package_lua5.4-lpeg() { install -Dm755 lua5.4/lpeg.so -t "$BPM_OUTPUT"/usr/lib/lua/5.4 install -Dm644 lua5.4/re.lua -t "$BPM_OUTPUT"/usr/share/lua/5.4 @@ -35,7 +46,7 @@ package_lua-lpeg() { install -Dm644 lua5.4/lpeg.html "$BPM_OUTPUT"/usr/share/doc/lpeg-lua5.4/lpeg.html # Install package license - install -Dm644 "$BPM_WORKDIR"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/lua-lpeg/LICENSE + install -Dm644 "$BPM_WORKDIR"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/lua5.4-lpeg/LICENSE } package_lua5.3-lpeg() {