env-switcher-cvs Mailing List for Environment Switcher

Brought to you by: donginn, jsquyres

env-switcher-cvs — CVS activity for env-switcher

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr (5)	_May (37)	_Jun (2)	_Jul (7)	_Aug (12)	_Sep (6)	_Oct (32)	_Nov	_Dec
2003	_Jan	_Feb (1)	_Mar	_Apr	_May	_Jun	_Jul (8)	_Aug	_Sep	_Oct	_Nov	_Dec
2004	_Jan (11)	_Feb	_Mar (15)	_Apr	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb (6)	_Mar (2)	_Apr	_May	_Jun	_Jul	_Aug	_Sep (1)	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

[env-switcher-cvs] CVS: env-switcher/dist env-switcher.spec.in,1.15,1.16

From: Jeff S. <jsq...@us...> - 2005-09-19 07:31:17

Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12243

Modified Files:
	env-switcher.spec.in 
Log Message:
Very old pending commit


Index: env-switcher.spec.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/env-switcher.spec.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** env-switcher.spec.in	7 Mar 2004 22:06:54 -0000	1.15
--- env-switcher.spec.in	19 Sep 2005 07:31:03 -0000	1.16
***************
*** 175,178 ****
--- 175,183 ----
  #############################################################################
  %changelog
+ * Thu May 14 2004 Jeff Squyres <jsq...@la...>
+ - Change switcher-reload to switcher_reload, because at least some flavors
+   of sh/bash will barf when module's alias command makes that the name
+   of a shell subroutine.
+ 
  * Tue Oct 29 2002 Jeff Squyres <jsq...@la...>
  - Ensure that return value from switcher executable is properly

[env-switcher-cvs] CVS: default-manpath/dist VERSION,1.1,1.2 modules-default-manpath-oscar.spec,1.1,1.2

From: Jeff S. <jsq...@us...> - 2005-03-14 23:22:45

Update of /cvsroot/env-switcher/default-manpath/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16432/dist

Modified Files:
	VERSION modules-default-manpath-oscar.spec 
Log Message:
Update -- if there is no /etc/man.config, don't try to open it.


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/default-manpath/dist/VERSION,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** VERSION	28 Feb 2005 23:15:33 -0000	1.1
--- VERSION	14 Mar 2005 23:22:28 -0000	1.2
***************
*** 1,5 ****
  major=1
  minor=0
! release=0
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=1
  alpha=0
  beta=0

Index: modules-default-manpath-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/default-manpath/dist/modules-default-manpath-oscar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modules-default-manpath-oscar.spec	28 Feb 2005 23:15:33 -0000	1.1
--- modules-default-manpath-oscar.spec	14 Mar 2005 23:22:28 -0000	1.2
***************
*** 115,118 ****
--- 115,121 ----
  #############################################################################
  %changelog
+ * Mon Mar 14 2005 Jeff Squyres <jsq...@la...>
+ - Only examine /etc/man.config if it exists
+ 
  * Mon Feb 28 2005 Jeff Squyres <jsq...@la...>
  - First version

[env-switcher-cvs] CVS: default-manpath/src default-manpath.tcl,1.1,1.2

From: Jeff S. <jsq...@us...> - 2005-03-14 23:22:42

Update of /cvsroot/env-switcher/default-manpath/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16432/src

Modified Files:
	default-manpath.tcl 
Log Message:
Update -- if there is no /etc/man.config, don't try to open it.


Index: default-manpath.tcl
===================================================================
RCS file: /cvsroot/env-switcher/default-manpath/src/default-manpath.tcl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** default-manpath.tcl	28 Feb 2005 23:15:34 -0000	1.1
--- default-manpath.tcl	14 Mar 2005 23:22:29 -0000	1.2
***************
*** 25,32 ****
  # Read in /etc/man.config, find all MANPATH entires
  
! set manconfig [open "|egrep ^MANPATH /etc/man.config" "r"]
! while { [eof $manconfig] == 0 } {
      gets $manconfig line
!   set words [split $line]
  
      # To be blunt, I didn't have the time or inclination to figure out the
--- 25,33 ----
  # Read in /etc/man.config, find all MANPATH entires
  
! if { [file exists /etc/man.config] } {
!   set manconfig [open "|egrep ^MANPATH /etc/man.config" "r"]
!   while { [eof $manconfig] == 0 } {
      gets $manconfig line
!     set words [split $line]
  
      # To be blunt, I didn't have the time or inclination to figure out the
***************
*** 37,43 ****
      # MANPATH, and not anything else.
  
!   if { [lindex $words 0] == "MANPATH" } {
!     append-path MANPATH [lindex $words 1]
    }
  }
- close $manconfig
--- 38,45 ----
      # MANPATH, and not anything else.
  
!     if { [lindex $words 0] == "MANPATH" } {
!       append-path MANPATH [lindex $words 1]
!     }
    }
+   close $manconfig
  }

[env-switcher-cvs] CVS: default-manpath/dist .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 Makefile.options,NONE,1.1 VERSION,NONE,1.1 buildrpm.sh,NONE,1.1 get_morpm_version,NONE,1.1 modules-default-manpath-oscar.spec,NONE,1.1

From: Jeff S. <jsq...@us...> - 2005-02-28 23:15:43

Update of /cvsroot/env-switcher/default-manpath/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18637/dist

Added Files:
	.cvsignore Makefile.am Makefile.options VERSION buildrpm.sh 
	get_morpm_version modules-default-manpath-oscar.spec 
Log Message:
First cut


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
install-sh
missing
mkinstalldirs

--- NEW FILE: Makefile.am ---
# -*- makefile -*-
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: Makefile.am,v 1.1 2005/02/28 23:15:21 jsquyres Exp $
#

include $(top_srcdir)/dist/Makefile.options

EXTRA_DIST	= Makefile.options VERSION get_morpm_version

--- NEW FILE: Makefile.options ---
# -*- makefile -*-
#
# Copyright (c) 2002 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-oscar software package.  For
# license information, see the LICENSE file in the top-level directory
# of the modules-oscar source distribution.
#
# $Id: Makefile.options,v 1.1 2005/02/28 23:15:33 jsquyres Exp $
#

AUTOMAKE_OPTIONS	= foreign

--- NEW FILE: VERSION ---
major=1
minor=0
release=0
alpha=0
beta=0

--- NEW FILE: buildrpm.sh ---
#!/bin/sh -f
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: buildrpm.sh,v 1.1 2005/02/28 23:15:33 jsquyres Exp $
#

#
# Setup
#

specfile="modules-default-manpath-oscar.spec"
oscar_target="noarch"

#
# get the tarball name
#

tarball="$1"
if test "$tarball" = ""; then
    echo "Usage: buildrpm.sh <modules_default_manpath_oscar_tarball>"
    exit 1
fi
if test ! -f $tarball; then
    echo "Can't find $tarball"
    exit 1
fi
echo "--> Found tarball: $tarball"

#
# Extract the version number from the tarball
#

morpm_version="`./get_morpm_version ..`"
echo "--> Buidling modules OSCAR RPM version $morpm_version"

#
# do we have the spec files?
#

for file in $specfile; do
    if test ! -f $file; then
	echo "Can't find $file file"
	exit 1
    fi
    echo "--> Found specfile: $file"
done

#
# Find where the top RPM-building directory is
#

rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"
if test "$rpmtopdir" != ""; then
    if test ! -d "$rpmtopdir"; then
	mkdir -p "$rpmtopdir"
	mkdir -p "$rpmtopdir/BUILD"
	mkdir -p "$rpmtopdir/RPMS"
	mkdir -p "$rpmtopdir/RPMS/i386"
	mkdir -p "$rpmtopdir/RPMS/i586"
	mkdir -p "$rpmtopdir/RPMS/i686"
	mkdir -p "$rpmtopdir/RPMS/noarch"
	mkdir -p "$rpmtopdir/RPMS/athlon"
	mkdir -p "$rpmtopdir/SOURCES"
	mkdir -p "$rpmtopdir/SPECS"
	mkdir -p "$rpmtopdir/SRPMS"
    fi
    need_root=0
elif test -d /usr/src/RPM; then
    need_root=1
    rpmtopdir="/usr/src/RPM"
else
    need_root=1
    rpmtopdir="/usr/src/redhat"
fi
echo "--> Found RPM top dir: $rpmtopdir"

#
# If we're not root, try to sudo
#

if test "$need_root" = "1" -a "`whoami`" != "root"; then
    echo "--> Trying to sudo: \"$0 $*\""
    echo "------------------------------------------------------------"
    sudo -u root sh -c "$0 $tarball"
    echo "------------------------------------------------------------"
    echo "--> sudo finished"
    exit 0
fi

#
# make sure we have write access to the directories we need
#

if test ! -w $rpmtopdir/SOURCES ; then
    echo "Problem creating rpms: You do not have a $rpmtopdir directory"
    echo "tree or you do not have write access to the $rpmtopdir directory"
    echo "tree.  Please remedy and try again."
    exit 1
fi
echo "--> Have write access to $rpmtopdir/SOURCES"

#
# move the tarball file to the rpm directory
#

dir="$rpmtopdir/SOURCES"
for file in $tarball; do
    echo "--> Copying $file to $dir"
    cp $file $dir
    b="`basename $file`"
    if test ! -f $dir/$b; then
	echo "Couldn't copy $file to $dir"
	exit 1
    fi
    echo "--> Copied $file to $dir"
done

#
# Copy the specfile
#

specdest="$rpmtopdir/SPECS/$specfile"
rm -f $specdest
sed -e 's/@MORPM_VERSION@/'$morpm_version/ $specfile > $specdest
if test ! -f $specdest; then
    echo "Couldn't copy $specfile to $rpmtopdor/SPECS"
    exit 1
fi
echo "--> Copied $specfile to $rpmtopdir/SPECS"

#
# build the OSCAR RPM
#

rpm_cmd="rpmbuild"
echo "--> Building the OSCAR RPM"
cmd="$rpm_cmd -ba --target=$oscar_target $specdest"
echo "--> $cmd"
eval $cmd

if test $? != 0; then
  echo "*** FAILURE BUILDING OSCAR RPM!"
  echo "Aborting"
  exit 1
fi

#
# Remove the build trees
#

dir="$rpmtopdir/BUILD/`basename $tarball`"
dir="`echo $dir | sed -e 's/.tar.gz$//'`"
echo "--> removing directory: $dir"
rm -rf $dir

#
# All done
#

cat <<EOF
------------------------------------------------------------------------------
====                    FINISHED BUILDING OSCAR RPM                       ====
------------------------------------------------------------------------------
A copy of the tarball is located in: $rpmtopdir/SOURCES/
The completed rpms are located in:   $rpmtopdir/RPMS/$oscar_target/
The sources rpms are located in:     $rpmtopdir/SRPMS/
The spec files are located in:       $rpmtopdir/SPECS/
------------------------------------------------------------------------------

EOF

--- NEW FILE: get_morpm_version ---
#!/bin/sh
#
# Copyright (c) 2002 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-oscar software package.  For
# license information, see the LICENSE file in the top-level directory
# of the modules-oscar source distribution.
#
# $Id: get_morpm_version,v 1.1 2005/02/28 23:15:33 jsquyres Exp $
#

srcdir="$1/dist"
option="$2"

if test "$srcdir" = ""; then
    option="--help"
else
    MAJOR_VERSION="`cat $srcdir/VERSION | grep major | cut -d= -f2`"
    MINOR_VERSION="`cat $srcdir/VERSION | grep minor | cut -d= -f2`"
    RELEASE_VERSION="`cat $srcdir/VERSION | grep release | cut -d= -f2`"
    ALPHA_VERSION="`cat $srcdir/VERSION | grep alpha | cut -d= -f2`"
    BETA_VERSION="`cat $srcdir/VERSION | grep beta | cut -d= -f2`"
    if test "$RELEASE_VERSION" != "0" -a "$RELEASE_VERSION" != ""; then
	VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION"
    else
	VERSION="$MAJOR_VERSION.$MINOR_VERSION"
    fi

    if test "`expr $ALPHA_VERSION \> 0`" = "1"; then
	VERSION="${VERSION}a$ALPHA_VERSION"
    elif test "`expr $BETA_VERSION \> 0`" = "1"; then
	VERSION="${VERSION}b$BETA_VERSION"
    fi

    if test "$option" = ""; then
	option="--full"
	fi
fi

case "$option" in
    --full|-v|--version)
	echo $VERSION
	;;
    --major)
	echo $MAJOR_VERSION
	;;
    --minor)
	echo $MINOR_VERSION
	;;
    --release)
	echo $RELEASE_VERSION
	;;
    --alpha)
	echo $ALPHA_VERSION
	;;
    --beta)
	echo $BETA_VERSION
	;;
    -h|--help)
	cat <<EOF
$0 <srcdir> [<option>]

<srcdir>  - Top-level directory of the LAM source tree
<option>  - One of:
    --full    - Full version number
    --major   - Major version number
    --minor   - Minor version number
    --release - Release version number
    --alpha   - Alpha version number
    --beta    - Beta version nmumber
    --help    - This message
EOF
esac

exit 0

--- NEW FILE: modules-default-manpath-oscar.spec ---
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: modules-default-manpath-oscar.spec,v 1.1 2005/02/28 23:15:33 jsquyres Exp $
#

#############################################################################
#
# Helpful Defines
#
#############################################################################

%define _moddir /opt/modules/oscar-modulefiles/default-manpath

# Added to get around RPM 4.2 debugging additions (starting in RH 8.0)
%define debug_package %{nil}
%define __check_files %{nil}


#############################################################################
#
# Preamble Section
#
#############################################################################

Summary: Modules default manpath package
Name: modules-default-manpath-oscar
Version: @MORPM_VERSION@
Release: 1
License: BSD
Group: Applications/Environment
Source0: modules-default-manpath-oscar-@MORPM_VERSION@.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Packager: Open Cluster Group / OSCAR working group
AutoReqProv: no
Requires: modules-oscar
Requires: %__cp %__mkdir %__chmod %__cat

%description 
A "feature" of the man command in Linux is that whenever you add
something to MANPATH, it stops looking in the /etc/man.config file to
find the default paths where to look for man pages.  This RPM contains
a modulefile that will be loaded by default on OSCAR clusters that
manually reads all the MANPATH entries from /etc/man.config and adds
them to the MANPATH environment variable.


