Index: branches/pap/psconfig/psbuild =================================================================== --- branches/pap/psconfig/psbuild (revision 23948) +++ branches/pap/psconfig/psbuild (revision 25027) @@ -153,7 +153,7 @@ # set build environment variables - ps_setenv (1, "PATH", "--path"); - ps_setenv (1, "CPATH", "--cpath"); - ps_setenv (1, "ARCH", "--arch"); + ps_setenv (1, "PATH", "--path"); + ps_setenv (1, "CPATH", "--cpath"); + ps_setenv (1, "ARCH", "--arch"); ps_setenv (1, "LIBRARY_PATH", "--library_path"); ps_setenv (1, "LD_LIBRARY_PATH", "--ld_library_path"); @@ -161,4 +161,5 @@ ps_setenv (1, "ACLOCAL_FLAGS", "--aclocal_flags"); ps_setenv (1, "PERL5LIB", "--perl5lib"); + ps_setenv (1, "CFITSIO", "--prefix"); exit 0; @@ -211,4 +212,5 @@ ps_setenv (0, "ACLOCAL_FLAGS", "--aclocal_flags"); ps_setenv (0, "PERL5LIB", "--perl5lib"); + ps_setenv (0, "CFITSIO", "--prefix"); # some versions of libtool use this value: Index: branches/pap/psconfig/pschecklibs =================================================================== --- branches/pap/psconfig/pschecklibs (revision 23948) +++ branches/pap/psconfig/pschecklibs (revision 25027) @@ -25,5 +25,12 @@ if ($ARGV[0] eq "-force") { if (@ARGV < 2) { die "-force must be coupled to a library name\n"; } - $force{lc($ARGV[1])} = 1; + if (lc($ARGV[1]) eq 'build') { + $force{'autoconf'} = 1; + $force{'automake'} = 1; + $force{'libtool'} = 1; + $force{'pkg-config'} = 1; + } else { + $force{lc($ARGV[1])} = 1; + } shift; shift; next; } @@ -93,4 +100,11 @@ # search for, and drop, existing libdir entry in libpath? unshift @libpath, $libdir; + +# XXX a temporary hack for libreadline (this failed... needed to modify libreadline/support/shobj-conf +# $shlib_libs = $ENV{'SHLIB_LIBS'}; +# unless ($shlib_libs =~ m|-lncurses|) { +# $shlib_libs .= " -lncurses"; +# } +# $ENV{'SHLIB_LIBS'} = $shlib_libs; # add the path defined by PATH Index: branches/pap/psconfig/pscheckperl =================================================================== --- branches/pap/psconfig/pscheckperl (revision 23948) +++ branches/pap/psconfig/pscheckperl (revision 25027) @@ -57,4 +57,7 @@ $homedir = `pwd`; chomp $homedir; +# Astro::FITS::CFITSIO requires this to be set correctly... +$ENV{'CFITSIO'} = $prefix; + print "psconfig version: $version\n"; print "prefix: $prefix\n"; @@ -78,10 +81,14 @@ if ($modver eq "") { $modver = 0; } system ("pscheckmods $module $modver"); - if ($? == 0) { + if (($? == 0) and not defined $force{$module} and not defined $force{'all'}) { # print "$module: found\n"; next; } - print "$module: missing\n"; + if (defined $force{$module}) { + print "$module: force\n"; + } else { + print "$module: missing\n"; + } unless ($build or defined $force{$module} or defined $force{'all'}) { $Nmissing ++; Index: branches/pap/psconfig/tagsets/ipp-2.8.dist =================================================================== --- branches/pap/psconfig/tagsets/ipp-2.8.dist (revision 23948) +++ branches/pap/psconfig/tagsets/ipp-2.8.dist (revision 25027) @@ -69,4 +69,6 @@ YYYYY DataStore ipp-2-8 -0 + YYYYY ppMops ipp-2-8 -0 + YNNNN extsrc/gpcsw ipp-2-8 -0 Index: branches/pap/psconfig/tagsets/ipp-2.8.libs =================================================================== --- branches/pap/psconfig/tagsets/ipp-2.8.libs (revision 23948) +++ branches/pap/psconfig/tagsets/ipp-2.8.libs (revision 25027) @@ -18,4 +18,11 @@ # make install options + +# Build tools +bin autoconf NONE NONE autoconf-2.63.tar.gz autoconf-2.63 N NONE NONE NONE +bin automake NONE NONE automake-1.10.tar.gz automake-1.10 N NONE NONE NONE +bin libtool NONE NONE libtool-2.2.6a.tar.gz libtool-2.2.6 N NONE NONE NONE +bin pkg-config NONE NONE pkg-config-0.23.tar.gz pkg-config-0.23 N NONE NONE NONE + lib libm NONE NONE NONE NONE N NONE NONE NONE lib libX11 NONE NONE NONE NONE N NONE NONE NONE @@ -27,12 +34,8 @@ lib libjpeg NONE jpeg jpegsrc.v6b-p1.tar.gz jpeg-6b N --enable-shared NONE install-lib lib libcfitsio NONE NONE cfitsio3100-pap.tar.gz cfitsio3100-pap N --enable-shared shared NONE -#lib libmysqlclient NONE mysql mysql-5.0.27.tar.gz mysql-5.0.27 N NONE NONE NONE lib libmysqlclient NONE mysql mysql-5.0.51a.tar.gz mysql-5.0.51a N NONE NONE NONE lib libgsl NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE lib libfftw3f NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-float,--enable-shared,--disable-fortran NONE NONE -#lib libfftw3 NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-shared,--disable-fortran NONE NONE -# paul claims we are not currently using double-point FFTs anywhere -bin pkg-config NONE NONE pkg-config-0.22.tar.gz pkg-config-0.22 N NONE NONE NONE inc X11/Xatom.h NONE NONE NONE NONE N NONE NONE NONE @@ -55,5 +58,5 @@ inc gsl/gsl_rng.h NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE inc inttypes.h NONE NONE NONE NONE N NONE NONE NONE -inc jpeglib.h NONE jpeg jpegsrc.v6b.tar.gz jpeg-6b N --enable-shared NONE install-lib +inc jpeglib.h NONE jpeg jpegsrc.v6b-p1.tar.gz jpeg-6b N --enable-shared NONE install-lib inc limits.h NONE NONE NONE NONE N NONE NONE NONE inc malloc.h NONE NONE NONE NONE N NONE NONE NONE Index: branches/pap/psconfig/tagsets/ipp-2.9.dist =================================================================== --- branches/pap/psconfig/tagsets/ipp-2.9.dist (revision 25027) +++ branches/pap/psconfig/tagsets/ipp-2.9.dist (revision 25027) @@ -0,0 +1,77 @@ +# necessary fields: +# |-- tag? +# ||-- build? +# |||-- package? +# ||||-- update directory from CVS? +# |||||-- build for developer? +# ||||| +# ||||| module branch name tag version +# ||||| + YYNNY Ohana ipp-2-9 -0 + NNYYN ohana.base ipp-2-9 -0 + NNYYN libohana ipp-2-9 -0 + NNYYN libfits ipp-2-9 -0 + NNYYN libautocode ipp-2-9 -0 + NNYYN libdvo ipp-2-9 -0 + NNYYN libkapa ipp-2-9 -0 + NNYYN libtap.ohana ipp-2-9 -0 + NNYYN addstar ipp-2-9 -0 + NNYYN delstar ipp-2-9 -0 + NNYYN getstar ipp-2-9 -0 + NNYYN ohana.tools ipp-2-9 -0 + NNYYN kapa2 ipp-2-9 -0 + NNYYN relphot ipp-2-9 -0 + NNYYN relastro ipp-2-9 -0 + NNYYN uniphot ipp-2-9 -0 + NNYYN opihi.base ipp-2-9 -0 + NNYYN mana ipp-2-9 -0 + NNYYN dvo ipp-2-9 -0 + NNYYN pantasks ipp-2-9 -0 + NNYYN pcontrol ipp-2-9 -0 + NNYYN pclient ipp-2-9 -0 + + YNNYY Nebulous/nebclient ipp-2-9 -0 + YNNYY Nebulous ipp-2-9 -0 + YNNYY Nebulous-Server ipp-2-9 -0 + YYYYY PS-IPP-Metadata-Config ipp-2-9 -0 + YYYYY PS-IPP-Config ipp-2-9 -0 + + YYYYY psLib ipp-2-9 -0 + YYYYY psModules ipp-2-9 -0 + YYYYY ppStats ipp-2-9 -0 + YYYYY psphot ipp-2-9 -0 + YYYYY psastro ipp-2-9 -0 + YYYYY ppConfigDump ipp-2-9 -0 + YYYYY ppImage ipp-2-9 -0 + YYYYY ppNoiseMap ipp-2-9 -0 + YYYYY ppNorm ipp-2-9 -0 + YYYYY ppMerge ipp-2-9 -0 + YNNYN pedestal ipp-2-9 -0 + YYYYY dvoTools ipp-2-9 -0 + YYYYY pswarp ipp-2-9 -0 + YYYYY ppArith ipp-2-9 -0 + YYYYY ppStack ipp-2-9 -0 + YYYYY ppSub ipp-2-9 -0 + YYYYY ppSim ipp-2-9 -0 + + YNNYY glueforge ipp-2-9 -0 + YNNYY dbconfig ipp-2-9 -0 + NNNNY ippdb.src + YYYNN ippdb ipp-2-9 -0 + YYYYY PS-IPP-PStamp ipp-2-9 -0 + YYYYY pstamp ipp-2-9 -0 + YYYYY ippTools ipp-2-9 -0 + YYYYY ippScripts ipp-2-9 -0 + YYYYY ippTasks ipp-2-9 -0 + + YYYYY ippconfig ipp-2-9 -0 + YNYYN psconfig ipp-2-9 -0 + YNYYN ippMonitor ipp-2-9 -0 + YYYYY DataStore ipp-2-9 -0 + + YYYYY ppMops ipp-2-9 -0 + + YYYYY extsrc/gpcsw ipp-2-9 -0 + YYYYY magic ipp-2-9 -0 + +# there are externally required C libraries and perl modules (see INSTALL) Index: branches/pap/psconfig/tagsets/ipp-2.9.libs =================================================================== --- branches/pap/psconfig/tagsets/ipp-2.9.libs (revision 25027) +++ branches/pap/psconfig/tagsets/ipp-2.9.libs (revision 25027) @@ -0,0 +1,97 @@ +# this file defines C libraries and C headers needed by the ipp, and information on finding them + +# directories to search: /lib, /usr/lib, /usr/X11R6/lib, etc. +# modifications based on the architecture (eg, PATH/lib64, etc) +# additional locations based on the env variables +# dlltype to use + +# each entry contains: +# type : lib / include +# name +# alternate names +# alternate paths +# tarball name +# tar directory +# force install by default? +# configure options +# make options +# make install options + + +# Build tools +bin autoconf NONE NONE autoconf-2.63.tar.gz autoconf-2.63 N NONE NONE NONE +bin automake NONE NONE automake-1.10.tar.gz automake-1.10 N NONE NONE NONE +bin libtool NONE NONE libtool-2.2.6a.tar.gz libtool-2.2.6 N NONE NONE NONE +bin pkg-config NONE NONE pkg-config-0.23.tar.gz pkg-config-0.23 N NONE NONE NONE + +lib libm NONE NONE NONE NONE N NONE NONE NONE +lib libX11 NONE NONE NONE NONE N NONE NONE NONE +lib libpthread NONE NONE NONE NONE N NONE NONE NONE +lib libncurses curses,termcap NONE ncurses-5.6.tar.gz ncurses-5.6 N NONE NONE NONE +lib libreadline NONE NONE readline-5.2-p13.tar.gz readline-5.2-p13 Y NONE NONE NONE +lib libz NONE NONE zlib-1.2.3.tar.gz zlib-1.2.3 N --shared NONE NONE +lib libpng NONE NONE libpng-1.2.15.tar.gz libpng-1.2.15 N NONE NONE NONE +lib libjpeg NONE jpeg jpegsrc.v6b-p1.tar.gz jpeg-6b N --enable-shared NONE install-lib +lib libcfitsio NONE NONE cfitsio3100-p2.tar.gz cfitsio3100-p2 N --enable-shared shared NONE +lib libmysqlclient NONE mysql mysql-5.0.51a.tar.gz mysql-5.0.51a N NONE NONE NONE +lib libgsl NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE +lib libfftw3f NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-float,--enable-shared,--disable-fortran NONE NONE + + +inc X11/Xatom.h NONE NONE NONE NONE N NONE NONE NONE +inc X11/Xlib.h NONE NONE NONE NONE N NONE NONE NONE +inc X11/Xresource.h NONE NONE NONE NONE N NONE NONE NONE +inc X11/Xutil.h NONE NONE NONE NONE N NONE NONE NONE +inc X11/cursorfont.h NONE NONE NONE NONE N NONE NONE NONE +inc X11/keysym.h NONE NONE NONE NONE N NONE NONE NONE +inc X11/keysymdef.h NONE NONE NONE NONE N NONE NONE NONE +inc arpa/inet.h NONE NONE NONE NONE N NONE NONE NONE +inc assert.h NONE NONE NONE NONE N NONE NONE NONE +inc complex.h NONE NONE NONE NONE N NONE NONE NONE +inc ctype.h NONE NONE NONE NONE N NONE NONE NONE +inc errno.h NONE NONE NONE NONE N NONE NONE NONE +inc fcntl.h NONE NONE NONE NONE N NONE NONE NONE +inc fftw3.h NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-float,--enable-shared,--disable-fortran NONE NONE +inc fitsio.h NONE NONE cfitsio3100-pap.tar.gz cfitsio3100-pap N --enable-shared shared NONE +inc glob.h NONE NONE NONE NONE N NONE NONE NONE +inc gsl/gsl_randist.h NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE +inc gsl/gsl_rng.h NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE +inc inttypes.h NONE NONE NONE NONE N NONE NONE NONE +inc jpeglib.h NONE jpeg jpegsrc.v6b-p1.tar.gz jpeg-6b N --enable-shared NONE install-lib +inc limits.h NONE NONE NONE NONE N NONE NONE NONE +inc malloc.h NONE NONE NONE NONE N NONE NONE NONE +inc math.h NONE NONE NONE NONE N NONE NONE NONE +inc memory.h NONE NONE NONE NONE N NONE NONE NONE +inc mysql.h NONE mysql mysql-5.0.51a.tar.gz mysql-5.0.51a N NONE NONE NONE +inc netdb.h NONE NONE NONE NONE N NONE NONE NONE +inc netinet/ip.h NONE NONE NONE NONE N NONE NONE NONE +inc png.h NONE NONE libpng-1.2.15.tar.gz libpng-1.2.15 N NONE NONE NONE +inc pthread.h NONE NONE NONE NONE N NONE NONE NONE +inc readline/history.h NONE NONE readline-5.2-p12.tar.gz readline-5.2-p12 N NONE NONE NONE +inc readline/readline.h NONE NONE readline-5.2-p12.tar.gz readline-5.2-p12 N NONE NONE NONE +inc regex.h NONE NONE NONE NONE N NONE NONE NONE +inc signal.h NONE NONE NONE NONE N NONE NONE NONE +inc stdint.h NONE NONE NONE NONE N NONE NONE NONE +inc stdio.h NONE NONE NONE NONE N NONE NONE NONE +inc stdlib.h NONE NONE NONE NONE N NONE NONE NONE +inc string.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/ipc.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/resource.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/sem.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/socket.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/stat.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/time.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/types.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/uio.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/un.h NONE NONE NONE NONE N NONE NONE NONE +inc sys/wait.h NONE NONE NONE NONE N NONE NONE NONE +inc time.h NONE NONE NONE NONE N NONE NONE NONE +inc unistd.h NONE NONE NONE NONE N NONE NONE NONE +inc zlib.h NONE NONE zlib-1.2.3.tar.gz zlib-1.2.3 N --shared NONE NONE + +# xml is currently not used by IPP +# lib xml2 NONE NONE NONE NONE Y NONE NONE NONE + +# doxygen is having some unknown build issues on alala +# bin doxygen NONE NONE doxygen-1.5.1.src.tar.gz doxygen-1.5.1 N NONE NONE NONE + Index: branches/pap/psconfig/tagsets/ipp-2.9.perl =================================================================== --- branches/pap/psconfig/tagsets/ipp-2.9.perl (revision 25027) +++ branches/pap/psconfig/tagsets/ipp-2.9.perl (revision 25027) @@ -0,0 +1,83 @@ +# NN Name Tarball Version Optional Responses + 00 Getopt::Long Getopt-Long-2.36.tar.gz 2.3 n + 00 Module::Build Module-Build-0.2806.tar.gz 0.2806 + 01 ExtUtils::MakeMaker ExtUtils-MakeMaker-6.31.tar.gz 0 + 02 Params::Validate Params-Validate-0.91.tar.gz 0.77 +# 02 Apache::Test Apache-Test-1.29.tar.gz 1.29 + 03 DateTime::TimeZone DateTime-TimeZone-0.59.tar.gz 0 + 04 DateTime::Locale DateTime-Locale-0.33.tar.gz 0 + 05 Time::Local Time-Local-1.17.tar.gz 0 + 06 DateTime DateTime-0.36.tar.gz 0 + 07 MIME::Base64 MIME-Base64-3.07.tar.gz 0 + 08 IO::Compress::Base IO-Compress-Base-2.003.tar.gz 0 + 09 Compress::Raw::Zlib Compress-Raw-Zlib-2.003.tar.gz 0 + 10 Class::Factory::Util Class-Factory-Util-1.6.tar.gz 0 + 11 DateTime::Format::Strptime DateTime-Format-Strptime-1.0700.tar.gz 0 + 12 Net::Domain::TLD Net-Domain-TLD-1.65.tar.gz 0 + 13 Sub::Uplevel Sub-Uplevel-0.14.tar.gz 0 + 14 HTML::Tagset HTML-Tagset-3.10.tar.gz 0 + 15 Digest Digest-1.15.tar.gz 0 + 16 IO::Compress::Zlib::Extra IO-Compress-Zlib-2.003.tar.gz 0 + 17 version version-0.70.tar.gz 0 + 18 Text::Balanced Text-Balanced-v2.0.0.tar.gz 0 + 19 DateTime::Format::Builder DateTime-Format-Builder-0.7807.tar.gz 0 + 20 ExtUtils::Manifest ExtUtils-Manifest-1.51.tar.gz 0 + 21 URI URI-1.35.tar.gz 1.30 + 22 Data::Validate::Domain Data-Validate-Domain-0.05.tar.gz 0 + 23 Test::Exception Test-Exception-0.24.tar.gz 0 + 24 Tree::DAG_Node Tree-DAG_Node-1.05.tar.gz 0 + 25 Array::Compare Array-Compare-1.13.tar.gz 0 + 26 HTML::Parser HTML-Parser-3.56.tar.gz 0 + 27 Digest::MD5 Digest-MD5-2.36.tar.gz 0 + 28 Net::FTP libnet-1.19.tar.gz 0 + 29 Compress::Zlib Compress-Zlib-2.003.tar.gz 0 + 30 Locale::Maketext::Simple Locale-Maketext-Simple-0.18.tar.gz 0 + 31 Parse::RecDescent Parse-RecDescent-1.94.tar.gz 1.94 + 32 Class::Accessor Class-Accessor-0.30.tar.gz 0.19 + 33 DateTime::Format::ISO8601 DateTime-Format-ISO8601-0.06.tar.gz 0.06 + 34 CGI CGI.pm-3.25.tar.gz 3 + 35 Test::Cmd Test-Cmd-1.05.tar.gz 1.05 + 36 Net::HTTPServer Net-HTTPServer-1.1.1.tar.gz 1.1.1 + 37 LWP libwww-perl-5.805.tar.gz 0 + 38 Digest::MD5::File Digest-MD5-File-0.05.tar.gz 0.03 + 39 File::Temp File-Temp-0.18.tar.gz 0.16 + 40 Data::Validate::URI Data-Validate-URI-0.01.tar.gz 0.01 + 41 Test::Warn Test-Warn-0.08.tar.gz 0 + 42 YAML YAML-0.62.tar.gz 0.58 y + 43 Module::Load Module-Load-0.10.tar.gz 0 + 44 Params::Check Params-Check-0.25.tar.gz 0 + 45 Template Template-Toolkit-2.16.tar.gz 0 n,n + 46 Statistics::Descriptive Statistics-Descriptive-2.6.tar.gz 2.6 + 47 Storable Storable-2.15.tar.gz 0 + 48 IO::String IO-String-1.08.tar.gz 0 + 49 Date::Parse TimeDate-1.16.tar.gz 0 + 50 Digest::SHA1 Digest-SHA1-2.11.tar.gz 0 + 51 DB_File DB_File-1.814.tar.gz 0 + 52 File::NFSLock File-NFSLock-1.20.tar.gz 0 + 53 Heap Heap-0.71.tar.gz 0 + 54 Module::Load::Conditional Module-Load-Conditional-0.16.tar.gz 0 + 55 IPC::Run IPC-Run-0.80.tar.gz 0 + 56 Cache Cache-2.04.tar.gz 0 + 57 IPC::Cmd IPC-Cmd-0.36.tar.gz 0.36 + 58 SOAP::Lite SOAP-Lite-0.69.tar.gz 0 yes,yes,no + 59 Log::Log4perl Log-Log4perl-1.10.tar.gz 0 +# 60 File::ExtAttr File-ExtAttr-1.04.tar.gz 0 + 61 Text::Glob Text-Glob-0.08.tar.gz 0.08 + 62 Number::Compare Number-Compare-0.01.tar.gz 0.01 + 63 File::Find::Rule File-Find-Rule-0.30.tar.gz 0.30 + 64 Astro::FITS::CFITSIO Astro-FITS-CFITSIO-1.05.tar.gz 0 + 65 Test::More Test-Simple-0.74.tar.gz 0.49 +# 66 Apache::DBI Apache-DBI-1.06.tar.gz 0 +# 67 Apache2::SOAP Apache2-SOAP-0.72.tar.gz 0 + 68 Test::URI Test-URI-1.08.tar.gz 0 +# 69 Sys::Statistics::Linux::DiskUsage Sys-Statistics-Linux-0.26.tar.gz 0 +# 70 Config::YAML Config-YAML-1.42.tar.gz 0 +# 72 File::ExtAttr File-ExtAttr-1.07.tar.gz 0 + 73 DBI DBI-1.601.tar.gz 0 + 71 DBD::mysql DBD-mysql-4.006.tar.gz 0 +# 74 Net::Server::Daemonize Net-Server-0.97.tar.gz 0.05 + 75 File::Path File-Path-2.04.tar.gz + 76 File::Mountpoint File-Mountpoint-0.01.tar.gz 0.01 + 77 Filesys::Df Filesys-Df-0.92.tar.gz 0.92 + 78 SQL::Interp SQL-Interp-1.06.tar.gz + 79 Log::Dispatch::Email::MailSend Log-Dispatch-2.22.tar.gz