Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docsys Makefile to support wwwdoc #559

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Update docsys Makefile to support wwwdoc #559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions isis/src/docsys/Makefile
View file
Open in desktop
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