aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-12 05:12:03 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-12 05:12:03 +0000
commit1469960adcfb06ac39d961bdd5ae7cf6177b6600 (patch)
tree5fbe3a37bf1e629b45533cbac891c438e29b2952
parent6537c41fb95c04ab4b3246f11da1c500ff58aed7 (diff)
downloadpaludis-1469960adcfb06ac39d961bdd5ae7cf6177b6600.tar.gz
paludis-1469960adcfb06ac39d961bdd5ae7cf6177b6600.tar.xz
Start the big www reorganisation
-rw-r--r--Makefile.am7
-rw-r--r--doc/Makefile.am42
-rw-r--r--doc/create_ruby_doc.rb (renamed from ruby/create_ruby_doc.rb)0
-rw-r--r--doc/doxygen.conf.in2
-rw-r--r--doc/htaccess4
-rw-r--r--ruby/paludis_ruby.cc2
6 files changed, 32 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index e6693c2..8d16d6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,11 +26,8 @@ automake-deps-dist-hack.tmp :
dist-hook :
rm $(distdir)/automake-deps-dist-hack.tmp
-doxygen :
- $(MAKE) -C doc doxygen
-
-upload-homepage :
- $(MAKE) -C doc upload-homepage
+doxygen rdoc homepage upload-homepage :
+ $(MAKE) -C doc $@
check-local :
touch $(top_builddir)/done-check
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 98d71d1..8fb0a84 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,8 +22,8 @@ docfiles = \
doc_programming_with_paludis.doxygen \
doc_cache_files.doxygen
-EXTRA_DIST = doxygen.conf.in header.html footer.html paludis.css $(docfiles) $(tagfiles) htaccess
-CLEANFILES = *~ html/* html
+EXTRA_DIST = doxygen.conf.in header.html footer.html paludis.css $(docfiles) $(tagfiles)
+CLEANFILES = *~
MAINTAINERCLEANFILES = Makefile.in $(tagfiles)
libstdc++.tag :
@@ -32,14 +32,17 @@ libstdc++.tag :
libwrapiter.tag :
wget -O $@ http://libwrapiter.berlios.de/libwrapiter.tag
-copy-htaccess : htaccess
- cp htaccess html/.htaccess
+www :
+ mkdir -p www
+
+all-built-sources :
+ $(MAKE) -C .. built-sources
if HAVE_DOXYGEN
doxygen : doxygen.conf $(top_srcdir)/paludis/*.cc $(top_srcdir)/paludis/*.hh \
- $(docfiles) $(tagfiles) copy-htaccess
- $(MAKE) -C .. built-sources
+ $(docfiles) $(tagfiles) www all-built-sources
+ mkdir -p www/doxygen/
doxygen doxygen.conf
else
@@ -50,18 +53,29 @@ doxygen :
endif
+if ENABLE_RUBY
+
+rdoc : create_ruby_doc.rb www all-built-sources
+ $(RUBY) $(srcdir)/create_ruby_doc.rb --op www/ruby/ $(top_srcdir)/ruby/
+
+else
+
+rdoc :
+ @echo "You don't have ruby turned on!"
+ exit 1
+
+endif
+
clean-local :
- mkdir -p html
- touch html/dummy
- find html/ -type f | grep -v '\.svn' | xargs rm
+ rm -fr www
maintainer-clean-local :
- mkdir -p html
- touch html/dummy
- find html/ -type f | grep -v '\.svn' | xargs rm
+ rm -fr www
+
+homepage : doxygen rdoc
-upload-homepage : doxygen
- cd `readlink -f $(top_srcdir)/doc/html` && tar jc ./ --exclude ./ | \
+upload-homepage : homepage
+ cd `readlink -f $(top_srcdir)/doc/www` && tar jc ./ --exclude ./ | \
ssh shell.berlios.de tar vjx -C /home/groups/paludis/htdocs/
built-sources : $(BUILT_SOURCES)
diff --git a/ruby/create_ruby_doc.rb b/doc/create_ruby_doc.rb
index 74554d9..74554d9 100644
--- a/ruby/create_ruby_doc.rb
+++ b/doc/create_ruby_doc.rb
diff --git a/doc/doxygen.conf.in b/doc/doxygen.conf.in
index 40971c0..7ce7397 100644
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
@@ -32,7 +32,7 @@ PROJECT_NUMBER = "Version @VERSION@"
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = ./
+OUTPUT_DIRECTORY = ./www/doxygen/
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
diff --git a/doc/htaccess b/doc/htaccess
deleted file mode 100644
index e7a4e4a..0000000
--- a/doc/htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-Redirect permanent /ChangeLog.html /PaludisChangeLog.html
-Redirect permanent /News.html /PaludisNews.html
-Redirect permanent /Licence.html /PaludisLicence.html
-Redirect permanent /Authors.html /PaludisAuthors.html
diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc
index 9c76152..fbec6f2 100644
--- a/ruby/paludis_ruby.cc
+++ b/ruby/paludis_ruby.cc
@@ -227,7 +227,7 @@ extern "C"
* Document-module: Paludis
*
* <b>Paludis</b> is the other package mangler, this is the doc to the ruby binding. The C++ library
- * documentation[http://paludis.berlios.de/modules.htm] may also help.
+ * documentation[http://paludis.berlios.de/doxygen/html/] may also help.
*
*/
c_paludis_module = rb_define_module("Paludis");