Merge pull request #38 from lsst/tickets/DM-9526-cleanup

misc. cleanups

README.md

@@ -11,13 +11,6 @@ This package sets up a basic environment needed to:
 
 For building products, this package provides the following:
 
-  *  it sets two useful environment variables that saves typing when
-     checking out packages from the SVN repository:
-
-     + LSST_GIT     The Git repository's base URL, git@git.lsstcorp.org
-     + LSST_DMS     The base Git URL to the directory containing
-                       LSST products
-
   *  it setups up the base package, which is necessary for properly
      loading LSST python modules.
 
@@ -33,14 +26,6 @@ For managing products, this package provides the following:
         software stack.  This is the directory where the loadLSST scripts are
         found.
 
-     *  sets the LSST_PKGROOT and (if not already set) the EUPS_PKGROOT
-        environment variables.  The latter is used by "eups distrib" for
-        retrieving and installing new product packages.  If EUPS_PKGROOT is not
-        already set, it is set to the value of $LSST_PKGROOT
-
-     *  sets the LSST_PKGS environment variable to the platform-specific
-        subdirectory of $LSST_HOME where LSST packages are installed.
-
      *  if $LSST_DEVEL is set, it is added the the start of the
         EUPS_PATH environment variable.  $EUPS_PATH has a list of of
         colon-delimited directories that EUPS uses to look for software

SConstruct

@@ -25,6 +25,5 @@ the software distribution server.  This package relies on the eups capabilities.
 scripts.BasicSConstruct.finish(subDirList="bin doc ups".split(),
                                defaultTargets=["bin", "doc", "tests"])
 
-# this is not doing what I want it to do (removing bin and etc)
+# this is not doing what I want it to do (removing bin)
 env.Clean("bin", "bin")
-env.Clean("etc", "etc")

scripts/newinstall.sh

@@ -363,7 +363,6 @@ function generate_loader_bash() {
 
 		# Setup optional packages
 		$CMD_SETUP_MINICONDA
-		$CMD_SETUP_GIT
 
 		# Setup LSST minimal environment
 		setup lsst
@@ -392,7 +391,6 @@ function generate_loader_csh() {
 
 		   # Setup optional packages
 		   $CMD_SETUP_MINICONDA
-		   $CMD_SETUP_GIT
 
 		   # Setup LSST minimal environment
 		   setup lsst
@@ -418,7 +416,6 @@ function generate_loader_ksh() {
 
 		# Setup optional packages
 		$CMD_SETUP_MINICONDA
-		$CMD_SETUP_GIT
 
 		# Setup LSST minimal environment
 		setup lsst
@@ -443,7 +440,6 @@ function generate_loader_zsh() {
 
 		# Setup optional packages
 		$CMD_SETUP_MINICONDA
-		$CMD_SETUP_GIT
 
 		# Setup LSST minimal environment
 		setup lsst

ups/lsst.table

@@ -1,16 +1,10 @@
+setupRequired(scons)
 setupRequired(sconsUtils)
 
-envSet(GITROOT, "git@git.lsstcorp.org")
-envSet(LSST_GIT, "git@git.lsstcorp.org")
-envSet(LSST_DMS, "git@git.lsstcorp.org:LSST/DMS")
 envPrepend(PATH, ${PRODUCT_DIR}/bin)
 envPrepend(EUPS_PKGROOT, http://sw.lsstcorp.org/eupspkg, |)
 
 # Deprecated: here for backwards compatibility, but discouraged from using
 # in future code. Will be removed at a later date.
 envSet(LSST_HOME, ${EUPS_PATH[0]})
 envPrepend(EUPS_PATH, $?{LSST_DEVEL})
-
-if( not ${LSST_PKGS:-False} ) {
-    envSet(LSST_PKGS, ${LSST_HOME}/${PRODUCT_FLAVOR})
-}