From 4a5b00e75fab801a0fb6207ddab685032387a240 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Sun, 3 May 2015 10:43:17 +0200
Subject: [PATCH] Cleaned up png location
Now all png needed for the manual are copied to html dir
[makedoc]
---
.travis.pushdoc | 4 ++--
developer-doc/Makefile | 2 +-
developer-doc/PlumedDeveloperHeader.html | 6 +++---
developer-doc/PlumedFooter.html | 2 +-
developer-doc/{Octocat.png => octocat.png} | Bin
src/lib/Makefile | 2 +-
user-doc/Makefile | 2 +-
user-doc/PlumedFooter.html | 2 +-
user-doc/PlumedUserHeader.html | 6 +++---
user-doc/{Octocat.png => octocat.png} | Bin
10 files changed, 13 insertions(+), 13 deletions(-)
rename developer-doc/{Octocat.png => octocat.png} (100%)
rename user-doc/{Octocat.png => octocat.png} (100%)
diff --git a/.travis.pushdoc b/.travis.pushdoc
index de0fab95f..5259e2e38 100755
--- a/.travis.pushdoc
+++ b/.travis.pushdoc
@@ -11,10 +11,10 @@ cd tmp/$$
# grab doc
mkdir user-doc
-cp -R $root/user-doc/{*.png,html,manual.pdf} user-doc/
+cp -R $root/user-doc/{html,manual.pdf} user-doc/
test -d $root/user-doc/regtests && cp -R $root/user-doc/regtests user-doc/ || true
mkdir developer-doc
-cp -R $root/developer-doc/{*.png,html} developer-doc/
+cp -R $root/developer-doc/html developer-doc/
# This file should be here, it is needed otherwise
# files beginning with _ are skipped
diff --git a/developer-doc/Makefile b/developer-doc/Makefile
index 5a3d7730a..f62e49feb 100644
--- a/developer-doc/Makefile
+++ b/developer-doc/Makefile
@@ -4,7 +4,7 @@
all:
./extract
./go-doxygen
- cp Octocat.png html/
+ cp *png html/
clean:
rm -fr automatic html latex *~ links-to-user-manual.txt
diff --git a/developer-doc/PlumedDeveloperHeader.html b/developer-doc/PlumedDeveloperHeader.html
index e2289dd06..de3406df4 100644
--- a/developer-doc/PlumedDeveloperHeader.html
+++ b/developer-doc/PlumedDeveloperHeader.html
@@ -23,9 +23,9 @@ $mathjax
<table align="center" frame="void" width="98%" cellpadding="2%">
<tbody>
<tr style="height: 30px;">
-<td valign="center"> <img src="../pigeon.png" width="120"/></td>
-<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="../logo.png" width="400" /> </td>
-<td style="padding-left: 0.2em;" align="right"> <a href="../../user-doc/html/index.html"> <img src="../developer-logo.png" width="180" /> </a> </td>
+<td valign="center"> <img src="pigeon.png" width="120"/></td>
+<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="logo.png" width="400" /> </td>
+<td style="padding-left: 0.2em;" align="right"> <a href="../../user-doc/html/index.html"> <img src="developer-logo.png" width="180" /> </a> </td>
</tr>
</tbody>
</table>
diff --git a/developer-doc/PlumedFooter.html b/developer-doc/PlumedFooter.html
index 8acdb8ba6..edca4cfa5 100644
--- a/developer-doc/PlumedFooter.html
+++ b/developer-doc/PlumedFooter.html
@@ -15,7 +15,7 @@
<table align="center" frame="void" width="98%" cellpadding="2%">
<tr><td align="left" valign="center">
Hosted by GitHub
-<a href="http://github.com"><img src="Octocat.png" width="88" height="66" alt="GitHub Logo" /></a>
+<a href="http://github.com"><img src="octocat.png" width="88" height="66" alt="GitHub Logo" /></a>
<!--$generatedby   --> <a href="http://www.doxygen.org/index.html">
</td><td width=90% align="right">
<img class="footer" src="doxygen.png" alt="doxygen" align="right"/>
diff --git a/developer-doc/Octocat.png b/developer-doc/octocat.png
similarity index 100%
rename from developer-doc/Octocat.png
rename to developer-doc/octocat.png
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 97536a9be..8cef82513 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -92,7 +92,7 @@ install-do:
# rebuild libraries and main using new target dir
$(MAKE) PLUMED_LIBDIR=$(PLUMED_INSTALL_ROOT)/src/lib/ PLUMED_INSTALL=Install all
# copy .h, .cpp .o compile_options.sh and documentation:
- cd ../../ ; tar cf - patches scripts src/*/*.h src/*/*.cpp src/*/*.o src/config/compile_options.sh *-doc/*.png *-doc/html *-doc/regtests *-doc/manual.pdf | tar xf - -C $(PLUMED_INSTALL_ROOT)/
+ cd ../../ ; tar cf - patches scripts src/*/*.h src/*/*.cpp src/*/*.o src/config/compile_options.sh *-doc/html *-doc/regtests *-doc/manual.pdf | tar xf - -C $(PLUMED_INSTALL_ROOT)/
# also copy .h files into include/ dir
cd ../../src ; tar cf - */*.h */*/*.h | tar xf - -C $(PLUMED_INSTALL_PREFIX)/include/plumed$(PLUMED_INSTALL_LIBSUFFIX)/
# copy inc files changing the path
diff --git a/user-doc/Makefile b/user-doc/Makefile
index b340104a0..934a42675 100644
--- a/user-doc/Makefile
+++ b/user-doc/Makefile
@@ -15,7 +15,7 @@ else
all:
./extract
./go-doxygen
- cp Octocat.png html/
+ cp *png html/
./report_errors
endif
diff --git a/user-doc/PlumedFooter.html b/user-doc/PlumedFooter.html
index 8acdb8ba6..edca4cfa5 100644
--- a/user-doc/PlumedFooter.html
+++ b/user-doc/PlumedFooter.html
@@ -15,7 +15,7 @@
<table align="center" frame="void" width="98%" cellpadding="2%">
<tr><td align="left" valign="center">
Hosted by GitHub
-<a href="http://github.com"><img src="Octocat.png" width="88" height="66" alt="GitHub Logo" /></a>
+<a href="http://github.com"><img src="octocat.png" width="88" height="66" alt="GitHub Logo" /></a>
<!--$generatedby   --> <a href="http://www.doxygen.org/index.html">
</td><td width=90% align="right">
<img class="footer" src="doxygen.png" alt="doxygen" align="right"/>
diff --git a/user-doc/PlumedUserHeader.html b/user-doc/PlumedUserHeader.html
index f3df1fdb9..654dd87fd 100644
--- a/user-doc/PlumedUserHeader.html
+++ b/user-doc/PlumedUserHeader.html
@@ -23,9 +23,9 @@ $mathjax
<table align="center" frame="void" width="98%" cellpadding="2%">
<tbody>
<tr style="height: 30px;">
-<td valign="center"> <img src="../pigeon.png" width="120"/></td>
-<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="../logo.png" width="400" /> </td>
-<td style="padding-left: 0.2em;" align="right"> <a href="../../developer-doc/html/index.html"> <img src="../user-logo.png" width="180" /> </a> </td>
+<td valign="center"> <img src="pigeon.png" width="120"/></td>
+<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="logo.png" width="400" /> </td>
+<td style="padding-left: 0.2em;" align="right"> <a href="../../developer-doc/html/index.html"> <img src="user-logo.png" width="180" /> </a> </td>
</tr>
</tbody>
</table>
diff --git a/user-doc/Octocat.png b/user-doc/octocat.png
similarity index 100%
rename from user-doc/Octocat.png
rename to user-doc/octocat.png
--
GitLab