Skip to content

Commit

Permalink
Update a few overlooked references to the sources directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Ed Slavich committed Mar 24, 2021
1 parent bb5456c commit 7a68bf7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
6 changes: 3 additions & 3 deletions TESTING
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ do:
The above configures CRDS to run the built-in unit tests using several file
sources:

- $CRDS_TEST_ROOT/crds-cache-test
- $CRDS_TEST_ROOT/crds-cache-test
Dirty test cache with corrupted/hacked files, used by tests only.
Has the dangerous property of like-named files (same as official names) with different contents.

- $CRDS_TEST_ROOT/crds-cache-default-test
- $CRDS_TEST_ROOT/crds-cache-default-test
Used when CRDS_PATH not set, replaces /grp/crds/cache with minimal reference files for testing
/grp/crds/cache is a complete HST + JWST readonly cache on the Central Store, too large to distribute

Expand All @@ -50,7 +50,7 @@ Notes on crds-cache-default-test bootstrap file CRDS server setup:
$ tar jcf crds-cache-default-test.tar.bz2 crds-cache-default-test

The resulting bzip2 file is copied to the HST OPS VM at the
$CRDS/CRDS_server/sources/static directory where the source code of all the other
$CRDS/CRDS_server/crds_server/static directory where the source code of all the other
server static files resides. This will cause it to be re-installed in the Apache
static directory whenever the server is re-installed. Merely placing the bzip2
file in the Apache static directory will result in a file life expectancy of 1 day,
Expand Down
5 changes: 2 additions & 3 deletions clean
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ if ( "$*" == "" ) then
set dirs=". crds"
else
set dirs="$*"
endif
endif

if (-e ../CRDS_server) then
set dirs="$dirs ../CRDS_server/sources"
set dirs="$dirs ../CRDS_server/crds_server"
endif

foreach pat ('*.orig' '*.pyc' 'build' '__pycache__' '*~' '.*~' '#*#' '#.*#')
Expand All @@ -23,4 +23,3 @@ rm -rf dist MANIFEST
rm -rf build
rm -rf install.log
git checkout -- crds/core/git_version.py

6 changes: 3 additions & 3 deletions documentation/crds_users_guide/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Principle make targets:
#
# make html # for development, look at build/html/index.html
# make serverhtml # to install HTML in parallel CRDS_server repo checkout in sources/static
# make serverhtml # to install HTML in parallel CRDS_server repo checkout in crds_server/static
# make latexpdf # generate a PDF of the docs
#

Expand Down Expand Up @@ -176,7 +176,7 @@ tarhtml: html
rm -rf users_guide

serverhtml: tarhtml
mv users_guide.tar.gz ../../../CRDS_server/sources/static
cd ../../../CRDS_server/sources/static; \
mv users_guide.tar.gz ../../../CRDS_server/crds_server/static
cd ../../../CRDS_server/crds_server/static; \
tar zxf users_guide.tar.gz; \
rm users_guide.tar.gz

0 comments on commit 7a68bf7

Please sign in to comment.