diff --git a/mat2doc/mat/conf.py b/mat2doc/mat/conf.py index d314090..9de5cf7 100644 --- a/mat2doc/mat/conf.py +++ b/mat2doc/mat/conf.py @@ -1,3 +1,3 @@ fext='.m' -urlbase='http://unlocbox.sourceforge.net/doc' +urlbase='https://lts2.epfl.ch/unlocbox/doc' urlext='.php' diff --git a/mat2doc/php/conf.py b/mat2doc/php/conf.py index 52a5f53..001eb02 100644 --- a/mat2doc/php/conf.py +++ b/mat2doc/php/conf.py @@ -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' diff --git a/mat2doc/publish.py b/mat2doc/publish.py index 65baff8..0cd1212 100755 --- a/mat2doc/publish.py +++ b/mat2doc/publish.py @@ -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 ------------ @@ -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) @@ -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) - + diff --git a/mat2doc/tex/conf.py b/mat2doc/tex/conf.py index 9084e74..f824334 100644 --- a/mat2doc/tex/conf.py +++ b/mat2doc/tex/conf.py @@ -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' diff --git a/unlocbox_version b/unlocbox_version index fdd3be6..266146b 100644 --- a/unlocbox_version +++ b/unlocbox_version @@ -1 +1 @@ -1.6.2 +1.6.3