Changeset 36 for trunk/adm/makefile

Timestamp:

04/01/11 16:27:14 (13 years ago)

Author:

pinsard

Message:

add end users website production

File:

• trunk/adm/makefile (modified) (11 diffs)

trunk/adm/makefile

@@ -23 +23 @@
 # ==========
 #
+# - fplod 20110401T091241Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * replace URLPUBLISH by URLPUBLISH_DEV
+#   * replace DIRWWW by DIRWWW_DEV
+#   * add URLPUBLISH_USER and DIRWWW_USER to handle website 
+#   
 # - fplod 20110203T101853Z aedon.locean-ipsl.upmc.fr (Darwin)
 #
@@ -75 +81 @@
 ./design/
 
-DIRWWW = \
+DIRWWW_DEV = \
 ../doc/
 
-URLPUBLISH = \
+DIRWWW_USER = \
+./website/_build/
+
+URLPUBLISH_DEV = \
 http://www.locean-ipsl.upmc.fr/~fplod/$(PRODUCT)/$(SUBPRODUCT)/doc/
+
+URLPUBLISH_USER = \
+http://www.locean-ipsl.upmc.fr/~tropflux
 
 LIST_INVENTORY = \
@@ -99 +111 @@
 LIST_SRCSH_TROFF = \
 $(shell echo "$(LIST_SRCSH)" | \
-        sed -e "s+$(DIRSRC)+$(DIRWWW)/man/man1/+g" \
+        sed -e "s+$(DIRSRC)+$(DIRWWW_DEV)/man/man1/+g" \
             -e "s+\.sh+.sh.1+g")
 
@@ -151 +163 @@
 man_troff_sphinx \
 html \
-html_sphinx \
-html_sphinx_one \
+html_dev \
+html_dev_sphinx \
+html_user \
 pdf \
-pdf_sphinx \
+pdf_dev \
+pdf_dev_sphinx \
+pdf_user \
 html_src_browser \
 html_src_browser_doxygen
@@ -176 +191 @@
 
 before :
-        @mkdir -p $(DIRWWW)/man/man1/
-        @mkdir -p $(DIRWWW)/html/sphinx/
-        @mkdir -p $(DIRWWW)/pdf/sphinx/
+        @mkdir -p $(DIRWWW_DEV)/man/man1/
+        @mkdir -p $(DIRWWW_DEV)/html/sphinx/
+        @mkdir -p $(DIRWWW_DEV)/pdf/sphinx/
         @mkdir -p $(DIRTMP)/sphinx_tmpdir/doctrees/
         @mkdir -p $(DIRTMP)/sphinx_tmpdir/manuals/
         @mkdir -p $(DIRTMP)/sphinx_tmpdir/guides/
-        @mkdir -p $(DIRWWW)/src_browser/
+        @mkdir -p $(DIRWWW_DEV)/src_browser/
 
 
 install_all : \
-install_html \
-install_pdf \
+install_html_dev \
+install_html_user \
+install_pdf_dev \
+install_pdf_user \
 install_browser
 
-install_html :
-        @$(DIRADM)/install.sh -w $(DIRWWW)/html/ -u $(URLPUBLISH)/html/
-
-install_pdf :
-        @$(DIRADM)/install.sh -w $(DIRWWW)/pdf/ -u $(URLPUBLISH)/pdf/
+install_html_dev :
+        @$(DIRADM)/install.sh -w $(DIRWWW_DEV)/html/ -u $(URLPUBLISH_DEV)/html/
+
+install_html_user :
+        @$(DIRADM)/install.sh -w $(DIRWWW_USER)/ -u $(URLPUBLISH_USER)/
+
+install_pdf_dev :
+        @$(DIRADM)/install.sh -w $(DIRWWW_DEV)/pdf/ -u $(URLPUBLISH_DEV)/pdf/
+
+install_pdf_user :
+        @$(DIRADM)/install.sh -w $(DIRWWW_USER)/pdf/ -u $(URLPUBLISH_USER)/pdf/
 
 install_browser :
-        @$(DIRADM)/install.sh -w $(DIRWWW)/src_browser/doxygen/html/ -u $(URLPUBLISH)/src_browser/doxygen/html/
+        @$(DIRADM)/install.sh -w $(DIRWWW_DEV)/src_browser/doxygen/html/ -u $(URLPUBLISH_DEV)/src_browser/doxygen/html/
 
 clean : \
 cleantmp
