rpms/gdl/devel gdl-0.9rc4-cvs.patch, NONE, 1.1 gdl.spec, 1.55, 1.56 gdl-0.9rc4-GDLLexer.patch, 1.1, NONE gdl-0.9rc4-python.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Thu Jun 3 15:10:46 UTC 2010
Author: orion
Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31721
Modified Files:
gdl.spec
Added Files:
gdl-0.9rc4-cvs.patch
Removed Files:
gdl-0.9rc4-GDLLexer.patch gdl-0.9rc4-python.patch
Log Message:
* Thu Jun 3 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.13.rc4
- Update to today's cvs
- Drop GLDLexer and python patches
- BR antlr-C++ on Fedora 14+
gdl-0.9rc4-cvs.patch:
cvs/gdl/INSTALL | 50
cvs/gdl/MAP_INSTALL | 51
cvs/gdl/Makefile.cvs | 8
cvs/gdl/NEWS | 19
cvs/gdl/README | 20
cvs/gdl/config.h.in | 6
cvs/gdl/configure | 196 -
cvs/gdl/configure.in | 86
cvs/gdl/doc/www/contribute.html | 30
cvs/gdl/doc/www/credits.html | 55
cvs/gdl/doc/www/download.html | 69
cvs/gdl/doc/www/feedback.html | 23
cvs/gdl/doc/www/gdl.css | 25
cvs/gdl/doc/www/home.html | 70
cvs/gdl/doc/www/index.html | 12
cvs/gdl/doc/www/menu.html | 32
cvs/gdl/doc/www/require.html | 122
cvs/gdl/doc/www/resources.html | 38
cvs/gdl/doc/www/screenshot.html | 124
cvs/gdl/doc/www/screenshots/screenshot01.png |binary
cvs/gdl/doc/www/screenshots/screenshot01_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot02.png |binary
cvs/gdl/doc/www/screenshots/screenshot02_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot03.png |binary
cvs/gdl/doc/www/screenshots/screenshot03_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot04.png |binary
cvs/gdl/doc/www/screenshots/screenshot04_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot05.png |binary
cvs/gdl/doc/www/screenshots/screenshot05_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot06.png |binary
cvs/gdl/doc/www/screenshots/screenshot06_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot07.png |binary
cvs/gdl/doc/www/screenshots/screenshot07_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot08.png |binary
cvs/gdl/doc/www/screenshots/screenshot08_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot09.png |binary
cvs/gdl/doc/www/screenshots/screenshot09_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot10.png |binary
cvs/gdl/doc/www/screenshots/screenshot10_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot11.png |binary
cvs/gdl/doc/www/screenshots/screenshot11_thumb.png |binary
cvs/gdl/doc/www/screenshots/screenshot12.png |binary
cvs/gdl/doc/www/screenshots/screenshot12_thumb.png |binary
cvs/gdl/doc/www/support.html | 20
cvs/gdl/doc/www/tdl.html | 19
cvs/gdl/gdl.kdevelop | 9
cvs/gdl/src/.#file.cpp.1.9 | 842 ++++
cvs/gdl/src/GDLInterpreter.cpp | 3808 +++++++++++++--------
cvs/gdl/src/GDLInterpreter.hpp | 362 +
cvs/gdl/src/GDLInterpreterTokenTypes.hpp | 425 +-
cvs/gdl/src/GDLInterpreterTokenTypes.txt | 425 +-
cvs/gdl/src/GDLLexer.cpp | 383 +-
cvs/gdl/src/GDLLexer.hpp | 2
cvs/gdl/src/GDLParser.cpp | 3122 ++++++++++-------
cvs/gdl/src/GDLParser.hpp | 26
cvs/gdl/src/GDLTokenTypes.hpp | 425 +-
cvs/gdl/src/GDLTokenTypes.txt | 425 +-
cvs/gdl/src/GDLTreeParser.cpp | 1903 ++++++----
cvs/gdl/src/GDLTreeParser.hpp | 23
cvs/gdl/src/GDLTreeParserTokenTypes.hpp | 425 +-
cvs/gdl/src/GDLTreeParserTokenTypes.txt | 425 +-
cvs/gdl/src/Makefile.am | 5
cvs/gdl/src/Makefile.in | 85
cvs/gdl/src/accessdesc.hpp | 10
cvs/gdl/src/antlr/LLkParser.cpp | 8
cvs/gdl/src/antlr/Makefile.am | 6
cvs/gdl/src/antlr/Makefile.in | 84
cvs/gdl/src/antlr/Parser.cpp | 11
cvs/gdl/src/antlr/RefCount.hpp | 4
cvs/gdl/src/antlr/TreeParser.cpp | 6
cvs/gdl/src/arrayindex.cpp | 12
cvs/gdl/src/arrayindex.hpp | 513 ++
cvs/gdl/src/arrayindexlistt.hpp | 18
cvs/gdl/src/assocdata.hpp | 15
cvs/gdl/src/basegdl.cpp | 21
cvs/gdl/src/basegdl.hpp | 39
cvs/gdl/src/basic_fun.cpp | 876 +++-
cvs/gdl/src/basic_fun_cl.cpp | 4
cvs/gdl/src/basic_fun_jmg.cpp | 10
cvs/gdl/src/basic_op.cpp | 378 +-
cvs/gdl/src/basic_pro.cpp | 125
cvs/gdl/src/basic_pro_jmg.cpp | 70
cvs/gdl/src/basic_pro_jmg.hpp | 2
cvs/gdl/src/convert2.cpp | 28
cvs/gdl/src/datalistt.hpp | 2
cvs/gdl/src/datatypes.cpp | 753 +++-
cvs/gdl/src/datatypes.hpp | 17
cvs/gdl/src/datatypesref.cpp | 1906 ++++++++++
cvs/gdl/src/dcompiler.cpp | 7
cvs/gdl/src/deviceps.hpp | 20
cvs/gdl/src/devicex.hpp | 8
cvs/gdl/src/dimension.hpp | 2
cvs/gdl/src/dinterpreter.cpp | 116
cvs/gdl/src/dinterpreter.hpp | 13
cvs/gdl/src/dnode.cpp | 3
cvs/gdl/src/dnode.hpp | 13
cvs/gdl/src/dpro.cpp | 23
cvs/gdl/src/dpro.hpp | 10
cvs/gdl/src/dstructgdl.cpp | 5
cvs/gdl/src/dstructgdl.hpp | 9
cvs/gdl/src/envt.cpp | 192 -
cvs/gdl/src/envt.hpp | 57
cvs/gdl/src/fftw.cpp | 17
cvs/gdl/src/file.cpp | 24
cvs/gdl/src/gdl.cpp | 2
cvs/gdl/src/gdlc.g | 404 +-
cvs/gdl/src/gdlc.i.g | 3701 +++++++++++---------
cvs/gdl/src/gdlc.tree.g | 242 +
cvs/gdl/src/gdlgstream.cpp | 5
cvs/gdl/src/gdlgstream.hpp | 74
cvs/gdl/src/gdljournal.cpp | 8
cvs/gdl/src/gdlpsstream.cpp | 2
cvs/gdl/src/gdlpsstream.hpp | 3
cvs/gdl/src/gdlpython.cpp | 2
cvs/gdl/src/gdlsvgstream.cpp | 2
cvs/gdl/src/gdlwidget.cpp | 298 +
cvs/gdl/src/gdlwidget.hpp | 43
cvs/gdl/src/gdlxstream.cpp | 38
cvs/gdl/src/gdlxstream.hpp | 8
cvs/gdl/src/gdlzstream.cpp | 2
cvs/gdl/src/grib.cpp | 4
cvs/gdl/src/grib.hpp | 4
cvs/gdl/src/gshhs.cpp | 288 +
cvs/gdl/src/gshhs.hpp | 30
cvs/gdl/src/gsl_fun.cpp | 146
cvs/gdl/src/gsl_fun.hpp | 1
cvs/gdl/src/hdf_pro.cpp | 5
cvs/gdl/src/initsysvar.cpp | 11
cvs/gdl/src/io.cpp | 15
cvs/gdl/src/io.hpp | 2
cvs/gdl/src/lapack.cpp | 19
cvs/gdl/src/libinit.cpp | 29
cvs/gdl/src/libinit_jmg.cpp | 33
cvs/gdl/src/magick_cl.cpp | 2
cvs/gdl/src/math_fun.cpp | 1146 +++---
cvs/gdl/src/math_fun_ac.cpp | 58
cvs/gdl/src/math_fun_jmg.cpp | 14
cvs/gdl/src/math_utl.hpp | 11
cvs/gdl/src/newprognode.cpp | 822 ++++
cvs/gdl/src/objects.cpp | 8
cvs/gdl/src/objects.hpp | 52
cvs/gdl/src/plotting.cpp | 529 ++
cvs/gdl/src/plotting.hpp | 7
cvs/gdl/src/print.cpp | 6
cvs/gdl/src/pro/Makefile.am | 5
cvs/gdl/src/pro/Makefile.in | 5
cvs/gdl/src/pro/README.txt | 8
cvs/gdl/src/pro/STATUS | 2
cvs/gdl/src/pro/UrgentNeed.txt | 1
cvs/gdl/src/pro/deriv.pro | 2
cvs/gdl/src/pro/findex.pro | 97
cvs/gdl/src/pro/hist_2d.pro | 39
cvs/gdl/src/pro/hist_nd.pro | 177
cvs/gdl/src/pro/interpol.pro | 43
cvs/gdl/src/pro/ludc.pro | 7
cvs/gdl/src/pro/restore.pro | 22
cvs/gdl/src/pro/str_sep.pro | 49
cvs/gdl/src/pro/strsplit.pro | 137
cvs/gdl/src/pro/tvscl.pro | 47
cvs/gdl/src/prognode.cpp | 969 ++++-
cvs/gdl/src/prognode.hpp | 1130 +++++-
cvs/gdl/src/prognodeexpr.cpp | 1310 +++----
cvs/gdl/src/prognodeexpr.hpp | 70
cvs/gdl/src/pythongdl.cpp | 12
cvs/gdl/src/read.cpp | 121
cvs/gdl/src/sigfpehandler.cpp | 2
cvs/gdl/src/specializations.hpp | 16
cvs/gdl/src/str.cpp | 18
cvs/gdl/src/strassenmatrix.hpp | 23
cvs/gdl/src/typedefs.hpp | 93
cvs/gdl/src/widget.cpp | 258 +
cvs/gdl/src/widget.hpp | 1
cvs/gdl/testsuite/Makefile.am | 26
cvs/gdl/testsuite/Makefile.in | 28
cvs/gdl/testsuite/README | 48
cvs/gdl/testsuite/Saturn.jpg |binary
cvs/gdl/testsuite/checks | 15
cvs/gdl/testsuite/test_constants.pro | 906 ++--
cvs/gdl/testsuite/test_device.pro | 29
cvs/gdl/testsuite/test_fft.pro | 149
cvs/gdl/testsuite/test_fix.pro | 17
cvs/gdl/testsuite/test_gc.pro | 28
cvs/gdl/testsuite/test_get_screen_size.pro | 75
cvs/gdl/testsuite/test_hist_2d.pro | 67
cvs/gdl/testsuite/test_idl8.pro | 45
cvs/gdl/testsuite/test_interpol.pro | 39
cvs/gdl/testsuite/test_known_bugs.pro | 101
cvs/gdl/testsuite/test_product.pro | 198 +
cvs/gdl/testsuite/test_read_jpeg.pro | 109
cvs/gdl/testsuite/test_rebin.pro | 11
cvs/gdl/testsuite/test_spher_harm.pro | 105
cvs/gdl/testsuite/test_spl_init.pro | 163
cvs/gdl/testsuite/test_str_functions.pro | 80
cvs/gdl/testsuite/test_suite.pro | 1716 ++++++---
cvs/gdl/testsuite/test_tv.pro | 76
cvs/gdl/testsuite/test_url.pro | 64
cvs/gdl/testsuite/test_zeropoly.pro | 4
cvs/gdl/testsuite/test_zzz.pro | 5
cvs/gdl/testsuite/try | 5
gdl-0.9rc4/doc/Makefile |only
gdl-0.9rc4/gdl.kdevses |only
gdl-0.9rc4/m4 |only
gdl-0.9rc4/src/GDLInterpreter.cvs.cpp |only
gdl-0.9rc4/src/GDLInterpreterHack.cpp |only
gdl-0.9rc4/src/deviceps.hpp.orig |only
gdl-0.9rc4/src/libinit.cpp.orig |only
gdl-0.9rc4/src/libinit.cpp.rej |only
gdl-0.9rc4/src/plotting.cpp.orig |only
gdl-0.9rc4/src/plotting.cpp.rej |only
gdl-0.9rc4/src/pro/dicom/Makefile.am.off |only
gdl-0.9rc4/src/pro/dicom/Makefile.in.off |only
gdl-0.9rc4/src/strassenmatrix.no_c_check.hpp |only
gdl-0.9rc4/src/strassenmatrix.ok.hpp |only
gdl-0.9rc4/src/strassenmatrix.rc1.hpp |only
gdl-0.9rc4/testsuite/Makefile |only
215 files changed, 25885 insertions(+), 10596 deletions(-)
--- NEW FILE gdl-0.9rc4-cvs.patch ---
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/config.h.in cvs/gdl/config.h.in
--- gdl-0.9rc4/config.h.in 2010-02-02 11:13:51.000000000 -0700
+++ cvs/gdl/config.h.in 2010-05-21 10:23:52.639905982 -0600
@@ -12,6 +12,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <gshhs.h> header file. */
+#undef HAVE_GSHHS_H
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -136,6 +139,9 @@
/* Define if you want to use GRIB */
#undef USE_GRIB
+/* Define if you want to use GSHHS */
+#undef USE_GSHHS
+
/* Define if you want to use HDF */
#undef USE_HDF
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/configure cvs/gdl/configure
--- gdl-0.9rc4/configure 2010-02-02 11:13:51.000000000 -0700
+++ cvs/gdl/configure 2010-04-16 11:22:42.000000000 -0600
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for gdl 0.9rc4.
+# Generated by GNU Autoconf 2.65 for gdl 0.9rc4 CVS.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='gdl'
PACKAGE_TARNAME='gdl'
-PACKAGE_VERSION='0.9rc4'
-PACKAGE_STRING='gdl 0.9rc4'
+PACKAGE_VERSION='0.9rc4 CVS'
+PACKAGE_STRING='gdl 0.9rc4 CVS'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1455,7 +1455,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gdl 0.9rc4 to adapt to many kinds of systems.
+\`configure' configures gdl 0.9rc4 CVS to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1529,7 +1529,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gdl 0.9rc4:";;
+ short | recursive ) echo "Configuration of gdl 0.9rc4 CVS:";;
esac
cat <<\_ACEOF
@@ -1653,7 +1653,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gdl configure 0.9rc4
+gdl configure 0.9rc4 CVS
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2237,7 +2237,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gdl $as_me 0.9rc4, which was
+It was created by gdl $as_me 0.9rc4 CVS, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2597,7 +2597,7 @@
if test "x$with_netcdf" = "x"; then with_netcdf=yes; fi
if test "x$with_hdf" = "x"; then with_hdf=yes; fi
if test "x$with_hdf5" = "x"; then with_hdf5=yes; fi
-if test "x$with_fftw" = "x"; then with_fftw=no; fi
+if test "x$with_fftw" = "x"; then with_fftw=auto; fi
if test "x$with_libproj4" = "x"; then with_libproj4=no; fi
if test "x$with_mpich" = "x"; then with_mpich=no; fi
if test "x$with_python" = "x"; then with_python=yes; fi
@@ -3068,7 +3068,7 @@
# Define the identity of the package.
PACKAGE='gdl'
- VERSION='0.9rc4'
+ VERSION='0.9rc4 CVS'
cat >>confdefs.h <<_ACEOF
@@ -14579,6 +14579,66 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if test "${ac_cv_search_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_dlopen+set}" = set; then :
+ break
+fi
+done
+if test "${ac_cv_search_dlopen+set}" = set; then :
+
+else
+ ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+if test x"$ac_cv_search_dlopen" = x-ldl; then
+LIBS="$LIBS -ldl"
+fi
+
# Check whether --enable-python_module was given.
if test "${enable_python_module+set}" = set; then :
@@ -14962,6 +15022,7 @@
fi
+openmp_autodetected=no
if test "x$with_openmp" = "x"; then
for ac_header in "omp.h"
do :
@@ -14974,11 +15035,10 @@
_ACEOF
with_openmp=yes
+ openmp_autodetected=yes
echo ""
echo "OpenMP enabled (omp.h file was found)."
echo "Try --with-openmp=no if your compiler does not support it (e.g. GCC < 4.2)"
- echo "The warnings about unsigned iteration variable can be ignored."
- echo "See the README for details."
echo ""
else
@@ -15170,6 +15230,7 @@
LIBS="$LIBS -lplplotd -lplplotcxxd"
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for plsexit in -lplplotcxxd" >&5
$as_echo_n "checking for plsexit in -lplplotcxxd... " >&6; }
if test "${ac_cv_lib_plplotcxxd_plsexit+set}" = set; then :
@@ -15824,7 +15885,7 @@
echo " Use --with-Magick=DIR to specify the ImageMagick directory tree"
echo " Use --with-Magick=no to not use it"
echo " Check the README or use configure --help for other libraries needed"
[...51759 lines suppressed...]
+;
+units=64
+nbx=10
+nby=8
+WINDOW, numwin, xsi=units*nbx, ysi=units*nby
+;
+vignette=DIST(units)
+;
+offset_line=0
+nb_cells=nbx*nby
+for ii=0, (nb_cells/2-1) do begin
+ offset_line=(ii / (nbx/2)) mod 2
+ if KEYWORD_SET(debug) then print, ii, offset_line, 2*ii+offset_line
+ LOADCT, ii
+ TVSCL, vignette, 2*ii+offset_line
+endfor
+;
+if NOT(KEYWORD_SET(noclose)) then begin
+ rep=''
+ READ, 'press any key to finish (and closing all windows)', rep
+ WDELETE, numwin
+endif
+;
+if KEYWORD_SET(test) then STOP
+;;
+end
+; -------------------------------------
+;
+pro TEST_TV_DAMIER, numwin, noclose=noclose, test=test, debug=debug
+;
+if KEYWORD_SET(help) then begin
+ print, 'pro TEST_TV_DAMIER, numwin, noclose=noclose, test=test, debug=debug, help=help'
+ return
+end
+;
+if N_PARAMS() EQ 0 then numwin=0
+;
+units=64
+nbx=8
+nby=8
+WINDOW, numwin, xsi=units*nbx, ysi=units*nby
+;
+vignette=DIST(units)
+;
+offset_line=0
+nb_cells=nbx*nby
+for ii=0, (nb_cells/2-1) do begin
+ offset_line=(ii / (nbx/2)) mod 2
+ if KEYWORD_SET(debug) then print, ii, offset_line, 2*ii+offset_line
+ TVSCL, vignette, 2*ii+offset_line
+endfor
+;
+if NOT(KEYWORD_SET(noclose)) then begin
+ rep=''
+ READ, 'press any key to finish (and closing all windows)', rep
+ WDELETE, numwin
+endif
+;
+if KEYWORD_SET(test) then STOP
+;;
+end
+; -------------------------------------
+;
pro TEST_TV, noclose=noclose, test=test
;
xdim=350
@@ -61,11 +132,14 @@
MY_WINDOW, 5, b3
MY_WINDOW, 6, REFORM(b3)
;
+TEST_TV_DAMIER, 8, /noclose
+TEST_TV_DAMIER_COLOR, 9, /noclose
+;
if NOT(KEYWORD_SET(noclose)) then begin
rep=''
READ, 'press any key to finish (and closing all windows)', rep
;;
- WDELETE, 0, 1, 2, 3, 4, 5, 6
+ WDELETE, 0, 1, 2, 3, 4, 5, 6, 8, 9
endif
;
if KEYWORD_SET(test) then STOP
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/test_url.pro cvs/gdl/testsuite/test_url.pro
--- gdl-0.9rc4/testsuite/test_url.pro 2010-02-02 11:13:51.000000000 -0700
+++ cvs/gdl/testsuite/test_url.pro 2010-04-16 11:22:54.000000000 -0600
@@ -8,17 +8,18 @@
; PHP is free software available at http://www.php.net/software/
; - examples of IPv6 addresses from the RFC2732 (Format for Literal IPv6 Addresses in URL's)
; (http://www.faqs.org/rfcs/rfc2732.html)
-pro test_url
-
- ; TODO: testing of parse-errors:
- ; GDL> print, parse_url('a://:000000')
- ; % PARSE_URL: port cannot be longer then 5 characters
- ; GDL> print, parse_url('a://:00000')
- ; % PARSE_URL: invalid host
-
- sample_urls = [ $
- ; examples from PHP test script
- '', $ ; IDL 6.4 fails (syntax error)
+;
+pro TEST_URL, debug=debug
+;
+; TODO: testing of parse-errors:
+; GDL> print, parse_url('a://:000000')
+; % PARSE_URL: port cannot be longer then 5 characters
+; GDL> print, parse_url('a://:00000')
+; % PARSE_URL: invalid host
+;
+sample_urls = [ $
+ ;; examples from PHP test script
+ '', $ ; IDL 6.4 fails (syntax error)
'64.246.30.37', $
'http://64.246.30.37', $
'http://64.246.30.37/', $
@@ -177,15 +178,36 @@
'{ http [2010:836B:4179::836B:4179] }', $
'{ http www.google.com / }' $
]
+;
+if KEYWORD_SET(test) OR KEYWORD_SET(debug) then STOP
+;
+nb_errors=0
+for i = 0, N_ELEMENTS(sample_urls) - 1 do begin
+ s = STRING(PARSE_URL(sample_urls[i]), /print)
+
+ ; STRING(/PRINT) returns an array if the string length exceedes the number of columns in a terminal
+ if N_ELEMENTS(s) NE 1 then begin
+ ss = ''
+ for ii = 0, n_elements(s) - 1 do ss += s[ii]
+ s = ss
+ endif
- for i = 0, n_elements(sample_urls) - 1 do begin
- s = string(parse_url(sample_urls[i]), /print)
- if s ne expected[i] then begin
- message, 'test failed for URL: ' + sample_urls[i], /continue
- message, ' expected: ' + expected[i], /continue
- message, ' got: ' + s, /continue
- ;help, parse_url(sample_urls[i]), /stru
- exit, status=1
- endif
- endfor
+ if (s NE expected[i]) then begin
+ MESSAGE, 'test failed for URL: ' + sample_urls[i], /continue
+ MESSAGE, ' expected: ' + expected[i], /continue
+ MESSAGE, ' got: ' + s, /continue
+ ;;help, parse_url(sample_urls[i]), /stru
+ ;;EXIT, status=1
+ nb_errors=nb_errors+1
+ CONTINUE
+ endif
+endfor
+;
+if (nb_errors GT 0) then begin
+ print, 'Number of errors founded :', nb_errors
+ EXIT, status=1
+endif
+;
+if KEYWORD_SET(test) then STOP
+;
end
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/test_zeropoly.pro cvs/gdl/testsuite/test_zeropoly.pro
--- gdl-0.9rc4/testsuite/test_zeropoly.pro 2010-02-02 11:13:51.000000000 -0700
+++ cvs/gdl/testsuite/test_zeropoly.pro 2010-04-16 11:22:54.000000000 -0600
@@ -44,4 +44,8 @@
endif
endfor
+ ; freeing heap vars
+ foreach i of c do ptr_free, i
+ foreach i of c do ptr_free, i
+
end
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/test_zzz.pro cvs/gdl/testsuite/test_zzz.pro
--- gdl-0.9rc4/testsuite/test_zzz.pro 1969-12-31 17:00:00.000000000 -0700
+++ cvs/gdl/testsuite/test_zzz.pro 2010-04-07 10:29:37.000000000 -0600
@@ -0,0 +1,5 @@
+; the name 'zzz' is chosen to place this test at the end of the list
+pro test_zzz
+ spawn, './checks', exit_status=status
+ exit, status=status
+end
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/try cvs/gdl/testsuite/try
--- gdl-0.9rc4/testsuite/try 2010-02-02 11:13:51.000000000 -0700
+++ cvs/gdl/testsuite/try 2010-04-16 11:22:54.000000000 -0600
@@ -8,9 +8,12 @@
# expected contents/behaviour of the GDL file:
# - the script to be tried shoud exit with a non-zero status if failed
# (if the scripts exits with status 77, automake will ignore the failure)
-# - the file should containg a procedure with a named in accordance with the
+# - the file should contain a procedure named in accordance with the
# file name, e.g. test_wavelet in test_wavelet.pro
# - the procedure should not need any arguments/keywords
+# a quick & dirty way of making the "checks" script work
+test "x$2" = "x./checks" && exit
+
IDL_PATH="" IDL_STARTUP="" GDL_STARTUP="" GDL_PATH=$1/src/pro:$1/testsuite \
$1/src/gdl -quiet -e `echo $2 | cut -d/ -f2 | cut -d. -f1`
Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- gdl.spec 22 Mar 2010 21:44:15 -0000 1.55
+++ gdl.spec 3 Jun 2010 15:10:46 -0000 1.56
@@ -2,7 +2,7 @@
Name: gdl
Version: 0.9
-Release: 0.12.rc4%{?dist}
+Release: 0.13.rc4%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -12,19 +12,22 @@ Source0: http://downloads.sourcef
Source1: gdl.csh
Source2: gdl.sh
Source3: makecvstarball
-Patch0: gdl-0.9rc4-wx-config.patch
-Patch1: gdl-0.9rc4-GDLLexer.patch
-Patch2: gdl-0.9rc4-python.patch
+Patch0: gdl-0.9rc4-cvs.patch
+Patch1: gdl-0.9rc4-wx-config.patch
# Build with system antlr library. Request for upstream change here:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
-Patch3: gdl-0.9rc3-antlr.patch
-Patch4: gdl-0.9rc4-antlr-auto.patch
-Patch5: gdl-0.9rc4-wx.patch
+Patch4: gdl-0.9rc3-antlr.patch
+Patch5: gdl-0.9rc4-antlr-auto.patch
+Patch6: gdl-0.9rc4-wx.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#RHEL doesn't have the needed antlr version/headers, has old plplot
-%if !0%{?rhel}
+%if 0%{?fedora}
+ %if 0%{?fedora} >= 14
+BuildRequires: antlr-C++
+ %else
BuildRequires: antlr
+ %endif
%global plplot_config %{nil}
%else
%global plplot_config --enable-oldplplot
@@ -78,14 +81,13 @@ Provides: %{name}-runtime = %{vers
%prep
%setup -q -n %{name}-%{version}rc4
-%patch0 -p1 -b .wx-config
-%patch1 -p1 -b .GDLLexer
-%patch2 -p1 -b .python
+%patch0 -p1 -b .cvs
+%patch1 -p1 -b .wx-config
%if !0%{?rhel}
-#patch3 -p1 -b .antlr
-%patch4 -p1 -b .antlr-auto
+#patch4 -p1 -b .antlr
+%patch5 -p1 -b .antlr-auto
%endif
-%patch5 -p1 -b .wx
+#patch6 -p1 -b .wx
%if !0%{?rhel}
rm -rf src/antlr
%endif
@@ -167,6 +169,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 3 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.13.rc4
+- Update to today's cvs
+- Drop GLDLexer and python patches
+- BR antlr-C++ on Fedora 14+
+
* Mon Mar 22 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.12.rc4
- Drop unused BR on proj-devel (bug #572616)
--- gdl-0.9rc4-GDLLexer.patch DELETED ---
--- gdl-0.9rc4-python.patch DELETED ---
More information about the scm-commits
mailing list