From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 2 Mar 2010 17:04:17 +0000 (+0000)
Subject: Bibtex2html en c.
X-Git-Tag: SVN~570
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3c032abad3a8a87c160c55f49550035a69ec8349

Bibtex2html en c.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7168 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index 67da361424..8e11ea5f73 100644
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -2,19 +2,28 @@ include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
+
+find_program(SET_MAKE NAMES make)
+find_program(CAT_EXE NAMES cat)
+
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 SET(HAVE_RUBY_H 0)
-SET(RUBY_PATH "non")
-find_program(FIND_EXE NAMES find)
-exec_program("${FIND_EXE} /usr/lib -name ruby.h" OUTPUT_VARIABLE RUBY_PATH)
-string(REPLACE "/ruby.h" "/" RUBY_PATH ${RUBY_PATH})
-#message("RUBY_PATH ${RUBY_PATH}")
 
-if(NOT disable_ruby AND RUBY_PATH)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
-	SET(HAVE_RUBY_H 1)
-endif(NOT disable_ruby AND RUBY_PATH)
+if(NOT disable_ruby)
+	include(FindRuby)
+	set(OKITOKI no)
+	foreach(path ${RUBY_INCLUDE_PATH})
+		if(NOT OKITOKI)
+			set(RUBY_INCLUDE_PATH ${path})
+			set(OKITOKI yes)
+		endif(NOT OKITOKI)
+	endforeach(path ${RUBY_INCLUDE_PATH})
+	if(RUBY_INCLUDE_PATH)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_INCLUDE_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
+		SET(HAVE_RUBY_H 1)
+	endif(RUBY_INCLUDE_PATH)
+endif(NOT disable_ruby)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
@@ -338,7 +347,7 @@ if(HAVE_MAKECONTEXT)
 		${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c
 		COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
 		)
-	find_program(CAT_EXE NAMES cat)
+	
 
 	exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_addr")
 	exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_size")
@@ -376,7 +385,7 @@ endif(stack MATCHES "up")
 #AM_SANITY_CHECK -auto
 
 #AC_PROG_MAKE_SET
-find_program(SET_MAKE NAMES make)
+
 
 #AC_PRINTF_NULL
 try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR
@@ -603,7 +612,6 @@ find_path(ADDR2LINE NAMES addr2line	PATHS NO_DEFAULT_PATHS	)
 if(ADDR2LINE)
 set(ADDR2LINE "${ADDR2LINE}/addr2line")
 endif(ADDR2LINE)
-find_program(ADDR2LINE NAMES addr2line)
 
 ### check for include files and fct
 CHECK_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H)
diff --git a/buildtools/CPACK/src/CMakeDocs.txt b/buildtools/CPACK/src/CMakeDocs.txt
index 05779fe21c..b579a26c06 100644
--- a/buildtools/CPACK/src/CMakeDocs.txt
+++ b/buildtools/CPACK/src/CMakeDocs.txt
@@ -3,7 +3,31 @@ if(MAINTAINER_MODE)
 	find_path(FIG2DEV_PATH	NAMES fig2dev	PATHS NO_DEFAULT_PATHS)
 	find_path(DOXYGEN_PATH	NAMES doxygen	PATHS NO_DEFAULT_PATHS)
 	find_path(BIBTOOL_PATH	NAMES bibtool	PATHS NO_DEFAULT_PATHS)
