Permalink
Browse files

Merge branch 'origin' of git://github.com/rrthomas/lua-stdlib

* 'origin' of git://github.com/rrthomas/lua-stdlib: (38 commits)
  Add testing of luarock against uploaded archive before mailing announcement
  base.lua: user simpler default require_version pattern that works in more cases
  Generate Lua version in rockspec from that in configure.ac
  Bump version to 28, and simplify slightly, requiring automake 1.11
  base.lua: move a documentation stanza to a more apt location
  release: fix call to woger to generate correct URLs
  rockspec: fix homepage URL
  Makefile.am: really distribute all docs
  rockspec: fix download URL (thanks, Hisham Muhammad)
  base.lua: add require_version
  Make build_command in rockspec more robust.
  Install documentation with 'make install' and from luarocks.
  Rename table.indices to table.keys, and use term 'keys' more.
  getopt.lua: output usage information to stdout, not stderr
  configure.ac: bump version to 27
  configure.ac: accept Lua 5.2
  getopt.lua: remove func member of Option; simply gather all option values into a list
  getopt.lua: improve some comments and remove a redundant require
  set.lua: fix last commit: elements should be elems
  base.lua: remove a spurious blank line
  ...
  • Loading branch information...
2 parents f3c09fd + 5162dec commit e43cb8e5f0eb43835afec4a9782b8e9b90fb98e4 @drahosp drahosp committed Oct 29, 2012
Showing with 426 additions and 259 deletions.
  1. +1 −0 .gitignore
  2. +3 −0 AUTHORS
  3. +24 −12 Makefile.am
  4. +1 −1 README
  5. +7 −8 configure.ac
  6. +3 −0 luarocks-config.lua.in
  7. +177 −0 m4/ax_compare_version.m4
  8. +45 −74 m4/ax_lua.m4
  9. +78 −49 src/base.lua
  10. +3 −2 src/debug_ext.lua
  11. +2 −2 src/debug_init.lua
  12. +11 −23 src/getopt.lua
  13. +37 −27 src/object.lua
  14. +3 −4 src/parser.lua
  15. +2 −1 src/set.lua
  16. +0 −25 src/string_ext.lua
  17. +20 −23 src/table_ext.lua
  18. +2 −2 src/tree.lua
  19. +7 −6 stdlib.rockspec.in