#############################################################################
#
# Prep Section
#
#############################################################################
%prep
%setup -q -n modules-default-manpath-oscar-@MORPM_VERSION@

# Otherwise, this directory shows up on security reports

chmod -R o-w $RPM_BUILD_DIR/modules-default-manpath-oscar-@MORPM_VERSION@


#############################################################################
#
# Build Section
#
#############################################################################


#############################################################################
#
# Install Section
#
#############################################################################
%install

# Nothing to build -- just some files to install

# Install the "default-manpath" modulefile and set its default version

env | sort | egrep -i 'RPM|root'
destdir="$RPM_BUILD_ROOT/%{_moddir}"
%__mkdir_p "$destdir"
%__chmod 0755 "$destdir"

srcdir="$RPM_BUILD_DIR/modules-default-manpath-oscar-@MORPM_VERSION@"
%__cp "$srcdir/src/default-manpath.tcl" "$destdir/@MORPM_VERSION@"
%__cat > "$destdir/.version" << EOF
#%Module
set ModulesVersion @MORPM_VERSION@
EOF
unset destdir


#############################################################################
#
# Files Section
#
#############################################################################
%files

%defattr(-,root,root)
%doc README.OSCAR AUTHORS.OSCAR LICENSE.OSCAR
%{_moddir}


#############################################################################
#
# ChangeLog
#
#############################################################################
%changelog
* Mon Feb 28 2005 Jeff Squyres <jsq...@la...>
- First version

[env-switcher-cvs] CVS: default-manpath/src .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 default-manpath.tcl,NONE,1.1

From: Jeff S. <jsq...@us...> - 2005-02-28 23:15:43

Update of /cvsroot/env-switcher/default-manpath/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18637/src

Added Files:
	.cvsignore Makefile.am default-manpath.tcl 
Log Message:
First cut


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

--- NEW FILE: Makefile.am ---
# -*- makefile -*-
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: Makefile.am,v 1.1 2005/02/28 23:15:34 jsquyres Exp $
#

include $(top_srcdir)/dist/Makefile.options

EXTRA_DIST = default-manpath.tcl

--- NEW FILE: default-manpath.tcl ---
#%Module -*- tcl -*-
#
# This modulefile exists because of the way "man" gets its path.
# if $MANPATH is set, it ignored /etc/man.config, which is where all
# the default man paths are set.  There's an undocumented feature of
# man in that if you have ":" at the beginning or end (or, more specifically,
# any path in $MANPATH is empty), it'll read the MANPATH entries from
# /etc/man.config.  However, the modules commands "append-path" and 
# "prepend-path" are too smart -- they won't let us append or prepend
# an empty path.  
#
# So the solution we devised is to have a new modulefile that reads
# in the MANPATH entries from /etc/man.config and add them here
# with append-path.  Then, if the user doesn't want them, they can
# just unload this module.
#

proc ModulesHelp { } {
  puts stderr "\tThis module adds in the default MANPATH entries"
  puts stderr "\tto the $MANPATH environment variable from /etc/man.config."
}

module-whatis   "Add default entries to the MANPATH environment variable"

# Read in /etc/man.config, find all MANPATH entires

set manconfig [open "|egrep ^MANPATH /etc/man.config" "r"]
while { [eof $manconfig] == 0 } {
    gets $manconfig line
  set words [split $line]

    # To be blunt, I didn't have the time or inclination to figure out the
    # right TCL syntax to get the regexp right, above -- all I got was
    # "starting the line with MANPATH", but there's still a few items
    # in /etc/man.config that can start with MANPATH, but not *be* MANPATH
    # (e.g., "MANPATH_MAP").  So just double check here that we got
    # MANPATH, and not anything else.

  if { [lindex $words 0] == "MANPATH" } {
    append-path MANPATH [lindex $words 1]
  }
}
close $manconfig

[env-switcher-cvs] CVS: default-manpath .cvsignore,NONE,1.1 AUTHORS.OSCAR,NONE,1.1 LICENSE.OSCAR,NONE,1.1 Makefile.am,NONE,1.1 README.OSCAR,NONE,1.1 autogen.sh,NONE,1.1 configure.ac,NONE,1.1

From: Jeff S. <jsq...@us...> - 2005-02-28 23:15:30

Update of /cvsroot/env-switcher/default-manpath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18637

Added Files:
	.cvsignore AUTHORS.OSCAR LICENSE.OSCAR Makefile.am 
	README.OSCAR autogen.sh configure.ac 
Log Message:
First cut


--- NEW FILE: .cvsignore ---
configure
config.status
config.log
Makefile
Makefile.in
aclocal.m4
autom4te.cache

--- NEW FILE: AUTHORS.OSCAR ---
Modules OSCAR RPM Authors
=========================

The ids in parenthesis are those used in CVS commit notices


Current Authors
---------------

Indiana University:
  - Jeff Squyres (jsquyres)

--- NEW FILE: LICENSE.OSCAR ---
Software License for modules-oscar

Copyright (c) 2005 The Trustees of Indiana University.  
                   All rights reserved.

Indiana University has the exclusive rights to license this product
under the following license.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1) All redistributions of source code must retain the above
   copyright notice, the list of authors in the original source code,
   this list of conditions and the disclaimer listed in this license; 
2) All redistributions in binary form must reproduce the above
   copyright notice, this list of conditions and the disclaimer listed
   in this license in the documentation and/or other materials
   provided with the distribution; 
3) Any documentation included with all redistributions must include
   the following acknowledgement:

    "This product includes software developed at the the Pervasive
    Technology Labs at Indiana University. For technical information
    contact Andrew Lumsdaine at the Pervasive Technology Labs at
    Indiana University.  For administrative and license questions
    contact the Advanced Research and Technology Institute at 1100
    Waterway Blvd. Indianapolis, Indiana 46202, phone 317-274-5905,
    fax 317-274-5902."

Alternatively, this acknowledgement may appear in the software itself,
and wherever such third-party acknowledgments normally appear.

4) The name "modules-oscar" shall not be used to endorse or promote
   products derived from this software without prior written
   permission from Indiana University.  For written permission, please
   contact Indiana University Advanced Research & Technology
   Institute.

5) Products derived from this software may not be called or
   "modules-oscar", nor may "modules-oscar" appear in their name,
   without prior written permission of Indiana University Advanced
   Research & Technology Institute.

Indiana University provides no reassurances that the source code
provided does not infringe the patent or any other intellectual
property rights of any other entity.  Indiana University disclaims any
liability to any recipient for claims brought by any other entity
based on infringement of intellectual property rights or otherwise.

LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH NO
WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA UNIVERSITY
GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT SOFTWARE IS FREE
OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER PROPRIETARY
RIGHTS.  INDIANA UNIVERSITY MAKES NO WARRANTIES THAT SOFTWARE IS FREE
FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS", OR
OTHER HARMFUL CODE.  LICENSEE ASSUMES THE ENTIRE RISK AS TO THE
PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, AND TO THE
PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING SOFTWARE.

Indiana University has the exclusive rights to license this product
under this license.

--- NEW FILE: Makefile.am ---
# -*- makefile -*-
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: Makefile.am,v 1.1 2005/02/28 23:15:21 jsquyres Exp $
#

include $(top_srcdir)/dist/Makefile.options

SUBDIRS		= dist src