-	find_path(BIBTEX2HTML_PATH	NAMES bibtex2html	PATHS NO_DEFAULT_PATHS)
+
+	if(NOT EXISTS "${PROJECT_DIRECTORY}/bibtex2html-1.02/src/bibtex2html")
+		write_file("${PROJECT_DIRECTORY}/CPACK/bibtex2html_install.sh"
+		"#! /bin/sh
+		wget ftp://ftp-sop.inria.fr/epidaure/Softs/bibtex2html/bibtex2html-1.02.tar.gz
+		rm -rf bibtex2html-1.02
+		tar -xvf bibtex2html-1.02.tar.gz
+		rm bibtex2html-1.02.tar.gz
+		cd bibtex2html-1.02/src
+		make
+		./bibtex2html"
+		)
+		exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/CPACK/bibtex2html_install.sh"  OUTPUT_VARIABLE OKITOKI)
+		exec_program("${PROJECT_DIRECTORY}/CPACK/bibtex2html_install.sh"  OUTPUT_VARIABLE OKITOKI)
+
+		if(EXISTS "${PROJECT_DIRECTORY}/bibtex2html-1.02/src/bibtex2html")
+		set(BIBTEX2HTML_PATH ${PROJECT_DIRECTORY}/bibtex2html-1.02/src)
+		else(EXISTS "${PROJECT_DIRECTORY}/bibtex2html-1.02/src/bibtex2html")
+		set(BIBTEX2HTML_PATH NOT_FOUND)
+		endif(EXISTS "${PROJECT_DIRECTORY}/bibtex2html-1.02/src/bibtex2html")
+
+	else(NOT EXISTS "${PROJECT_DIRECTORY}/bibtex2html-1.02/src/bibtex2html")
+		set(BIBTEX2HTML_PATH ${PROJECT_DIRECTORY}/bibtex2html-1.02/src)
+	endif(NOT EXISTS "${PROJECT_DIRECTORY}/bibtex2html-1.02/src/bibtex2html")
+
 	find_path(ICONV_PATH	NAMES iconv	PATHS NO_DEFAULT_PATHS)
 	find_path(MAKE_PATH	NAMES make	PATHS NO_DEFAULT_PATHS)
 
@@ -32,23 +56,9 @@ if(MAINTAINER_MODE)
 	${PROJECT_DIRECTORY}/doc/webcruft/poster_thumbnail.png
 	)
 
-	SET(PRINT false)
+	SET(PRINT true)
 
 	if(PRINT)
-		message("DOCSSOURCES:")
-		foreach(file ${DOCSSOURCES})
-			message("${file}")
-		endforeach(file ${DOCSSOURCES})
-
-		message("\nFIGS:")
-		foreach(file ${FIGS})
-			message("${file}")
-		endforeach(file ${FIGS})
-
-		message("\nPNGS:")
-		foreach(file ${PNGS})
-			message("${file}")
-		endforeach(file ${PNGS})
 
 	message("${DOXYGEN_PATH}/doxygen")
 	message("${FIG2DEV_PATH}/fig2dev")
@@ -71,7 +81,7 @@ if(MAINTAINER_MODE)
 
 
 		exec_program("touch ${PROJECT_DIRECTORY}/doc/index-API.doc ${PROJECT_DIRECTORY}/doc/.FAQ.doc.toc ${PROJECT_DIRECTORY}/doc/.index.doc.toc ${PROJECT_DIRECTORY}/doc/.contrib.doc.toc ${PROJECT_DIRECTORY}/doc/.history.doc.toc" OUTPUT_VARIABLE OKITOKI)
-		exec_program("test -e html || mkdir html" OUTPUT_VARIABLE OKITOKI)
+		exec_program("test -e ${PROJECT_DIRECTORY}/doc/html || mkdir ${PROJECT_DIRECTORY}/doc/html" OUTPUT_VARIABLE OKITOKI)
 
 		foreach(file ${PNGS})
 			exec_program("cp ${file} ${PROJECT_DIRECTORY}/doc/html/" OUTPUT_VARIABLE OKITOKI)
@@ -85,11 +95,11 @@ if(MAINTAINER_MODE)
 		set(srcdir ".")
 		configure_file(${PROJECT_DIRECTORY}/doc/Doxyfile.in ${PROJECT_DIRECTORY}/doc/Doxyfile @ONLY)
 	# First pass
