diff --git a/configure b/configure index eb6e735c..52693b89 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for parallel 20121122. +# Generated by GNU Autoconf 2.69 for parallel 20121122. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -213,21 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -330,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -451,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -485,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -506,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1089,8 +1109,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1310,9 +1328,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF parallel configure 20121122 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1327,7 +1345,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by parallel $as_me 20121122, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1742,7 +1760,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1911,7 +1929,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1951,7 +1969,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2002,7 +2020,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2055,7 +2073,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2593,16 +2611,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -2662,28 +2680,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -2705,7 +2711,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by parallel $as_me 20121122, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2767,10 +2773,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ parallel config.status 20121122 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -2861,7 +2867,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/src/Makefile.in b/src/Makefile.in index a346640e..7660fcf1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -51,7 +51,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = src -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/optional/genresults.sh b/src/optional/genresults.sh index 88894db5..25b0ccad 100755 --- a/src/optional/genresults.sh +++ b/src/optional/genresults.sh @@ -2,5 +2,5 @@ # # Generate the result files used to test the query modules. -../parallel --header : --result testresults/foo_ echo {a} {b} ::: a 1 2 ::: b 0.30 0.40 -../parallel --header : --result testresults/bar_ echo {a} {b} ::: a 5 6 ::: b 0.70 0.80 +../parallel --header : --result testresults/foo echo {a} {b} ::: a 1 2 ::: b 0.30 0.40 +../parallel --header : --result testresults/bar echo {a} {b} ::: a 5 6 ::: b 0.70 0.80 diff --git a/src/optional/python/README b/src/optional/python/README index 3eadb681..44433e5b 100644 --- a/src/optional/python/README +++ b/src/optional/python/README @@ -24,6 +24,7 @@ Sample usage: Type "help", "copyright", "credits" or "license" for more information. >>> import gnuparallel >>> help(gnuparallel.load) +!!! THIS PART IS BROKEN !!! >>> my_df = gnuparallel.load('out') >>> my_df _prefix _stream arg1 arg2 resfile diff --git "a/src/optional/testresults/bar_stderr\ta\t5\tb\t0.70" b/src/optional/testresults/bar/a/5/b/0.70/stderr similarity index 100% rename from "src/optional/testresults/bar_stderr\ta\t5\tb\t0.70" rename to src/optional/testresults/bar/a/5/b/0.70/stderr diff --git "a/src/optional/testresults/bar_stdout\ta\t5\tb\t0.70" b/src/optional/testresults/bar/a/5/b/0.70/stdout similarity index 100% rename from "src/optional/testresults/bar_stdout\ta\t5\tb\t0.70" rename to src/optional/testresults/bar/a/5/b/0.70/stdout diff --git "a/src/optional/testresults/bar_stderr\ta\t5\tb\t0.80" b/src/optional/testresults/bar/a/5/b/0.80/stderr similarity index 100% rename from "src/optional/testresults/bar_stderr\ta\t5\tb\t0.80" rename to src/optional/testresults/bar/a/5/b/0.80/stderr diff --git "a/src/optional/testresults/bar_stdout\ta\t5\tb\t0.80" b/src/optional/testresults/bar/a/5/b/0.80/stdout similarity index 100% rename from "src/optional/testresults/bar_stdout\ta\t5\tb\t0.80" rename to src/optional/testresults/bar/a/5/b/0.80/stdout diff --git "a/src/optional/testresults/bar_stderr\ta\t6\tb\t0.70" b/src/optional/testresults/bar/a/6/b/0.70/stderr similarity index 100% rename from "src/optional/testresults/bar_stderr\ta\t6\tb\t0.70" rename to src/optional/testresults/bar/a/6/b/0.70/stderr diff --git "a/src/optional/testresults/bar_stdout\ta\t6\tb\t0.70" b/src/optional/testresults/bar/a/6/b/0.70/stdout similarity index 100% rename from "src/optional/testresults/bar_stdout\ta\t6\tb\t0.70" rename to src/optional/testresults/bar/a/6/b/0.70/stdout diff --git "a/src/optional/testresults/bar_stderr\ta\t6\tb\t0.80" b/src/optional/testresults/bar/a/6/b/0.80/stderr similarity index 100% rename from "src/optional/testresults/bar_stderr\ta\t6\tb\t0.80" rename to src/optional/testresults/bar/a/6/b/0.80/stderr diff --git "a/src/optional/testresults/bar_stdout\ta\t6\tb\t0.80" b/src/optional/testresults/bar/a/6/b/0.80/stdout similarity index 100% rename from "src/optional/testresults/bar_stdout\ta\t6\tb\t0.80" rename to src/optional/testresults/bar/a/6/b/0.80/stdout diff --git "a/src/optional/testresults/foo_stderr\ta\t1\tb\t0.30" b/src/optional/testresults/foo/a/1/b/0.30/stderr similarity index 100% rename from "src/optional/testresults/foo_stderr\ta\t1\tb\t0.30" rename to src/optional/testresults/foo/a/1/b/0.30/stderr diff --git "a/src/optional/testresults/foo_stdout\ta\t1\tb\t0.30" b/src/optional/testresults/foo/a/1/b/0.30/stdout similarity index 100% rename from "src/optional/testresults/foo_stdout\ta\t1\tb\t0.30" rename to src/optional/testresults/foo/a/1/b/0.30/stdout diff --git "a/src/optional/testresults/foo_stderr\ta\t1\tb\t0.40" b/src/optional/testresults/foo/a/1/b/0.40/stderr similarity index 100% rename from "src/optional/testresults/foo_stderr\ta\t1\tb\t0.40" rename to src/optional/testresults/foo/a/1/b/0.40/stderr diff --git "a/src/optional/testresults/foo_stdout\ta\t1\tb\t0.40" b/src/optional/testresults/foo/a/1/b/0.40/stdout similarity index 100% rename from "src/optional/testresults/foo_stdout\ta\t1\tb\t0.40" rename to src/optional/testresults/foo/a/1/b/0.40/stdout diff --git "a/src/optional/testresults/foo_stderr\ta\t2\tb\t0.30" b/src/optional/testresults/foo/a/2/b/0.30/stderr similarity index 100% rename from "src/optional/testresults/foo_stderr\ta\t2\tb\t0.30" rename to src/optional/testresults/foo/a/2/b/0.30/stderr diff --git "a/src/optional/testresults/foo_stdout\ta\t2\tb\t0.30" b/src/optional/testresults/foo/a/2/b/0.30/stdout similarity index 100% rename from "src/optional/testresults/foo_stdout\ta\t2\tb\t0.30" rename to src/optional/testresults/foo/a/2/b/0.30/stdout diff --git "a/src/optional/testresults/foo_stderr\ta\t2\tb\t0.40" b/src/optional/testresults/foo/a/2/b/0.40/stderr similarity index 100% rename from "src/optional/testresults/foo_stderr\ta\t2\tb\t0.40" rename to src/optional/testresults/foo/a/2/b/0.40/stderr diff --git "a/src/optional/testresults/foo_stdout\ta\t2\tb\t0.40" b/src/optional/testresults/foo/a/2/b/0.40/stdout similarity index 100% rename from "src/optional/testresults/foo_stdout\ta\t2\tb\t0.40" rename to src/optional/testresults/foo/a/2/b/0.40/stdout