Skip to content

Commit

Permalink
Feature 1920 repo (#2161)
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnHalleyGotway committed May 16, 2022
1 parent 7fe963d commit 83bcd89
Show file tree
Hide file tree
Showing 2,678 changed files with 117,569 additions and 799,076 deletions.
2 changes: 1 addition & 1 deletion .github/jobs/build_docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source ${GITHUB_WORKSPACE}/.github/jobs/bash_functions.sh

DOCKERHUB_TAG=${DOCKERHUB_REPO}:${SOURCE_BRANCH}

DOCKERFILE_PATH=${GITHUB_WORKSPACE}/scripts/docker/Dockerfile.copy
DOCKERFILE_PATH=${GITHUB_WORKSPACE}/internal/scripts/docker/Dockerfile.copy

CMD_LOGFILE=${GITHUB_WORKSPACE}/docker_build.log

Expand Down
4 changes: 2 additions & 2 deletions .github/jobs/test_env_vars.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export MET_BASE=/usr/local/share/met

export MET_BUILD_BASE=${MET_REPO_DIR}/met
export MET_TEST_BASE=${MET_REPO_DIR}/test
export MET_BUILD_BASE=${MET_REPO_DIR}
export MET_TEST_BASE=${MET_REPO_DIR}/internal/test_unit
export PERL5LIB=${MET_TEST_BASE}/lib

export MET_TEST_INPUT=/data/input/MET_test_data/unit_test
Expand Down
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
# Sphinx documentation
met/docs/_build/
docs/_build/

# tilda files generated by emacs
*~

# log file created in Docker image
# temp files surrounded by #
*#*#

autom4te.cache
config.h
config.log
config.status
stamp-h1
bin
share
Makefile
make.log
make_install.log
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ formats: [pdf]
python:
version: 3.7
install:
- requirements: met/docs/requirements.txt
- requirements: docs/requirements.txt

# Configuration for Sphinx documentation (this is the default documentation
# type)
sphinx:
builder: html
configuration: met/docs/conf.py
configuration: docs/conf.py
File renamed without changes.
File renamed without changes.
7 changes: 2 additions & 5 deletions met/Makefile.am → Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = data src scripts/Rscripts scripts/python

if ENABLE_DEVELOPMENT
SUBDIRS += internal_tests
SUBDIRS += internal/test_util
endif

MAINTAINERCLEANFILES = \
Expand All @@ -31,16 +31,13 @@ MAINTAINERCLEANFILES = \
config.h.in

# Cleanup for the distribution
# - Remove any SVN files
# - Remove lex/yacc source files
# - Run the check for copyright utility

dist-hook:
-rm -rf `find ${distdir} -name .svn`
-rm -rf `find ${distdir} -name "*.ll"`
-rm -rf `find ${distdir} -name "*.yy"`
${top_srcdir}/src/tools/dev_utils/chk4copyright -dir ${distdir} -notice ${top_srcdir}/data/copyright_notice.txt
-rm -rf ${distdir}/internal_tests
-rm -rf ${distdir}/internal
-rm -rf ${distdir}/src/tools/dev_utils
-rm -rf ${distdir}/ylwrap

Expand Down

0 comments on commit 83bcd89

Please sign in to comment.