-		exec_program("${DOXYGEN_PATH}/doxygen Doxyfile >/dev/null" OUTPUT_VARIABLE OKITOKI)
+		exec_program("${DOXYGEN_PATH}/doxygen ${PROJECT_DIRECTORY}/doc/Doxyfile >/dev/null" OUTPUT_VARIABLE OKITOKI)
 		exec_program("${PROJECT_DIRECTORY}/tools/doxygen/index_create.pl simgrid.tag index-API.doc" OUTPUT_VARIABLE OKITOKI)
 		exec_program("${PROJECT_DIRECTORY}/tools/doxygen/toc_create.pl ${PROJECT_DIRECTORY}/FAQ.doc ${PROJECT_DIRECTORY}/doc/index.doc ${PROJECT_DIRECTORY}/doc/contrib.doc ${PROJECT_DIRECTORY}/doc/gtut-introduction.doc ${PROJECT_DIRECTORY}/doc/history.doc" OUTPUT_VARIABLE OKITOKI)
 	# Second pass
-		exec_program("${DOXYGEN_PATH}/doxygen Doxyfile >/dev/null" OUTPUT_VARIABLE OKITOKI)
+		exec_program("${DOXYGEN_PATH}/doxygen ${PROJECT_DIRECTORY}/doc/Doxyfile >/dev/null" OUTPUT_VARIABLE OKITOKI)
 	# Post-processing
 		exec_program("rm -f ${PROJECT_DIRECTORY}/doc/html/dir*" OUTPUT_VARIABLE OKITOKI)
 		exec_program("${PROJECT_DIRECTORY}/tools/doxygen/index_php.pl ${PROJECT_DIRECTORY}/doc/index.php.in ${PROJECT_DIRECTORY}/doc/html/index.html ${PROJECT_DIRECTORY}/doc/index.php" OUTPUT_VARIABLE OKITOKI)
@@ -127,7 +137,8 @@ if(MAINTAINER_MODE)
 		string(REPLACE "\n" ";" LISTE_QUATRE ${LISTE_QUATRE})
 		foreach(file ${LISTE_QUATRE})
 			string(REPLACE ".bib" "_bib.latin1.html" file_tmp "${file}")
-			exec_program("${BIBTEX2HTML_PATH}/bibtex2html -single -i -q ${file} | ${PROJECT_DIRECTORY}/tools/doxygen/bibtex2html_postprocessor.pl > ${file_tmp}\n" OUTPUT_VARIABLE OKITOKI)
+			exec_program("${BIBTEX2HTML_PATH}/bibtex2html -single-output -nv -force -sort year -copy-icons ${file} | ${PROJECT_DIRECTORY}/tools/doxygen/bibtex2html_postprocessor.pl > ${file_tmp}" OUTPUT_VARIABLE OKITOKI)
+			#message("file ${file}\nfile_tmp ${file_tmp}")
 		endforeach(file ${LISTE_QUATRE})
 
 
@@ -137,6 +148,7 @@ if(MAINTAINER_MODE)
 		foreach(file ${LISTE_CINQ})
 			string(REPLACE "_bib.latin1.html" "_bib.html" file_tmp "${file}")
 			exec_program("${ICONV_PATH}/iconv --from-code latin1 --to-code utf8 ${file} --output ${file-tmp}" OUTPUT_VARIABLE OKITOKI)
+			#message("file ${file}\nfile_tmp ${file_tmp}")
 		endforeach(file ${LISTE_CINQ})
 	endif(BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH)
 
@@ -157,9 +169,8 @@ if(MAINTAINER_MODE)
 	../tools/doxygen/xbt_log_extract_hierarchy.pl 	>> $pwd/logcategories.doc
 	echo "@}*/"                                     >> $pwd/logcategories.doc"
 	)
-	exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/doc/logcategories.sh")
-	exec_program("${PROJECT_DIRECTORY}/doc/logcategories.sh")
-
+	exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/doc/logcategories.sh" OUTPUT_VARIABLE OKITOKI)
+	exec_program("${PROJECT_DIRECTORY}/doc/logcategories.sh" OUTPUT_VARIABLE OKITOKI)
 
 endif(MAINTAINER_MODE)