Skip to content

Commit

Permalink
Merge pull request #11109 from ben-albrecht/trailing-slashes-are-dang…
Browse files Browse the repository at this point in the history
…erous

Remove trailing slashes for consistent BSD/GNU cp

GNU cp does not recognize trailing slashes, so this PR removes them to avoid inconsistent behavior across platforms.

Prior to this PR, we were getting an inconsistency in the docs path:

```
# BSD (good)
chapel/doc/html/builtins/*.chpl

# GNU (bad)
chapel/doc/html/builtins/internal/*.chpl
```

This resulted in an inconsistency between our docs built nightly (built on linux) vs. release docs (built on OS X).


[Reviewed by @ronawho]
  • Loading branch information
ben-albrecht authored Sep 12, 2018
2 parents 0dc070c + a1d32a7 commit 3abe896
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions modules/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ documentation: $(SYS_CTYPES_MODULE_DOC)
@echo "Copying generated module documentation to ${DOC}"
mkdir -p ${DOC}/modules
mkdir -p ${DOC}/builtins
cp -rf ${MODULE_SPHINX}/source/modules/standard ${DOC}/modules/
cp -rf ${MODULE_SPHINX}/source/modules/packages ${DOC}/modules/
cp -rf ${MODULE_SPHINX}/source/modules/dists ${DOC}/modules/
cp -rf ${MODULE_SPHINX}/source/modules/layouts ${DOC}/modules/
cp -rf ${MODULE_SPHINX}/source/modules/internal/ ${DOC}/builtins/
cp -rf ${MODULE_SPHINX}/source/modules/standard ${DOC}/modules
cp -rf ${MODULE_SPHINX}/source/modules/packages ${DOC}/modules
cp -rf ${MODULE_SPHINX}/source/modules/dists ${DOC}/modules
cp -rf ${MODULE_SPHINX}/source/modules/layouts ${DOC}/modules
cp -rf ${MODULE_SPHINX}/source/modules/internal/* ${DOC}/builtins
@echo "Removing generated files and directories"
rm -rf ./docs
rm -rf ${MODULE_SPHINX}
Expand Down

0 comments on commit 3abe896

Please sign in to comment.