EXTRA_DIST	= AUTHORS.OSCAR README.OSCAR LICENSE.OSCAR

rpm:
	if test ! -f modules-oscar-$(MORPM_VERSION).tar.gz; then \
		make dist; \
	fi
	(cd dist; ./buildrpm.sh ../modules-default-manpath-oscar-$(MORPM_VERSION).tar.gz)

--- NEW FILE: README.OSCAR ---
-*- text -*-

Copyright (c) 2005 The Trustees of Indiana University.  
                   All rights reserved.

This file is part of the modules-default-manpath-oscar software
package.  For license information, see the LICENSE file in the
top-level directory of the modules-default-manpath-oscar source
distribution.

$Id: README.OSCAR,v 1.1 2005/02/28 23:15:21 jsquyres Exp $


Introduction
============

This package solely exists because of shortcomings in the "man"
command.  Specifically, if you add anything to the MANPATH environment
variable, the man no longer looks at /etc/man.config to find default
paths for man pages.  This package simply has one modulefile that will
be loaded by default on OSCAR clusters that reads all the MANPATH
entries from /etc/man.config and adds them to the MANPATH environment
variable. 


Contact Information
===================

Don't look for a web page or public CVS archive for this project
anyway -- there [currently] isn't one.  Maybe someday.  In the
meantime, send mail to the OSCAR mailing lists with comments,
suggestions, and bug reports (see http://oscar.sourceforge.net/).

--- NEW FILE: autogen.sh ---
#! /bin/sh 
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: autogen.sh,v 1.1 2005/02/28 23:15:21 jsquyres Exp $
#

#
# Some helper functions
#

test_for_existence() {
    prog="$1"
    foo="`$prog --version`"
    if test "$?" != 0; then
	cat <<EOF

You must have GNU autoconf, automake, and libtool installed to build
the developer's version of modules OSCAR RPM.  You can obtain these
packages from ftp://ftp.gnu.org/gnu/.

EOF
	# Stupid emacs: '
	exit 1
    fi
}

run_and_check() {
    progs="$*"
    echo "$progs"
    eval $progs
    if test "$?" != 0; then
	cat <<EOF

It seems that the execution of "$progs" has failed.
I am gonna abort.  :-(

This may be caused by an older version of one of the required
packages.  Please make sure you are using at least the following
versions:

GNU Autoconf 2.52
GNU Automake 1.5
GNU Libtool  1.4

EOF
	exit 1
    fi
}

#
# Are we in the right dir?
#

if test -f configure.ac ; then
    bad=0
else
    cat <<EOF

You must run this script from the top-level directory.

EOF
    exit 1
fi

test_for_existence autoconf
test_for_existence automake
#test_for_existence libtool

#
# Run them all
#

rm -f dist/config.guess
rm -f dist/config.sub
rm -f dist/depcomp
rm -f dist/install-sh
rm -f dist/ltconfig
rm -f dist/ltmain.sh
rm -f dist/missing
rm -f dist/mkinstalldirs

run_and_check aclocal
#run_and_check autoheader
run_and_check autoconf
run_and_check automake -a --copy

exit 0

--- NEW FILE: configure.ac ---
# -*- shell-script -*-
#
# Copyright (c) 2005 The Trustees of Indiana University.  
#                    All rights reserved.
#
# This file is part of the modules-default-manpath-oscar software
# package.  For license information, see the LICENSE file in the
# top-level directory of the modules-default-manpath-oscar source
# distribution.
#
# $Id: configure.ac,v 1.1 2005/02/28 23:15:21 jsquyres Exp $
#

# Init autoconf

AC_INIT(./src/default-manpath.tcl)
AC_CONFIG_AUX_DIR(./dist)

show_title() {
  cat <<EOF

*** $1
EOF
}

show_title "Initialization, setup"

# Init automake

get_version="sh $srcdir/dist/get_morpm_version $srcdir"
MORPM_VERSION="`eval $get_version --full`"
MAJOR_VERSION="`eval $get_version --major`"
MINOR_VERSION="`eval $get_version --minor`"
RELEASE_VERSION="`eval $get_version --release`"
ALPHA_VERSION="`eval $get_version --alpha`"
BETA_VERSION="`eval $get_version --beta`"
AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION)
AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION)
AC_DEFINE_UNQUOTED(RELEASE_VERSION, $RELEASE_VERSION)
AC_DEFINE_UNQUOTED(ALPHA_VERSION, $ALPHA_VERSION)
AC_DEFINE_UNQUOTED(BETA_VERSION, $BETA_VERSION)
AC_DEFINE_UNQUOTED(VERSION, "$MORPM_VERSION")

# Need to also AC_SUBST these for share/include/patchlevel.h and
# share/include/mpif.h

AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
AC_SUBST(RELEASE_VERSION)
AC_SUBST(ALPHA_VERSION)
AC_SUBST(BETA_VERSION)
AC_SUBST(MORPM_VERSION)

echo "Configuring modules/modules-default-manpath-oscar version $MORPM_VERSION"

#
# The third argument to AM_INIT_AUTOMAKE surpresses the PACKAGE and
# VERSION macors
#

AM_INIT_AUTOMAKE(modules-default-manpath-oscar, $MORPM_VERSION, 'no')

#
# Make automake clean emacs ~ files for "make clean"
#

CLEANFILES="*~ .*~"
AC_SUBST(CLEANFILES)

#
# All done
#

AC_OUTPUT([
    Makefile

    dist/Makefile

    src/Makefile
])

[env-switcher-cvs] CVS: default-manpath/dist - New directory

From: Jeff S. <jsq...@us...> - 2005-02-28 23:14:52

Update of /cvsroot/env-switcher/default-manpath/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18423/dist

Log Message:
Directory /cvsroot/env-switcher/default-manpath/dist added to the repository

[env-switcher-cvs] CVS: default-manpath/src - New directory

From: Jeff S. <jsq...@us...> - 2005-02-28 23:14:07

Update of /cvsroot/env-switcher/default-manpath/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18192/src

Log Message:
Directory /cvsroot/env-switcher/default-manpath/src added to the repository

[env-switcher-cvs] CVS: default-manpath - New directory

From: Jeff S. <jsq...@us...> - 2005-02-28 22:40:48

Update of /cvsroot/env-switcher/default-manpath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8522/default-manpath

Log Message:
Directory /cvsroot/env-switcher/default-manpath added to the repository

[env-switcher-cvs] CVS: env-switcher/src switcher.tcl.in,1.14,1.15

From: Jeff S. <jsq...@us...> - 2004-05-14 02:43:32

Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14179/src

Modified Files:
	switcher.tcl.in 
Log Message:
s/switcher-reload/switcher_reload/ because at least some versions of
sh / bash don't like that because module's "alias" command will make
that the name of a shell subroutine.  Sigh.


Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** switcher.tcl.in	8 Mar 2004 17:45:23 -0000	1.14
--- switcher.tcl.in	14 May 2004 02:43:21 -0000	1.15
***************
*** 76,80 ****
  # be what the current switcher settings are.
  
! set-alias switcher-reload "cd @SWITCHER_PKGDATADIR@ > /dev/null ; module unload */* ; module load switcher ; cd - > /dev/null"
  
  # If we're not removing the module, call switcher to announce what
--- 76,80 ----
  # be what the current switcher settings are.
  
