songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch'

This commit is contained in:
Sébastien Loriot 2018-01-30 11:22:39 +01:00
parent 7d3a5ba174 ff109bfb0e
commit d54113c18b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/doc/resources/1.8.13/BaseDoxyfile.in
View File

@ -1568,7 +1568,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from http://www.mathjax.org before deployment.
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2.
# This tag requires that the tag USE_MATHJAX is set to YES.
${CGAL_DOC_MATHJAX_LOCATION_FULL_OPTION_LINE}

2
Documentation/doc/resources/1.8.13/deprecated.html
View File

@ -9,7 +9,7 @@
<link href="../Manual/cgal_stylesheet.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../Manual/jquery.js"></script>
<script type="text/javascript" src="../Manual/dynsections.js"></script>
<script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
<script src="../Manual/hacks.js" type="text/javascript"></script>
<script type="text/javascript" src="resize.js"></script>
<script type="text/javascript" src="navtree.js"></script>

2
Documentation/doc/resources/1.8.4/deprecated.html
View File

@ -9,7 +9,7 @@
<link href="../Manual/cgal_stylesheet.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../Manual/jquery.js"></script>
<script type="text/javascript" src="../Manual/dynsections.js"></script>
<script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
<script src="../Manual/hacks.js" type="text/javascript"></script>
<script type="text/javascript" src="resize.js"></script>
<script type="text/javascript" src="navtree.js"></script>

2
Documentation/doc/resources/1.8.4/header_package.html
View File

@ -32,7 +32,7 @@
<!-- to use the mathjax cdn use -->
<!-- <script -->
<!-- type="text/javascript" -->
<!-- src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> -->
<!-- src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> -->
<!-- </script> -->
<script type="text/x-mathjax-config">
MathJax.Hub.Config({

8
Documentation/doc/scripts/test_doxygen_versions.sh
View File

@ -58,7 +58,7 @@ if [ "$HAS_REF" -ne "1" ]; then
echo "Building reference documentation..."
mkdir -p ./build_doc
cd ./build_doc
cmake -DCGAL_DOC_RELEASE=ON -DCGAL_GENERATE_XML=ON -DDOXYGEN_EXECUTABLE="$PATH_TO_1" ../.. 1> /dev/null
cmake -DCGAL_DOC_MATHJAX_LOCATION:STRING=../../MathJax -DCGAL_DOC_RELEASE=ON -DCGAL_GENERATE_XML=ON -DDOXYGEN_EXECUTABLE="$PATH_TO_1" ../.. 1> /dev/null
make -j$NB_CORES doc &> /dev/null
echo "done."
cd ../ #scripts
@ -78,7 +78,7 @@ fi
echo "Building second documentation..."
mkdir -p build_doc
cd ./build_doc
cmake -DCGAL_DOC_RELEASE=ON -DCGAL_GENERATE_XML=ON -DDOXYGEN_EXECUTABLE="$PATH_TO_2" ../.. 1> /dev/null
cmake -DCGAL_DOC_MATHJAX_LOCATION:STRING=../../MathJax -DCGAL_DOC_RELEASE=ON -DCGAL_GENERATE_XML=ON -DDOXYGEN_EXECUTABLE="$PATH_TO_2" ../.. 1> /dev/null
make -j$NB_CORES doc &> /dev/null
echo "done."
cd ../ #scripts
@ -108,7 +108,7 @@ if [ "$HAS_REF" -ne "1" ]; then
#######################################################################################################################
rm -rf ./doc_dir
cd $BUILD_DIR_1
cmake -DCGAL_DOC_RELEASE=ON -DCGAL_DOC_CREATE_LOGS="true" -DDOXYGEN_EXECUTABLE="$PATH_TO_1" ../.. 1> /dev/null
cmake -DCGAL_DOC_MATHJAX_LOCATION:STRING=../../MathJax -DCGAL_DOC_RELEASE=ON -DCGAL_DOC_CREATE_LOGS="true" -DDOXYGEN_EXECUTABLE="$PATH_TO_1" ../.. 1> /dev/null
echo "Building reference documentation with postprocessing..."
make -j$NB_CORES doc &> /dev/null
make -j$NB_CORES doc &> /dev/null
@ -132,7 +132,7 @@ else
rm -rf ./first_doc_ref
fi
cd $BUILD_DIR_2
cmake -DCGAL_DOC_RELEASE=ON -DCGAL_DOC_CREATE_LOGS="true" -DDOXYGEN_EXECUTABLE="$PATH_TO_2" ../.. 1> /dev/null
cmake -DCGAL_DOC_MATHJAX_LOCATION:STRING=../../MathJax -DCGAL_DOC_RELEASE=ON -DCGAL_DOC_CREATE_LOGS="true" -DDOXYGEN_EXECUTABLE="$PATH_TO_2" ../.. 1> /dev/null
echo "Building reference documentation with postprocessing..."
make -j$NB_CORES doc &> /dev/null
make -j$NB_CORES doc &> /dev/null

2
Maintenance/public_release/scripts/prepare_release
View File

@ -43,7 +43,7 @@ rsync -a "$DEST_DIR/doc_html/" "$DEST_DIR/doc_html_online/"
printf "Modify \"../../MathJax\" to MathJax CDN in doc_html...\n"
pushd "$DEST_DIR/doc_html"
find -name '*.html' -exec sed -i -e 's|../../MathJax|http://cdn.mathjax.org/mathjax/latest|g' {} +
find -name '*.html' -exec sed -i -e 's|../../MathJax|https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2|g' {} +
popd
printf "Create doc_html tarball...\n"