From cd0853d1498aaecdf8f5bb34c7c1e6c4fa1a4d48 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Wed, 15 Oct 2008 13:19:56 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/cmake/BBTKConfigurePackage.cmake | 41 +++++++++++++++----------
 kernel/src/xmlParser.cpp                |  4 +--
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index d2aa0c0..ea783e7 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -1,17 +1,6 @@
+
 #---------------------------------------------------------------------------
-# CREATES THE bbtkPackage TEXT FILE
-CONFIGURE_FILE(
-  ${BBTK_CMAKE_DIR}/bbtkPackage.in
-  ${PROJECT_BINARY_DIR}/bbtkPackage
-  @ONLY
-)
-
-IF (WIN32)
-  
-  INSTALL ( FILES ${PROJECT_BINARY_DIR}/bbtkPackage
-    DESTINATION "" )
-  
-ENDIF (WIN32)
+SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 #---------------------------------------------------------------------------
 
 
@@ -27,14 +16,32 @@ IF(NOT BBTK_CORE_PACKAGE)
   # Configure bbtk_config_build.xml.in for bbi to find the bbs
   INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigureBbtkConfigXmlForBuildTree.cmake)
   #------------------------------------------------------------------------- 
-  #
+  # WARNING : 
+  # FOR THE MOMENT ONLY ONE BBTK PACKAGE PER PROJECT ALLOWED!!!
+  # 
+  SET(${BBTK_PACKAGE_NAME}_BINARY_DIR  ${PROJECT_BINARY_DIR})
+  # ${CMAKE_CURRENT_BINARY_DIR})
+  #------------------------------------------------------------------------- 
+  #---------------------------------------------------------------------------
+  # CREATES THE bbtkPackage TEXT FILE
+  CONFIGURE_FILE(
+    ${BBTK_CMAKE_DIR}/bbtkPackage.in
+    ${${BBTK_PACKAGE_NAME}_BINARY_DIR}/bbtkPackage
+    @ONLY
+    )
+  IF (WIN32)
+    INSTALL ( FILES ${${BBTK_PACKAGE_NAME}_BINARY_DIR}/bbtkPackage
+      DESTINATION "" )
+  ENDIF (WIN32)
+  #---------------------------------------------------------------------------
+ELSE(NOT BBTK_CORE_PACKAGE)
+  SET(${BBTK_PACKAGE_NAME}_BINARY_DIR ${PROJECT_BINARY_DIR})
 ENDIF(NOT BBTK_CORE_PACKAGE)
 #---------------------------------------------------------------------------
 
 
-#---------------------------------------------------------------------------
-SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-#---------------------------------------------------------------------------
+
+
 
 #----------------------------------------------------------------------------
 # USER DEFINED ADDITIONAL INCLUDE DIRS
diff --git a/kernel/src/xmlParser.cpp b/kernel/src/xmlParser.cpp
index e181809..fb98935 100644
--- a/kernel/src/xmlParser.cpp
+++ b/kernel/src/xmlParser.cpp
@@ -404,7 +404,7 @@ static const char *XML_ByteTable=(const char *)XML_utf8ByteTable; // the default
 
 XMLError XMLNode::writeToFile(XMLCSTR filename, const char *encoding, char nFormat) const
 {
-printf("EED XMLNode::writeToFile 01\n");
+  //printf("EED XMLNode::writeToFile 01\n");
     int i;
     XMLSTR t=createXMLString(nFormat,&i);
     FILE *f=_tfopen(filename,_T("wb"));
@@ -438,7 +438,7 @@ printf("EED XMLNode::writeToFile 01\n");
     }
 #endif
     if (!fwrite(t,sizeof(XMLCHAR)*i,1,f)) return eXMLErrorCannotWriteFile;
-printf("EED XMLNode::writeToFile 02\n");
+    //printf("EED XMLNode::writeToFile 02\n");
     if (fclose(f)!=0) return eXMLErrorCannotWriteFile;
     free(t);
     return eXMLErrorNone;
-- 
2.45.1