From ae81a9ff42e471ad61ceac3cbb773ba96dd2e7df Mon Sep 17 00:00:00 2001
From: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
Date: Tue, 20 Mar 2007 19:54:56 +0000
Subject: [PATCH] Again a major speed-up of parse_support_options(): use only
 one awk to do the whole job.

Tested on Linux and Solaris.
---
 .gitattributes                              |  1 +
 Installation/config/support/parse_files.awk | 17 +++++++++
 Installation/install_cgal                   | 42 ++++++---------------
 3 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 Installation/config/support/parse_files.awk

diff --git a/.gitattributes b/.gitattributes
index 5149cf71427..e513cc9a6c6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -678,6 +678,7 @@ Installation/config/support/S93-TAUCSFREEBSD -text
 Installation/config/support/S96-TAUCSDARWIN -text
 Installation/config/support/S98-TAUCSIRIXCC32 -text
 Installation/config/support/S99-TAUCSIRIXCC64 -text
+Installation/config/support/parse_files.awk -text
 Interpolation/doc_tex/Interpolation/nn_coords.eps -text svneol=unset#application/postscript
 Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#image/gif
 Interpolation/doc_tex/Interpolation/nn_coords.ipe -text svneol=unset#application/postscript
diff --git a/Installation/config/support/parse_files.awk b/Installation/config/support/parse_files.awk
new file mode 100644
index 00000000000..1a44753239c
--- /dev/null
+++ b/Installation/config/support/parse_files.awk
@@ -0,0 +1,17 @@
+BEGIN { 
+    RPKGS=""; PKGS="";
+    for (i = 1; i < ARGC; i++) {
+	pkg=ARGV[i]; sub(".*-","",pkg);
+	RPKGS=pkg " " RPKGS; PKGS=PKGS " " pkg;
+    };
+    printf "SUPPORT_PKGS='%s'\n",PKGS;
+    printf "R_SUPPORT_PKGS='%s'\n",RPKGS;
+    FS=" *= *"
+}
+/(PROVIDES|DESCRIPTION|CXXFLAGS|LDFLAGS|LIBS|REQUIRES|INCOMPATIBLE|STDINCLDIRS|INCLTHING|STDLIBDIRS|LIBTHING|COMPILETESTFLAGS) *=/ {
+    sub(".*-","",FILENAME);
+    printf "%s_%s='",FILENAME,$1;
+    for (i=2; i<NF; i++)
+	printf "%s=",$(i);
+    printf "%s'\n",$(NF)
+}
diff --git a/Installation/install_cgal b/Installation/install_cgal
index 239dbcb98c1..81d4d57ac7a 100755
--- a/Installation/install_cgal
+++ b/Installation/install_cgal
@@ -490,24 +490,15 @@ parse_support_options()
     log_print "Parsing support specfiles for 3rd party libraries:"
     _set_indent
     log_to_file
-    for i in "${CGAL_SUPPORT_DIR}"/S*; do
-	_tmp="`echo $i | ${_awk} 'BEGIN {FS=\"-\"} {print toupper($NF)}' | remove_special_chars `"
-	if [ -z "${_tmp}" ]; then continue; fi
-        SUPPORT_PKGS="${SUPPORT_PKGS} ${_tmp}"
-        R_SUPPORT_PKGS="${_tmp} ${R_SUPPORT_PKGS}"
-        log_print "${_tmp}"
-	${_printf} "%s" "${_tmp}, "
-	# read specfile
-	for j in PROVIDES DESCRIPTION CXXFLAGS LDFLAGS LIBS REQUIRES INCOMPATIBLE \
-	    STDINCLDIRS INCLTHING STDLIBDIRS LIBTHING COMPILETESTFLAGS
-	do
-	  eval "${j}=''"
-	done
-        try_to_get_var_from_file "PROVIDES|DESCRIPTION|CXXFLAGS|LDFLAGS|LIBS|REQUIRES|INCOMPATIBLE|STDINCLDIRS|INCLTHING|STDLIBDIRS|LIBTHING|COMPILETESTFLAGS" "${i}"
-	if [ -z "${PROVIDES}" ]; then continue; fi
-	eval "${_tmp}_PROVIDES=\"${PROVIDES}\""
+
+    # read all specfiles at once
+    _tmp="`${_awk} -f "${CGAL_SUPPORT_DIR}"/parse_files.awk  "${CGAL_SUPPORT_DIR}"/S*`"
+    eval "${_tmp}"
+    for i in ${SUPPORT_PKGS}; do
+        log_print "${i}"
+        ${_printf} "%s" "${i}, "
         # is PROVIDES already among SUPPORT_FEATURES?
-	for j in ${PROVIDES}; do
+	for j in `value_of "${i}_PROVIDES"`; do
 	    if [ -z "`value_of \"SUPPORT_PKG_${j}\"`" ]; then
 		SUPPORT_FEATURES="${SUPPORT_FEATURES} ${j}"
 		eval "PROVIDE_PKG_${j}=''"
@@ -515,20 +506,11 @@ parse_support_options()
 		eval "${j}_LIB_DIR=''"
 		eval "${j}_VERSION=''"
 	    fi
-	    _append_to "SUPPORT_PKG_${j}" "${_tmp}" " "
+	    _append_to "SUPPORT_PKG_${j}" "${i}" " "
 	done
-
-	# generate set of variables corresponding to $_tmp
-
-	# store those from the specfile
-	for j in DESCRIPTION CXXFLAGS LDFLAGS LIBS REQUIRES INCOMPATIBLE \
-	    STDINCLDIRS INCLTHING STDLIBDIRS LIBTHING COMPILETESTFLAGS
-	do
-	  eval ${_tmp}_${j}=\"`value_of ${j}`\"
-	done
-	eval "${_tmp}_SUPPORT=''"
-	eval "${_tmp}_TEST_PASSED=''"
-	eval "${_tmp}_REQUIRED_BY=''"
+	eval "${i}_SUPPORT=''"
+	eval "${i}_TEST_PASSED=''"
+	eval "${i}_REQUIRED_BY=''"
     done
     for i in ${SUPPORT_PKGS}; do
 	for j in `value_of "${i}_REQUIRES"`; do