From: vsr <vsr@opencascade.com>
Date: Fri, 29 May 2009 07:10:38 +0000 (+0000)
Subject: Issue 20371: remove the creation of netgen.prof ?
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2093d40069447def10cf51cb67d379ba69c2f965;p=tools%2Finstall.git

Issue 20371: remove the creation of netgen.prof ?
---

diff --git a/config_files/netgen-4.5.sh b/config_files/netgen-4.5.sh
index 3ae4bf9..d96314a 100755
--- a/config_files/netgen-4.5.sh
+++ b/config_files/netgen-4.5.sh
@@ -74,12 +74,6 @@ fi
 # additional patching for SALOME
 (cd ${PRODUCT_SRC_DIR}; cp ngtcltk/ngnewdelete.* libsrc/interface)
 
-# apply patch: to make compilable on latest versions of gcc
-(cd ${PRODUCT_SRC_DIR}/libsrc/meshing; echo -e '16s/^$/class Mesh;\nwq' | ed - meshtype.hpp > /dev/null)
-
-# apply patch: to make compilable with CASCADE-6.1.1
-(cd ${PRODUCT_SRC_DIR}/libsrc; sed -e "s%\(.*\)-DHAVE_LIMITS\'%\1-DHAVE_LIMITS_H%g" makefile.inc > makefile.inc.new; mv makefile.inc.new makefile.inc)
-
 # to generate environment scripts
 try_preinstalled
 }
diff --git a/config_files/patches/netgen-4.5-for-SALOME.patch b/config_files/patches/netgen-4.5-for-SALOME.patch
index fac1fc0..ad2060e 100755
--- a/config_files/patches/netgen-4.5-for-SALOME.patch
+++ b/config_files/patches/netgen-4.5-for-SALOME.patch
@@ -1226,4 +1226,31 @@ diff -Naur netgen-4.5.old/libsrc/occ/utilities.h netgen-4.5.new/libsrc/occ/utili
 +#include <iomanip>
  #include <cstdlib>
  // #include "SALOME_Log.hxx"
+
+diff -Naur netgen-4.5.old/libsrc/general/profiler.cpp netgen-4.5.new/libsrc/general/profiler.cpp
+--- netgen-4.5.old/libsrc/general/profiler.cpp  2006-01-11 13:05:59.000000000 +0300
++++ netgen-4.5.new/libsrc/general/profiler.cpp  2009-05-28 18:47:00.000000000 +0400
+@@ -35,7 +35,10 @@
+     StopTimer (total_timer);
+
+     ofstream prof ("netgen.prof");
+-    Print (prof);
++
++    ostream& pprof = getenv("NETGEN_PROF") ? prof : std::cout;
++
++    Print (pprof);
+   }
+
+
+diff -Naur netgen-4.5.old/libsrc/meshing/meshtype.hpp netgen-4.5.new/libsrc/meshing/meshtype.hpp
+--- netgen-4.5.old/libsrc/meshing/meshtype.hpp	2009-05-28 19:22:04.000000000 +0400
++++ netgen-4.5.new/libsrc/meshing/meshtype.hpp	2009-05-28 18:37:18.000000000 +0400
+@@ -13,7 +13,7 @@
+     Classes for NETGEN
+ */
  
+-
++class Mesh;
+ enum ELEMENT_TYPE { 
+   SEGMENT = 1, SEGMENT3 = 2,
+   TRIG = 10, QUAD=11, TRIG6 = 12, QUAD6 = 13, QUAD8 = 14,