! set-alias switcher_reload "cd @SWITCHER_PKGDATADIR@ > /dev/null ; module unload */* ; module load switcher ; cd - > /dev/null"
  
  # If we're not removing the module, call switcher to announce what

[env-switcher-cvs] CVS: modules-oscar/dist VERSION,1.6,1.7

From: Jeff S. <jsq...@us...> - 2004-03-09 04:35:55

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7744/dist

Modified Files:
	VERSION 
Log Message:
1.0.5 escaped


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/VERSION,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** VERSION	21 Jul 2003 10:44:38 -0000	1.6
--- VERSION	9 Mar 2004 04:11:08 -0000	1.7
***************
*** 1,5 ****
  major=1
  minor=0
! release=5
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=6
  alpha=0
  beta=0

[env-switcher-cvs] CVS: modules-oscar/dist modules-oscar.spec,1.17,1.18

From: Jeff S. <jsq...@us...> - 2004-03-09 00:05:31

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21849/dist

Modified Files:
	modules-oscar.spec 
Log Message:
Increase the relese number


Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** modules-oscar.spec	21 Jul 2003 13:15:59 -0000	1.17
--- modules-oscar.spec	8 Mar 2004 23:40:52 -0000	1.18
***************
*** 34,38 ****
  Name: modules-oscar
  Version: 3.1.6
! Release: 4
  License: GPL
  Group: Applications/Environment
--- 34,38 ----
  Name: modules-oscar
  Version: 3.1.6
! Release: 5
  License: GPL
  Group: Applications/Environment

[env-switcher-cvs] CVS: env-switcher/dist buildrpm.sh,1.5,1.6

From: Jeff S. <jsq...@us...> - 2004-03-09 00:05:09

Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21771/dist

Modified Files:
	buildrpm.sh 
Log Message:
Remove redundant code


Index: buildrpm.sh
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/buildrpm.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** buildrpm.sh	16 Jan 2004 15:54:27 -0000	1.5
--- buildrpm.sh	8 Mar 2004 23:40:27 -0000	1.6
***************
*** 112,157 ****
  
  #
- # Find where the top RPM-building directory is
- #
- 
- rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"
- if test "$rpmtopdir" != ""; then
-     if test ! -d "$rpmtopdir"; then
- 	mkdir -p "$rpmtopdir"
- 	mkdir -p "$rpmtopdir/BUILD"
- 	mkdir -p "$rpmtopdir/RPMS"
- 	mkdir -p "$rpmtopdir/RPMS/i386"
- 	mkdir -p "$rpmtopdir/RPMS/i586"
- 	mkdir -p "$rpmtopdir/RPMS/i686"
- 	mkdir -p "$rpmtopdir/RPMS/noarch"
- 	mkdir -p "$rpmtopdir/RPMS/athlon"
- 	mkdir -p "$rpmtopdir/SOURCES"
- 	mkdir -p "$rpmtopdir/SPECS"
- 	mkdir -p "$rpmtopdir/SRPMS"
-     fi
-     need_root=0
- elif test -d /usr/src/RPM; then
-     need_root=1
-     rpmtopdir="/usr/src/RPM"
- else
-     need_root=1
-     rpmtopdir="/usr/src/redhat"
- fi
- echo "--> Found RPM top dir: $rpmtopdir"
- 
- #
- # If we're not root, try to sudo
- #
- 
- if test "$need_root" = "1" -a "`whoami`" != "root"; then
-     echo "--> Trying to sudo: \"$0 $*\""
-     echo "------------------------------------------------------------"
-     sudo -u root sh -c "$0 $tarball"
-     echo "------------------------------------------------------------"
-     echo "--> sudo finished"
-     exit 0
- fi
- 
- #
  # make sure we have write access to the directories we need
  #
--- 112,115 ----

[env-switcher-cvs] CVS: env-switcher/src switcher.tcl.in,1.13,1.14

From: Jeff S. <jsq...@us...> - 2004-03-08 18:09:53

Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5745/src

Modified Files:
	switcher.tcl.in 
Log Message:
Not only did the last commit break abstraction and unload modules-oscar
(which switcher should know nothing about), it didn't even work because
unloading the switcher module will only unload modules that switcher
is currently set to load.  Hence, the following would not work:

module mpi = some-new-value
switcher-reload

In fact, you'd probably get an error because switcher would then try to
load the mpi module some-new-value -- without unloading the old mpi module
first.  This would inevitably cause a conflict and things would go downhill
from there.  So now switcher-reload forcibly unloads everything from
under SWITCHER_PKGDATADIR and then unloads the switcher module (which will
try to module unload everything that it knows about, which is ok -- they
fail silently), and then re-loads the switcher module.

RFE 905191 solved.  :-)


Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** switcher.tcl.in	8 Mar 2004 16:44:52 -0000	1.13
--- switcher.tcl.in	8 Mar 2004 17:45:23 -0000	1.14
***************
*** 76,80 ****
  # be what the current switcher settings are.
  
! alias switcher-reload "module unload oscar-modules; module load oscar-modules"
  
  # If we're not removing the module, call switcher to announce what
--- 76,80 ----
  # be what the current switcher settings are.
  
! set-alias switcher-reload "cd @SWITCHER_PKGDATADIR@ > /dev/null ; module unload */* ; module load switcher ; cd - > /dev/null"
  
  # If we're not removing the module, call switcher to announce what

[env-switcher-cvs] CVS: modules-oscar/src oscar.tcl,1.7,1.8

From: Jeff S. <jsq...@us...> - 2004-03-08 18:01:16

Update of /cvsroot/env-switcher/modules-oscar/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4873

Modified Files:
	oscar.tcl 
Log Message:
This commit changes nothing in the code -- it is only so that I can put in
a clarification/correction to the last commit message.

The last commit fixed a bug in "module unload oscar-modules"; it had nothing
to do with RFE 905191.  905191 is about switcher, not the modules
packaging.

[env-switcher-cvs] CVS: modules-oscar/src oscar.tcl,1.6,1.7

From: Jeff S. <jsq...@us...> - 2004-03-08 17:10:12

Update of /cvsroot/env-switcher/modules-oscar/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25616/src

Modified Files:
	oscar.tcl 
Log Message:
Fix for RFE 905191: add "switcher-reload" alias which simply does a
"module unload oscar-modules; module load oscar-modules".  This flushes
out the entire set of OSCAR-loaded modules (including switcher-loaded
modules), and then re-loads them.


Index: oscar.tcl
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/src/oscar.tcl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** oscar.tcl	27 Oct 2002 12:24:07 -0000	1.6
--- oscar.tcl	8 Mar 2004 16:45:46 -0000	1.7
***************
*** 15,23 ****
  module-whatis	"Sets up the OSCAR modules subsystem."
  
! # Tell modules to use the datadir, where the directory tree containing
! # all the OSCAR-related modulesfiles live
  
  set omdir /opt/modules/oscar-modulefiles
! module use $omdir
  
  # Set the MANPATH to have just a ":" in it.  This is undocumented man
--- 15,33 ----
  module-whatis	"Sets up the OSCAR modules subsystem."
  
! # Need to do some things differently if we're loading vs. unloading
  
  set omdir /opt/modules/oscar-modulefiles