-        -@rm -fr $(DIRWWW)/man/
-        -@rm -fr $(DIRWWW)/html/
-        -@rm -fr $(DIRWWW)/pdf/
-        -@rm -fr $(DIRWWW)/src_browser/
+        -@rm -fr $(DIRWWW_DEV)/man/
+        -@rm -fr $(DIRWWW_DEV)/html/
+        -@rm -fr $(DIRWWW_DEV)/pdf/
+        -@rm -fr $(DIRWWW_DEV)/src_browser/
+        cd $(DIRADM)/website/; make clean
 
 
@@ -219 +243 @@
 
 htmllinkcheckb :
-        @$(DIRADM)/linkchecker.sh -d $(DIRWWW)/html/
+        @$(DIRADM)/linkchecker.sh -d $(DIRWWW_DEV)/html/
+        @$(DIRADM)/linkchecker.sh -d $(DIRWWW_USER)
 
 htmllinkchecka :
-        @$(DIRADM)/linkchecker.sh -u $(URLPUBLISH)
+        @$(DIRADM)/linkchecker.sh -u $(URLPUBLISH_DEV)
+        @$(DIRADM)/linkchecker.sh -u $(URLPUBLISH_USER)
 
 spellcheck :
@@ -252 +278 @@
             -w $(DIRTMP)/sphinx_man_troff.log \
             $(DIRTMP)/sphinx_tmpdir/ \
-            $(DIRWWW)/man/man1/
+            $(DIRWWW_DEV)/man/man1/
 
 html : \
-html_sphinx \
-html_sphinx_one
-
-html_sphinx : \
+html_user \
+html_dev
+
+html_user : 
+        cd $(DIRADM)/website/; make html
+
+html_dev : \
+html_dev_sphinx \
+html_dev_sphinx_one
+
+html_dev_sphinx : \
 $(DIRADM)/sphinx/conf.py \
 $(DIRADM)/index.rst \
@@ -280 +313 @@
             -w $(DIRTMP)/sphinx_html.log \
             $(DIRTMP)/sphinx_tmpdir/ \
-            $(DIRWWW)/html/sphinx/
-
-html_sphinx_one : \
+            $(DIRWWW_DEV)/html/sphinx/
+
+html_dev_sphinx_one : \
 $(DIRADM)/sphinx/conf.py \
 $(DIRADM)/index.rst \
@@ -303 +336 @@
             -w $(DIRTMP)/sphinx_html_one.log \
             $(DIRTMP)/sphinx_tmpdir/ \
-            $(DIRWWW)/html/sphinx_one/
+            $(DIRWWW_DEV)/html/sphinx_one/
 
 pdf : \
-pdf_sphinx
-
-pdf_sphinx : \
+pdf_user \
+pdf_dev
+
+pdf_user :
+        cd $(DIRADM)/website/
+        make pdf
+
+pdf_dev : \
+pdf_dev_sphinx
+
+pdf_dev_sphinx : \
 $(DIRADM)/sphinx/conf.py \
 $(DIRADM)/index.rst \
@@ -327 +368 @@
         @sphinx-build -b latex -c $(DIRADM)/sphinx \
             -d $(DIRTMP)/sphinx_tmpdir/doctrees \
-            -w $(DIRTMP)/sphinx_pdf.log \
+            -w $(DIRTMP)/sphinx_pdf_dev.log \
             $(DIRTMP)/sphinx_tmpdir/ \
             $(DIRTMP)/sphinx_tmpdir/latex_output
         cd $(DIRTMP)/sphinx_tmpdir/latex_output/; make all-pdf
         cp $(DIRTMP)/sphinx_tmpdir/latex_output/*.pdf \
-           $(DIRWWW)/pdf/sphinx/
+           $(DIRWWW_DEV)/pdf/sphinx/
 
 $(DIRTMP)/sphinx_tmpdir/index_manuals.rst :
@@ -416 +457 @@
 
 html_src_browser_doxygen : \
-        $(DIRWWW)/src_browser/doxygen/
-
-$(DIRWWW)/src_browser/doxygen/ : \
+        $(DIRWWW_DEV)/src_browser/doxygen/
+
+$(DIRWWW_DEV)/src_browser/doxygen/ : \
 $(DIRADM)/Doxyfile_$(PRODUCT) \
 $(DIRADM)/m2cpp.pl \