View
@@ -8,6 +8,7 @@
/configure
/config.log
/config.status
+/luarocks-config.lua
/release-notes-*
/stdlib-*.zip
/*.rockspec
View
@@ -23,3 +23,6 @@ Johann Hibschman supplied the code on which math.floor and math.round
were based.
Diego Nehab wrote the original version of the mbox parser module.
+
+Gary V. Vaughan contributed table key support to the tree module, and
+the memoize implementation.
View
@@ -4,31 +4,43 @@ ACLOCAL_AMFLAGS = -I m4
SOURCES = $(wildcard src/*.lua)
dist_data_DATA = $(SOURCES)
+
+dist_doc_DATA = \
+ src/index.html \
+ src/luadoc.css
+filesdir = $(docdir)/files
+dist_files_DATA = $(wildcard src/files/*.html)
+modulesdir = $(docdir)/modules
+dist_modules_DATA = $(wildcard src/modules/*.html)
+
EXTRA_DIST = \
src/std.lua.in \
- src/index.html \
- src/luadoc.css \
- $(PACKAGE).rockspec.in \
- $(wildcard src/files/*.html) \
- $(wildcard src/modules/*.html)
+ $(PACKAGE).rockspec.in
DISTCLEANFILES = $(PACKAGE).rockspec
ROCKSPEC = $(PACKAGE)-$(VERSION)-1.rockspec
-$(ROCKSPEC): $(PACKAGE).rockspec dist
- sed -e 's/@MD5@/'`$(MD5SUM) $(distdir).zip | cut -d " " -f 1`'/g' < $(PACKAGE).rockspec > $@
-
html: $(SOURCES)
cd src && luadoc *.lua
ChangeLog:
git2cl > ChangeLog
-release: distcheck $(ROCKSPEC)
+WOGER_ARGS = package=$(PACKAGE) package_name=$(PACKAGE_NAME) archive=stdlib-$(VERSION).zip version=$(VERSION) description="`LUA_INIT= LUA_PATH='$(abs_srcdir)/?.rockspec.in' $(LUA) -l$(PACKAGE) -e 'print (description.summary)'`" notes=release-notes-$(VERSION) dist_type=zip github_user=rrthomas
+
+# Depend on distcheck so that 'make release' runs distcheck before
+# making the rockspec, so the release archive MD5sum is correct in the
+# rockspec
+$(ROCKSPEC): $(PACKAGE).rockspec distcheck
+ sed -e 's/_MD5_/'`$(MD5SUM) $(distdir).zip | cut -d " " -f 1`'/g' < $(PACKAGE).rockspec > $@
+
+release: $(ROCKSPEC)
+ grep md5 $(ROCKSPEC) | sed -e 's/[^"]*"\([0-9a-f]\+\)",/\1 $(distdir).zip/' | md5sum --check - && \
git diff --exit-code && \
git push && \
- woger lua package=$(PACKAGE) package_name=$(PACKAGE_NAME) version=$(VERSION) description="`LUA_INIT= LUA_PATH='$(abs_srcdir)/?.rockspec.in' $(LUA) -l$(PACKAGE) -e 'print (description.summary)'`" notes=release-notes-$(VERSION) dist_type=zip github_user=rrthomas
- git tag -a -m "Release tag" rel-`echo $(VERSION) | sed -e 's/\./-/g'` && \
+ woger github $(WOGER_ARGS) && \
+ LUAROCKS_CONFIG=$(abs_srcdir)/luarocks-config.lua luarocks --tree=$(abs_srcdir)/luarocks build $(ROCKSPEC) && \
+ woger lua $(WOGER_ARGS) && \
+ git tag -a -m "Release tag" v$(VERSION) && \
git push --tags
- @cat release-notes-$(VERSION) && echo && echo "Now upload to LuaForge, and fix the download URL in and send the rockspec!"
View
2 README
@@ -1,7 +1,7 @@
Standard Lua libraries
----------------------
- by the stdlib project (http://luaforge.net/projects/stdlib/)
+ by the stdlib project (http://github.com/rrthomas/lua-stdlib/)
This is a collection of Lua libraries for Lua 5.1, with provisional
View
@@ -1,20 +1,19 @@
dnl Process this file with autoconf to produce a configure script
-AC_INIT(stdlib, 26, rrt@sc3d.org)
+dnl Initialise autoconf and automake
+AC_INIT(stdlib, 28, rrt@sc3d.org)
AC_CONFIG_AUX_DIR([build-aux])
-
AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-zip])
+AM_SILENT_RULES([yes])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl Lua 5.1
-AX_PROG_LUA(501)
-AC_SUBST(LUA)
+dnl Lua
+AC_SUBST([LUA_MIN_VERSION], [5.1])
+AX_PROG_LUA([$LUA_MIN_VERSION], [5.3])
dnl md5sum
AX_WITH_PROG([MD5SUM], [md5sum], [false])
dnl Generate output files
AC_CONFIG_MACRO_DIR(m4)
-AC_CONFIG_FILES(Makefile $PACKAGE.rockspec src/std.lua)
+AC_CONFIG_FILES(Makefile $PACKAGE.rockspec luarocks-config.lua src/std.lua)
AC_OUTPUT
View
@@ -0,0 +1,3 @@
+rocks_trees = {
+ "@abs_srcdir@/luarocks"
+}
View
@@ -0,0 +1,177 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+# This macro compares two version strings. Due to the various number of
+# minor-version numbers that can exist, and the fact that string
+# comparisons are not compatible with numeric comparisons, this is not
+# necessarily trivial to do in a autoconf script. This macro makes doing
+# these comparisons easy.
+#
+# The six basic comparisons are available, as well as checking equality
+# limited to a certain number of minor-version levels.
+#
+# The operator OP determines what type of comparison to do, and can be one
+# of:
+#
+# eq - equal (test A == B)
+# ne - not equal (test A != B)
+# le - less than or equal (test A <= B)
+# ge - greater than or equal (test A >= B)
+# lt - less than (test A < B)
+# gt - greater than (test A > B)
+#
+# Additionally, the eq and ne operator can have a number after it to limit
+# the test to that number of minor versions.
+#
+# eq0 - equal up to the length of the shorter version
+# ne0 - not equal up to the length of the shorter version
+# eqN - equal up to N sub-version levels
+# neN - not equal up to N sub-version levels
+#
+# When the condition is true, shell commands ACTION-IF-TRUE are run,
+# otherwise shell commands ACTION-IF-FALSE are run. The environment
+# variable 'ax_compare_version' is always set to either 'true' or 'false'
+# as well.
+#
+# Examples:
+#
+# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+# would both be true.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+# would both be false.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+# would be true because it is only comparing two minor versions.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+# would be true because it is only comparing the lesser number of minor
+# versions of the two values.
+#
+# Note: The characters that separate the version numbers do not matter. An
+# empty string is the same as version 0. OP is evaluated by autoconf, not
+# configure, so must be a string, not a variable.
+#
+# The author would like to acknowledge Guido Draheim whose advice about
+# the m4_case and m4_ifvaln functions make this macro only include the
+# portions necessary to perform the specific comparison specified by the
+# OP argument in the final configure script.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 11
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+ AC_REQUIRE([AC_PROG_AWK])
+
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+ dnl # then the first line is used to determine if the condition is true.
+ dnl # The sed right after the echo is to remove any indented white space.
+ m4_case(m4_tolower($2),
+ [lt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [gt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [le],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],
+ [ge],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],[
+ dnl Split the operator from the subversion count if present.
+ m4_bmatch(m4_substr($2,2),
+ [0],[
+ # A count of zero means use the length of the shorter version.
+ # Determine the number of characters in A and B.
+ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+ # Set A to no more than B's length and B to no more than A's length.
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+ ],
+ [[0-9]+],[
+ # A count greater than zero means use only that many subversions
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ ],
+ [.+],[
+ AC_WARNING(
+ [illegal OP numeric parameter: $2])
+ ],[])
+
+ # Pad zeros at end of numbers to make same length.
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+ B="$B`echo $A | sed 's/./0/g'`"
+ A="$ax_compare_version_tmp_A"
+
+ # Check for equality or inequality as necessary.
+ m4_case(m4_tolower(m4_substr($2,0,2)),
+ [eq],[
+ test "x$A" = "x$B" && ax_compare_version=true
+ ],
+ [ne],[
+ test "x$A" != "x$B" && ax_compare_version=true
+ ],[
+ AC_WARNING([illegal OP parameter: $2])
+ ])
+ ])
+
+ AS_VAR_POPDEF([A])dnl
+ AS_VAR_POPDEF([B])dnl
+
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+ if test "$ax_compare_version" = "true" ; then
+ m4_ifvaln([$4],[$4],[:])dnl
+ m4_ifvaln([$5],[else $5])dnl
+ fi
+]) dnl AX_COMPARE_VERSION
Oops, something went wrong.

0 comments on commit e43cb8e

Please sign in to comment.