! set am_removing [module-info mode remove]
! 
! # Tell modules to use the datadir, where the directory tree containing
! # all the OSCAR-related modulesfiles live.  Only do this if we're not
! # unloading this modulefile.  This is because upon unload, if we
! # "unuse" this directory and then try to "module unload" the files
! # below, it won't work.  We'll unuse this directory if we're unloading
! # *after* we do all the unload of individual modules.
! 
! if { ! $am_removing } {
!   module use $omdir
! }
  
  # Set the MANPATH to have just a ":" in it.  This is undocumented man
***************
*** 41,42 ****
--- 51,61 ----
    module load [file tail $modulefile] 
  }
+ 
+ # Per the note above, only unuse the directory if we're unloading.
+ # Note that we leave it "use" (vs. "unuse") because when we're
+ # unloading, the modules infrastructure will automatically change the
+ # meaning of "use" to "unuse".
+ 
+ if { $am_removing } {
+   module use $omdir
+ }

[env-switcher-cvs] CVS: modules-oscar LICENSE.OSCAR,1.1,1.2 README.OSCAR,1.2,1.3

From: Jeff S. <jsq...@us...> - 2004-03-08 17:10:12

Update of /cvsroot/env-switcher/modules-oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25616

Modified Files:
	LICENSE.OSCAR README.OSCAR 
Log Message:
Fix for RFE 905191: add "switcher-reload" alias which simply does a
"module unload oscar-modules; module load oscar-modules".  This flushes
out the entire set of OSCAR-loaded modules (including switcher-loaded
modules), and then re-loads them.


Index: LICENSE.OSCAR
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/LICENSE.OSCAR,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** LICENSE.OSCAR	27 Oct 2002 12:21:35 -0000	1.1
--- LICENSE.OSCAR	8 Mar 2004 16:45:46 -0000	1.2
***************
*** 1,6 ****
  Software License for modules-oscar
  
! Copyright (c) 2002 The Trustees of Indiana University.  
!                    All rights reserved.
  
  Indiana University has the exclusive rights to license this product
--- 1,6 ----
  Software License for modules-oscar
  
! Copyright (c) 2002-2004 The Trustees of Indiana University.  
!                         All rights reserved.
  
  Indiana University has the exclusive rights to license this product

Index: README.OSCAR
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/README.OSCAR,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** README.OSCAR	27 Oct 2002 12:23:56 -0000	1.2
--- README.OSCAR	8 Mar 2004 16:45:46 -0000	1.3
***************
*** 1,6 ****
  -*- text -*-
  
! Copyright (c) 2002 The Trustees of Indiana University.  
!                    All rights reserved.
  
  This file is part of the modules-oscar software package.  For
--- 1,6 ----
  -*- text -*-
  
! Copyright (c) 2002-2004 The Trustees of Indiana University.  
!                         All rights reserved.
  
  This file is part of the modules-oscar software package.  For

[env-switcher-cvs] CVS: env-switcher/src switcher.tcl.in,1.12,1.13

From: Jeff S. <jsq...@us...> - 2004-03-08 17:09:18

Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25425/src

Modified Files:
	switcher.tcl.in 
Log Message:
Partial fix for bug 905191: added docs for switcher-reload command


Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** switcher.tcl.in	7 Mar 2004 22:06:55 -0000	1.12
--- switcher.tcl.in	8 Mar 2004 16:44:52 -0000	1.13
***************
*** 72,75 ****
--- 72,81 ----
  module use @SWITCHER_PKGDATADIR@
  
+ # Setup a "reload" command that effectively ditches any current
+ # modules/switcher environment and sets up the current environment to
+ # be what the current switcher settings are.
+ 
+ alias switcher-reload "module unload oscar-modules; module load oscar-modules"
+ 
  # If we're not removing the module, call switcher to announce what
  # modules we're loading (per user/system settings, of course)

[env-switcher-cvs] CVS: env-switcher/man switcher.1,1.9,1.10

From: Jeff S. <jsq...@us...> - 2004-03-08 17:08:06

Update of /cvsroot/env-switcher/env-switcher/man
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25148

Modified Files:
	switcher.1 
Log Message:
Document the switcher-reload command.


Index: switcher.1
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/man/switcher.1,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** switcher.1	16 Jan 2004 15:37:29 -0000	1.9
--- switcher.1	8 Mar 2004 16:43:39 -0000	1.10
***************
*** 12,15 ****
--- 12,17 ----
  .PP
  switcher <tag> <command> [<args>]
+ .PP
+ switcher-reload
  .SH DESCRIPTION
  .I switcher
***************
*** 33,36 ****
--- 35,59 ----
  at a time.
  .PP
+ Note that 
+ .I switcher
+ usually only edits defaults for
+ .I future
+ shell invocations.  Specifically, it does
+ .I not
+ change the current environment.  Although this is for a variety of
+ good technical reasons, it can cause unexpected behavior if a user
+ runs a switcher command and then wonders why the environment has not
+ bee changed.  The
+ .I switcher-reload
+ command is provided for this purpose.  It will re-initialize the
+ environment according to whatever the current set of
+ switcher-specified settings are.  Hence, users now have two choices
+ after running
+ .IR switcher :
+ 1) run
+ .IR switcher-reload ,
+ or 2) load a new shell (e.g., logout and log back in again, launch a
+ new shell and/or window, etc.).
+ .PP
  .I switcher
  allows for a set of system-level defaults as well as user-level
***************
*** 386,399 ****
  is effectively disabled for all users who do not specifically use
  .IR switcher .
- .SH BUGS
- Due to limitations in switcher's command line parsing scheme, the
- ordering or arguments listed in this man page and in the help messages
- must be preserved.  For example, "--user" and "--system" must be the
- last arguments on the command line.
- .PP
- This is certainly fixable, but it would probably require an overhaul
- the parsing system, and probably ditching the Perl AppConfig module
- that is currently used for parsing (due to limitations of AppConfig).
- I just don't have the time to do that right now.  :-)
  .SH FILES
  The defaults are maintained in ini-style text files.  These files can
--- 409,412 ----

[env-switcher-cvs] CVS: env-switcher/src Makefile.am,1.3,1.4 switcher.in,1.18,1.19 switcher.tcl.in,1.11,1.12

From: Jeff S. <jsq...@us...> - 2004-03-07 22:30:47

Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16744/src

Modified Files:
	Makefile.am switcher.in switcher.tcl.in 
Log Message:
Seems to have totally fixed bug 877263.  New parsing scheme totally
in place.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	7 Mar 2004 21:18:09 -0000	1.3
--- Makefile.am	7 Mar 2004 22:06:54 -0000	1.4
***************
*** 22,27 ****
  	  mkdir -p $(DESTDIR)$(sysconfdir); \
  	fi
! 	if test ! -d $(DESTDIR)$(pkgdatadir); then \
! 	  mkdir -p $(DESTDIR)$(pkgdatadir); \
  	fi
  	cp switcher.tcl $(DESTDIR)$(MODULEFILESDIR)/switcher/$(VERSION)
--- 22,27 ----
  	  mkdir -p $(DESTDIR)$(sysconfdir); \
  	fi
