Skip to content

Commit

Permalink
Update docsys Makefile to support wwwdoc (#559)
Browse files Browse the repository at this point in the history
The documentation is installed under `docs`, not `doc`, so this file has been updated.
`setisis isis3.6.0` and running `make wwwdoc` in `$ISISROOT/../isis/src/docsys` will properly sync the documentation to our web server.
  • Loading branch information
Ian Humphrey authored and jessemapel committed Nov 14, 2018
1 parent 03f6c6d commit c33e04c
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions isis/src/docsys/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(ISISROOT)/make/isismake.os

#APPLICATIONS = $(filter-out Makefile CVS $(wildcard *.*) , data/$(wildcard *))
#DOCUMENTS = $(filter-out Makefile $(wildcard *.*) , documents/$(wildcard *))
DOCDIR = $(ISISROOT)/doc
DOCDIR = $(ISISROOT)/docs
USER = isis3mgr
USERDEV = isis3mgr

Expand Down Expand Up @@ -147,22 +147,22 @@ wwwdoc: wwwschema
echo " "
echo "_______________________________________________________________________________"
echo "BEGIN SYNC: docs to public server"
rsync -vlHrt --delete --progress --rsh=ssh --exclude 'Schemas/*' --cvs-exclude $(ISISROOT)/doc/ $(USER)@isis-d:/var/www/html/htdocs/
rsync -vlHrt --delete --progress --rsh=ssh --exclude 'Schemas/*' --cvs-exclude $(ISISROOT)/docs/ $(USER)@isis-d:/var/www/html/htdocs/

devdoc:
echo " "
echo "_______________________________________________________________________________"
echo "BEGIN SYNC: docs to development server"
rsync -vlHrt --delete --progress --rsh=ssh --cvs-exclude $(ISISROOT)/doc/ $(USERDEV)@astrodev:/var/www/html/htdocs/
rsync -vlHrt --delete --progress --rsh=ssh --cvs-exclude $(ISISROOT)/docs/ $(USERDEV)@astrodev:/var/www/html/htdocs/

# copy Schemas to public www

wwwschema: schemas
echo " "
echo "_______________________________________________________________________________"
echo "SYNC: schemas to public server"
rsync -vlHrt --progress --rsh=ssh --cvs-exclude $(ISISROOT)/doc/Schemas/ $(USER)@isis-d:/var/www/html/htdocs/Schemas/
rsync -vlHprt --delete --progress --rsh=ssh --cvs-exclude $(ISISROOT)/doc/assets $(USER)@isis-d:/var/www/html/htdocs/
rsync -vlHrt --progress --rsh=ssh --cvs-exclude $(ISISROOT)/docs/Schemas/ $(USER)@isis-d:/var/www/html/htdocs/Schemas/
rsync -vlHprt --delete --progress --rsh=ssh --cvs-exclude $(ISISROOT)/docs/assets $(USER)@isis-d:/var/www/html/htdocs/



Expand All @@ -182,4 +182,3 @@ syncdev:
echo "~ SYNC DEV ~"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
$(MAKE) devdoc

0 comments on commit c33e04c

Please sign in to comment.