Skip to content

Commit

Permalink
version 1.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathanael Perraudin committed Sep 15, 2015
1 parent 0dc463f commit b34f9d1
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mat2doc/mat/conf.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fext='.m'
urlbase='http://unlocbox.sourceforge.net/doc'
urlbase='https://lts2.epfl.ch/unlocbox/doc'
urlext='.php'
4 changes: 2 additions & 2 deletions mat2doc/php/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fext='.php'
urlbase='/doc'
urlbase='https://lts2.epfl.ch/unlocbox/doc'
urlext='.php'
widthstr='600px'
imagetype='png'
includedir='../include'
includedir='https://lts2.epfl.ch/unlocbox/include'
21 changes: 15 additions & 6 deletions mat2doc/publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
project=homefolder+'/'+projectname+'/'

# Configure HTML placement at remote server
host='nperraud,'+projectname+'@web.sourceforge.net'
www='/home/project-web/unlocbox/htdocs/'
# host='nperraud,'+projectname+'@web.sourceforge.net'
# www='/home/project-web/unlocbox/htdocs/'
# outputdirweb= '~/work/git/website/unlocbox/'

host='root@lts2srv1.epfl.ch'
www='/var/www/html/unlocbox/ls'
outputdirweb= '~/work/git/website/unlocbox/'

# -------- Configuration of mat2doc ------------
Expand Down Expand Up @@ -139,7 +143,10 @@


if 'sendphp' in todo:
s='rsync -av '+outputdirphp+' '+host+':'+www+'doc/'

s="rsync -e 'ssh -p 10422' -av "+outputdirphp+' '+host+':'+www+'doc/'
# s='rsync -av '+outputdirphp+' '+host+':'+www+'doc/'
print s
os.system(s)


Expand Down Expand Up @@ -234,13 +241,15 @@


if 'notesend' in todo:
os.system('rsync -av '+notehtml+' '+host+':'+noteswww);
# os.system('rsync -av '+notehtml+' '+host+':'+noteswww);
os.system("rsync -e 'ssh -p 10422' -av "+notehtml+' '+host+':'+noteswww);

if 'sendweb' in todo:
s="rsync --verbose --archive --exclude '.git' "+outputdirweb+' '+host+':'+www
# s="rsync --verbose --archive --exclude '.git' "+outputdirweb+' '+host+':'+www
s="rsync -e 'ssh -p 10422' --verbose --archive --exclude '.git' "+outputdirweb+' '+host+':'+www
os.system(s)





Expand Down
2 changes: 1 addition & 1 deletion mat2doc/tex/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fext='.tex'
urlbase='http://unlocbox.sourceforge.net/doc'
urlbase='https://lts2.epfl.ch/unlocbox/doc'
urlext='php'
widthstr='50ex'
imagetype='eps'
Expand Down
2 changes: 1 addition & 1 deletion unlocbox_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.2
1.6.3

0 comments on commit b34f9d1

Please sign in to comment.