! 	if test ! -d $(DESTDIR)$(SWITCHER_PKGDATADIR); then \
! 	  mkdir -p $(DESTDIR)$(SWITCHER_PKGDATADIR); \
  	fi
  	cp switcher.tcl $(DESTDIR)$(MODULEFILESDIR)/switcher/$(VERSION)

Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** switcher.in	7 Mar 2004 21:18:09 -0000	1.18
--- switcher.in	7 Mar 2004 22:06:55 -0000	1.19
***************
*** 22,26 ****
  my $prefix = "@prefix@";
  my $system_filename = "@sysconfdir@/switcher.ini";
! my $tag_dir = "@datadir@";
  my $user_filename = $ENV{'HOME'} . "/.switcher.ini";
  
--- 22,26 ----
  my $prefix = "@prefix@";
  my $system_filename = "@sysconfdir@/switcher.ini";
! my $tag_dir = "@SWITCHER_PKGDATADIR@";
  my $user_filename = $ENV{'HOME'} . "/.switcher.ini";
  
***************
*** 420,431 ****
  
  sub list_names {
!     my $dir = "$tag_dir/env-switcher/$clui_tag";
! 
!     # Backwards compatability -- look in $tag_dir/$clui_tag as well.
!     # Whoops.  :-(
! 
!     if (! -d $dir) {
!         $dir = "$tag_dir/$clui_tag";
!     }
  
      # Special case -- ignore the "global" tag
--- 420,424 ----
  
  sub list_names {
!     my $dir = "$tag_dir/$clui_tag";
  
      # Special case -- ignore the "global" tag
***************
*** 529,533 ****
      # If it does, print a warning.  If not, attempt to create it.
  
!     my $dir = "$tag_dir/env-switcher/$clui_tag";
      if (opendir DIR, $dir) {
  	print_warning("Warning: tag directory already exists:\n" .
--- 522,526 ----
      # If it does, print a warning.  If not, attempt to create it.
  
!     my $dir = "$tag_dir/$clui_tag";
      if (opendir DIR, $dir) {
  	print_warning("Warning: tag directory already exists:\n" .
***************
*** 566,578 ****
      # than implementing rm -rf.
  
!     my $dir = "$tag_dir/env-switcher/$clui_tag";
! 
!     # Backwards compatability; look in $tag_dir/$clui_tag if the
!     # env-switcher/$clui_tag dir does not exist.  Whoops... :-(
! 
!     if (! -d $dir) {
!         my $dir = "$tag_dir/$clui_tag";
!     }
! 
      if (! -w $dir || system("rm -rf $dir") != 0) {
  	print_error("Unable to remove tag directory:\n" .
--- 559,563 ----
      # than implementing rm -rf.
  
!     my $dir = "$tag_dir/$clui_tag";
      if (! -w $dir || system("rm -rf $dir") != 0) {
  	print_error("Unable to remove tag directory:\n" .
***************
*** 613,617 ****
  sub add_name {
      my ($name, $src_dir) = @_;
!     my $dir = "$tag_dir/env-switcher/$clui_tag";
      my $dest_file = "$dir/$name";
      my $src_file = "$src_dir/$name";
--- 598,602 ----
  sub add_name {
      my ($name, $src_dir) = @_;
!     my $dir = "$tag_dir/$clui_tag";
      my $dest_file = "$dir/$name";
      my $src_file = "$src_dir/$name";
***************
*** 699,712 ****
  sub rm_name {
      my ($name) = @_;
!     my $dir = "$tag_dir/env-switcher/$clui_tag";
      my $file = "$dir/$name";
  
-     # Backwards compatability: use $tag_dir/$clui_tag if
-     # $tag_dir/env-switcher/$clui_tag does not exist.  Whoops...
- 
-     if (! -d $dir) {
-         $dir = "$tag_dir/$clui_tag";
-     }
- 
      # Does the name exist?
  
--- 684,690 ----
  sub rm_name {
      my ($name) = @_;
!     my $dir = "$tag_dir/$clui_tag";
      my $file = "$dir/$name";
  
      # Does the name exist?
  
***************
*** 998,1002 ****
  
  	if ($want_default == 1 && $default_value && $default_value ne "none") {
! 	    if (-f "$tag_dir/env-switcher/$clui_tag/$default_value") {
  		print "$clui_tag/$default_value\n";
  	    }
--- 976,980 ----
  
  	if ($want_default == 1 && $default_value && $default_value ne "none") {
! 	    if (-f "$tag_dir/$clui_tag/$default_value") {
  		print "$clui_tag/$default_value\n";
  	    }
***************
*** 1006,1016 ****
  
  	if ($want_announce && $default_value && $default_value ne "none") {
! 	    if ($announce_load &&
!                 (-f "$tag_dir/env-switcher/$clui_tag/$default_value" ||
!                  -f "$tag_dir/$clui_tag/$default_value")) {
! 		print "echo switcher:$clui_tag: Loading $default_value;\n";
  	    } elsif ($announce_warn && 
!                      (! -f "$tag_dir/env-switcher/$clui_tag/$default_value" ||
!                       ! -f "$tag_dir/$clui_tag/$default_value")) {
  		print "echo switcher:$clui_tag: Cannot find modulefile for $default_value -- skipping;\n";
  	    }
--- 984,991 ----
  
  	if ($want_announce && $default_value && $default_value ne "none") {
! 	    if ($announce_load &&-f "$tag_dir/$clui_tag/$default_value") {
!                 print "echo switcher:$clui_tag: Loading $default_value;\n";
  	    } elsif ($announce_warn && 
!                      ! -f "$tag_dir/$clui_tag/$default_value") {
  		print "echo switcher:$clui_tag: Cannot find modulefile for $default_value -- skipping;\n";
  	    }
***************
*** 1218,1222 ****
  # switcher [--help|--more-help]
  # switcher --list
! # switcher --announce
  # switcher --show-exec (hidden command)
  #
--- 1193,1197 ----
  # switcher [--help|--more-help]
  # switcher --list
! # switcher --announce (hidden command)
  # switcher --show-exec (hidden command)
  #
***************
*** 1335,1339 ****
  
      if ($a eq "--list" || $a eq "--add-tag" || $a eq "--rm-tag" ||
!         $a eq "--show" || $a eq "--show-exec") {
          push(@processed_argv, $a);
          ++$i;
--- 1310,1314 ----
  
      if ($a eq "--list" || $a eq "--add-tag" || $a eq "--rm-tag" ||
!         $a eq "--show" || $a eq "--show-exec" || $a eq "--announce") {
          push(@processed_argv, $a);
          ++$i;
***************
*** 1487,1490 ****
--- 1462,1466 ----
      elsif ($a eq "--list") {
          $ret = list_names();
+         ++$i;
      }
  

Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** switcher.tcl.in	15 Jan 2004 17:04:13 -0000	1.11
--- switcher.tcl.in	7 Mar 2004 22:06:55 -0000	1.12
***************
*** 14,18 ****
    puts stderr "\tThis module sets up the OSCAR switcher subsystem."
    puts stderr "\tIt adds the following path to the modules \"use\" path:"
!   puts stderr "\t\t@SWITCHER_DATADIR@"
    puts stderr "\tIt also adds the following path to the path:"
    puts stderr "\t\t@SWITCHER_BINDIR@"
--- 14,18 ----
    puts stderr "\tThis module sets up the OSCAR switcher subsystem."
    puts stderr "\tIt adds the following path to the modules \"use\" path:"
!   puts stderr "\t\t@SWITCHER_PKGDATADIR@"
    puts stderr "\tIt also adds the following path to the path:"
    puts stderr "\t\t@SWITCHER_BINDIR@"
***************
*** 70,74 ****
  # the <name> modulefiles will be
  
! module use @SWITCHER_DATADIR@
  
  # If we're not removing the module, call switcher to announce what
--- 70,74 ----
  # the <name> modulefiles will be
  
! module use @SWITCHER_PKGDATADIR@
  
  # If we're not removing the module, call switcher to announce what

[env-switcher-cvs] CVS: env-switcher/dist env-switcher.spec.in,1.14,1.15

From: Jeff S. <jsq...@us...> - 2004-03-07 22:30:46

Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16744/dist

Modified Files:
	env-switcher.spec.in 
Log Message:
Seems to have totally fixed bug 877263.  New parsing scheme totally
in place.


Index: env-switcher.spec.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/env-switcher.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** env-switcher.spec.in	16 Jan 2004 16:13:16 -0000	1.14
--- env-switcher.spec.in	7 Mar 2004 22:06:54 -0000	1.15
***************
*** 54,58 ****
  Packager: Jeff Squyres <jsq...@la...>
  BuildRoot: %{_tmppath}/%{name}-%{version}-root
! Requires: modules-oscar tcl perl-AppConfig
  Provides: switcher
  AutoReqProv: no
--- 54,58 ----
  Packager: Jeff Squyres <jsq...@la...>
  BuildRoot: %{_tmppath}/%{name}-%{version}-root
! Requires: modules-oscar tcl
  Provides: switcher
  AutoReqProv: no

[env-switcher-cvs] CVS: env-switcher configure.in,1.5,1.6

From: Jeff S. <jsq...@us...> - 2004-03-07 22:30:46

Update of /cvsroot/env-switcher/env-switcher
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16744

Modified Files:
	configure.in 
Log Message:
Seems to have totally fixed bug 877263.  New parsing scheme totally
in place.


Index: configure.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure.in	16 Jan 2004 15:08:25 -0000	1.5
--- configure.in	7 Mar 2004 22:06:54 -0000	1.6
***************
*** 83,88 ****
  SWITCHER_SYSCONFDIR="`eval echo $sysconfdir`"
  AC_SUBST(SWITCHER_SYSCONFDIR)
! SWITCHER_DATADIR="`eval echo $datadir`"
! AC_SUBST(SWITCHER_DATADIR)
  SWITCHER_MANDIR="`eval echo $mandir`"
  AC_SUBST(SWITCHER_MANDIR)
--- 83,88 ----
  SWITCHER_SYSCONFDIR="`eval echo $sysconfdir`"
  AC_SUBST(SWITCHER_SYSCONFDIR)
! SWITCHER_PKGDATADIR="`eval echo $datadir/env-switcher`"
! AC_SUBST(SWITCHER_PKGDATADIR)
  SWITCHER_MANDIR="`eval echo $mandir`"
  AC_SUBST(SWITCHER_MANDIR)

[env-switcher-cvs] CVS: env-switcher/src Makefile.am,1.2,1.3 switcher.in,1.17,1.18

From: Jeff S. <jsq...@us...> - 2004-03-07 21:41:58

Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6366/src

Modified Files:
	Makefile.am switcher.in 
Log Message:
- Remove deubgging gorp
- Ensure $pkgdatadir exists


Index: Makefile.am
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	11 Oct 2002 17:00:45 -0000	1.2
--- Makefile.am	7 Mar 2004 21:18:09 -0000	1.3
***************
*** 1,6 ****
  # -*- makefile -*-
  #
! # Copyright (c) 2002 The Trustees of Indiana University.  
! #                    All rights reserved.
  #
  # This file is part of the Env-switcher software package.  For license
--- 1,6 ----
  # -*- makefile -*-
  #
! # Copyright (c) 2002-2004 The Trustees of Indiana University.  
! #                         All rights reserved.
  #
  # This file is part of the Env-switcher software package.  For license
***************
*** 22,27 ****
  	  mkdir -p $(DESTDIR)$(sysconfdir); \
  	fi
! 	if test ! -d $(DESTDIR)$(datadir); then \
! 	  mkdir -p $(DESTDIR)$(datadir); \
  	fi
  	cp switcher.tcl $(DESTDIR)$(MODULEFILESDIR)/switcher/$(VERSION)
--- 22,27 ----
  	  mkdir -p $(DESTDIR)$(sysconfdir); \
  	fi
! 	if test ! -d $(DESTDIR)$(pkgdatadir); then \
! 	  mkdir -p $(DESTDIR)$(pkgdatadir); \
  	fi
  	cp switcher.tcl $(DESTDIR)$(MODULEFILESDIR)/switcher/$(VERSION)

Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** switcher.in	7 Mar 2004 21:03:51 -0000	1.17
--- switcher.in	7 Mar 2004 21:18:09 -0000	1.18
***************
*** 1106,1111 ****
      # Iterate over the contents, writing out the file
  
-         print "WRITING FILE: $filename\n";
-     print Dumper($contents);
      foreach my $section (sort(keys(%{$contents}))) {
          print FILE "[$section]\n";
--- 1106,1109 ----

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.16,1.17

From: Jeff S. <jsq...@us...> - 2004-03-07 21:27:38

Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3304

Modified Files:
	switcher.in 
Log Message:
Massive changes for bug 877263: ditch AppConfig, stop using real
hashes (use anonymous hashes instead).  Although it was a huge
re-write, it did make the code a bit simpler (no more monkeying around
with forced 2-level hierarchies -- can now have true three-level
hierarchies)


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** switcher.in	16 Jan 2004 15:37:58 -0000	1.16
--- switcher.in	7 Mar 2004 21:03:51 -0000	1.17
***************
*** 13,17 ****
  #
  
! use AppConfig;
  use strict;
  
--- 13,17 ----
  #
  
! use Data::Dumper;
  use strict;
[...2137 lines suppressed...]
  
! # Write out new files if necessary
  
! if ($ret == 0) {
!     if ($system_tags_modified) {
!         write_ini_file($system_filename, $system_tags);
!     }
!     if ($user_tags_modified) {
!         write_ini_file($user_filename, $user_tags);
      }
  }
***************
*** 1510,1512 ****
  # Done
  
! exit($return_value);
--- 1596,1598 ----
  # Done
  
! exit $ret;

[env-switcher-cvs] CVS: env-switcher/dist VERSION,1.11,1.12

From: Jeff S. <jsq...@us...> - 2004-03-07 19:32:01

Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11433/dist

Modified Files:
	VERSION 
Log Message:
Bump us up to 1.0.12


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/VERSION,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** VERSION	19 Jul 2003 18:23:16 -0000	1.11
--- VERSION	7 Mar 2004 19:08:17 -0000	1.12
***************
*** 1,5 ****
  major=1
  minor=0
! release=11
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=12
  alpha=0
  beta=0

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

2002	Jan	Feb	Mar	Apr (5)	May (37)	Jun (2)	Jul (7)	Aug (12)	Sep (6)	Oct (32)	Nov	Dec
2003	Jan	Feb (1)	Mar	Apr	May	Jun	Jul (8)	Aug	Sep	Oct	Nov	Dec
2004	Jan (11)	Feb	Mar (15)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2005	Jan	Feb (6)	Mar (2)	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec