Fixes for TDataSetManagerAliEn

.gitignore

@@ -435,6 +435,12 @@ cint/cint/src/loadfile_tmp.cxx
 /test/RootShower/RootShowerDict.cxx
 /test/RootShower/RootShowerDict.h
 
+# /test/ios/
+/test/ios/RootBrowser/RootBrowser.xcodeproj/xcuserdata
+/test/ios/RootBrowser/RootBrowser.xcodeproj/project.xcworkspace
+/test/ios/Tutorials/Tutorials.xcodeproj/xcuserdata
+/test/ios/Tutorials/Tutorials.xcodeproj/project.xcworkspace
+
 # /tutorials/
 /tutorials/hsimple.root
 /tutorials/na49.root

CMakeLists.txt

@@ -28,8 +28,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 #---Load some basic macros which are needed later for the confiuration and build----------------
-include(RootNewMacros)
 include(RootBuildOptions)
+include(RootNewMacros)
 include(CheckCompiler)
 include(MacroEnsureVersion)
 
@@ -59,9 +59,7 @@ add_subdirectory (proof)
 add_subdirectory (html)
 add_subdirectory (montecarlo)
 add_subdirectory (geom)
-if(x11)
-  add_subdirectory (rootx)
-endif()
+add_subdirectory (rootx)
 add_subdirectory (misc)
 add_subdirectory (main)
 add_subdirectory (bindings)
@@ -78,23 +76,22 @@ include(PostInstalledSoftware)
 #---Configure and install various files neded later and for clients -----------------------------
 include(RootConfiguration)
 
-#install(EXPORT ${CMAKE_PROJECT_NAME}Exports DESTINATION cmake/modules) 
-
 #---Installation of project-wise artifacts-------------------------------------------------------
 if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-  install(FILES LICENSE DESTINATION .)
-  install(DIRECTORY README/ DESTINATION README PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY etc/ DESTINATION etc USE_SOURCE_PERMISSIONS 
+  install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
+  install(DIRECTORY README/ DESTINATION ${CMAKE_INSTALL_DOCDIR} PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_ETCDIR} USE_SOURCE_PERMISSIONS
                          PATTERN ".svn" EXCLUDE 
                          REGEX system.rootrc EXCLUDE 
                          REGEX root.mimes EXCLUDE)
-  install(DIRECTORY fonts/  DESTINATION fonts PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY icons/  DESTINATION icons PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY macros/ DESTINATION macros PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY man/    DESTINATION man PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY test/      DESTINATION test COMPONENT tests PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY tutorials/ DESTINATION tutorials COMPONENT tests PATTERN ".svn" EXCLUDE)
-  install(DIRECTORY cmake/modules DESTINATION cmake PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR} PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR} PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR} PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY man/    DESTINATION ${CMAKE_INSTALL_MANDIR} PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY test/      DESTINATION ${CMAKE_INSTALL_TESTDIR} COMPONENT tests PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY cmake/modules DESTINATION ${CMAKE_INSTALL_CMAKEDIR} PATTERN ".svn" EXCLUDE)
+  install(FILES build/misc/root.m4 DESTINATION ${CMAKE_INSTALL_ACLOCALDIR})
 endif()
 
 #---Configure Testing using CTest----------------------------------------------------------------

bindings/pyroot/CMakeLists.txt

@@ -17,9 +17,12 @@ if(MACOSX_MINOR EQUAL 5)
 endif()
 
 #---Install python modules--------------------------------------------------
-install(FILES ROOT.py DESTINATION ${runtimedir})
-install(CODE "execute_process(COMMAND python -m py_compile ${CMAKE_INSTALL_PREFIX}/${runtimedir}/ROOT.py )")
-install(CODE "execute_process(COMMAND python -O -m py_compile ${CMAKE_INSTALL_PREFIX}/${runtimedir}/ROOT.py )")
+file(GLOB pyfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
+foreach(pyfile ${pyfiles})
+  install(FILES ${pyfile} DESTINATION ${runtimedir})
+  install(CODE "execute_process(COMMAND python -m py_compile \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+  install(CODE "execute_process(COMMAND python -O -m py_compile \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${runtimedir}/${pyfile} )")
+endforeach()
 
 #---Install headers----------------------------------------------------------
 ROOT_INSTALL_HEADERS()

build/version_number

@@ -1 +1 @@
-5.34/11
+5.34/13

cint/ROOT/CMakeLists.txt

@@ -139,9 +139,9 @@ foreach(_name ${CINTSTLDLLNAMES})
 
     add_Library(${_name}Dict SHARED ${Dictionary}.cxx )
     set_Target_properties(${_name}Dict PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix} FOLDER Dictionaries)
-	install(TARGETS ${_name}Dict RUNTIME DESTINATION bin
-                                 LIBRARY DESTINATION lib
-                                 ARCHIVE DESTINATION lib)
+	install(TARGETS ${_name}Dict RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+                                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
     if(explicitlink)
       target_link_libraries(${_name}Dict Cint Core)
@@ -160,7 +160,7 @@ foreach(_name ${CINTSTLDLLNAMES})
   if(explicitlink)
     target_link_libraries(${_name} Cint)
   endif()
-  install(TARGETS ${_name} DESTINATION cint/cint/stl)
+  install(TARGETS ${_name} DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint/stl)
 endforeach()
 
 
@@ -185,7 +185,7 @@ foreach(_name ${CINTINCDLLNAMES})
     if(explicitlink)
       target_link_libraries(${_name} Cint ${CMAKE_M_LIBS})
     endif()
-    install(TARGETS ${_name} DESTINATION cint/cint/include)
+    install(TARGETS ${_name} DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint/include)
 
   elseif(_name MATCHES ipc)
     add_custom_command(OUTPUT ${OutFileName} 
@@ -203,7 +203,7 @@ foreach(_name ${CINTINCDLLNAMES})
     if(explicitlink)
       target_link_libraries(${_name} Cint)
     endif()
-    install(TARGETS ${_name} DESTINATION cint/cint/include)
+    install(TARGETS ${_name} DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint/include)
 
   elseif(_name MATCHES posix)
 
@@ -243,6 +243,6 @@ foreach(_name ${CINTINCDLLNAMES})
     if(explicitlink)
       target_link_libraries(${_name} Cint)
     endif()
-    install(TARGETS ${_name} DESTINATION cint/cint/include)
+    install(TARGETS ${_name} DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint/include)
   endif()
 endforeach()

cint/cint/CMakeLists.txt

@@ -90,7 +90,7 @@ add_custom_target(IOSENUM_H
    COMMAND cmake -E copy ${CMAKE_CURRENT_BINARY_DIR}/iosenum.h  ${HEADER_OUTPUT_PATH}/iosenum.h
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/iosenum.h 
 )
-install(FILES ${HEADER_OUTPUT_PATH}/iosenum.h DESTINATION cint/cint/include)
+install(FILES ${HEADER_OUTPUT_PATH}/iosenum.h DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint/include)
 
 set_target_properties(IOSENUM_H PROPERTIES FOLDER Builtins)
 #---special compile settings------------------------------------------------------------------------------
@@ -138,24 +138,24 @@ endif()
 ROOT_LINKER_LIBRARY(Cint loadfile.cxx LIBRARIES Cint_static ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 
 #---Create the cint cint executable-------------------------------------------------------------------------
-ROOT_EXECUTABLE(cint.exe ${CMAKE_CURRENT_SOURCE_DIR}/main/cppmain.cxx LIBRARIES Cint)
+ROOT_EXECUTABLE(cint.exe ${CMAKE_CURRENT_SOURCE_DIR}/main/cppmain.cxx LIBRARIES Cint NOINSTALL)
 
 #---Create the temporary cint_tmp executable----------------------------------------------------------------
 ROOT_EXECUTABLE(cint_tmp ${CMAKE_CURRENT_SOURCE_DIR}/main/cppmain.cxx 
-                         ${CMAKE_CURRENT_BINARY_DIR}/loadfile_tmp.cxx LIBRARIES Cint_static ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+                         ${CMAKE_CURRENT_BINARY_DIR}/loadfile_tmp.cxx LIBRARIES Cint_static ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} NOINSTALL)
 
 #---Trick to avoid building all dictionaties when CINT is changed-------------------------------------------
 add_custom_target(CINTTARGET DEPENDS cint_tmp)
 
 #---Create the makecint executable--------------------------------------------------------------------------
-ROOT_EXECUTABLE(makecint ${CMAKE_SOURCE_DIR}/cint/tool/makecint.cxx LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+ROOT_EXECUTABLE(makecint ${CMAKE_SOURCE_DIR}/cint/tool/makecint.cxx LIBRARIES ${CMAKE_THREAD_LIBS_INIT} NOINSTALL)
 
 #---Installation--------------------------------------------------------------------------------------------
 ROOT_INSTALL_HEADERS()
 if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-  install(DIRECTORY lib     DESTINATION cint/cint PATTERN ".dll" EXCLUDE PATTERN ".svn" EXCLUDE) 
-  install(DIRECTORY include DESTINATION cint/cint PATTERN ".dll" EXCLUDE PATTERN ".svn" EXCLUDE) 
-  install(DIRECTORY stl     DESTINATION cint/cint PATTERN ".dll" EXCLUDE PATTERN ".svn" EXCLUDE) 
+  install(DIRECTORY lib     DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint PATTERN ".dll" EXCLUDE PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint PATTERN ".dll" EXCLUDE PATTERN ".svn" EXCLUDE)
+  install(DIRECTORY stl     DESTINATION ${CMAKE_INSTALL_CINTINCDIR}/cint PATTERN ".dll" EXCLUDE PATTERN ".svn" EXCLUDE)
 endif()
 
 

cint/cint/Module.mk

@@ -211,7 +211,7 @@ endif
 endif
 
 # used in the main Makefile
-ALLHDRS     += $(CINTHT)
+ALLHDRS     += $(CINTHT) $(CINTINCLUDES)
 
 CINTSIZEFLAGS :=
 ifneq ($(CINTMAXSTRUCT),)

cint/cint/lib/dll_stl/lst.h

@@ -31,7 +31,29 @@ using namespace std;
 #pragma link C++ class list<char*>;
 #if defined(G__STRING_DLL) || defined(G__ROOT)
 #pragma link C++ class list<string>;
+#pragma link C++ operators list<string>::iterator;
 #endif
 
+#pragma link C++ operators list<int>::iterator;
+#pragma link C++ operators list<long>::iterator;
+#pragma link C++ operators list<float>::iterator;
+#pragma link C++ operators list<double>::iterator;
+#pragma link C++ operators list<void*>::iterator;
+#pragma link C++ operators list<char*>::iterator;
+
+#pragma link C++ operators list<int>::const_iterator;
+#pragma link C++ operators list<long>::const_iterator;
+#pragma link C++ operators list<float>::const_iterator;
+#pragma link C++ operators list<double>::const_iterator;
+#pragma link C++ operators list<void*>::const_iterator;
+#pragma link C++ operators list<char*>::const_iterator;
+
+#pragma link C++ operators list<int>::reverse_iterator;
+#pragma link C++ operators list<long>::reverse_iterator;
+#pragma link C++ operators list<float>::reverse_iterator;
+#pragma link C++ operators list<double>::reverse_iterator;
+#pragma link C++ operators list<void*>::reverse_iterator;
+#pragma link C++ operators list<char*>::reverse_iterator;
+
 #endif
 

cint/cint/lib/dll_stl/mp.h

@@ -45,6 +45,51 @@ using namespace std;
 #pragma link C++ class map<double,void*>;
 #pragma link C++ class map<double,char*>;
 
+#pragma link C++ operators map<int,int>::iterator;
+#pragma link C++ operators map<long,int>::iterator;
+#pragma link C++ operators map<long,long>::iterator;
+#pragma link C++ operators map<long,float>::iterator;
+#pragma link C++ operators map<long,double>::iterator;
+#pragma link C++ operators map<long,void*>::iterator;
+#pragma link C++ operators map<long,char*>::iterator;
+
+#pragma link C++ operators map<double,int>::iterator;
+#pragma link C++ operators map<double,long>::iterator;
+#pragma link C++ operators map<double,float>::iterator;
+#pragma link C++ operators map<double,double>::iterator;
+#pragma link C++ operators map<double,void*>::iterator;
+#pragma link C++ operators map<double,char*>::iterator;
+
+#pragma link C++ operators map<int,int>::const_iterator;
+#pragma link C++ operators map<long,int>::const_iterator;
+#pragma link C++ operators map<long,long>::const_iterator;
+#pragma link C++ operators map<long,float>::const_iterator;
+#pragma link C++ operators map<long,double>::const_iterator;
+#pragma link C++ operators map<long,void*>::const_iterator;
+#pragma link C++ operators map<long,char*>::const_iterator;
+
+#pragma link C++ operators map<double,int>::const_iterator;
+#pragma link C++ operators map<double,long>::const_iterator;
+#pragma link C++ operators map<double,float>::const_iterator;
+#pragma link C++ operators map<double,double>::const_iterator;
+#pragma link C++ operators map<double,void*>::const_iterator;
+#pragma link C++ operators map<double,char*>::const_iterator;
+
+#pragma link C++ operators map<int,int>::reverse_iterator;
+#pragma link C++ operators map<long,int>::reverse_iterator;
+#pragma link C++ operators map<long,long>::reverse_iterator;
+#pragma link C++ operators map<long,float>::reverse_iterator;
+#pragma link C++ operators map<long,double>::reverse_iterator;
+#pragma link C++ operators map<long,void*>::reverse_iterator;
+#pragma link C++ operators map<long,char*>::reverse_iterator;
+
+#pragma link C++ operators map<double,int>::reverse_iterator;
+#pragma link C++ operators map<double,long>::reverse_iterator;
+#pragma link C++ operators map<double,float>::reverse_iterator;
+#pragma link C++ operators map<double,double>::reverse_iterator;
+#pragma link C++ operators map<double,void*>::reverse_iterator;
+#pragma link C++ operators map<double,char*>::reverse_iterator;
+
 #pragma link off function pair<const int,int>::operator=;
 #pragma link off function pair<const long,int>::operator=;
 #pragma link off function pair<const long,long>::operator=;
@@ -68,13 +113,56 @@ using namespace std;
 #pragma link C++ class map<char*,void*>;
 #pragma link C++ class map<char*,char*>;
 
+#pragma link C++ operators map<char*,int>::iterator;
+#pragma link C++ operators map<char*,long>::iterator;
+#pragma link C++ operators map<char*,float>::iterator;
+#pragma link C++ operators map<char*,double>::iterator;
+#pragma link C++ operators map<char*,void*>::iterator;
+#pragma link C++ operators map<char*,char*>::iterator;
+
+#pragma link C++ operators map<char*,int>::const_iterator;
+#pragma link C++ operators map<char*,long>::const_iterator;
+#pragma link C++ operators map<char*,float>::const_iterator;
+#pragma link C++ operators map<char*,double>::const_iterator;
+#pragma link C++ operators map<char*,void*>::const_iterator;
+#pragma link C++ operators map<char*,char*>::const_iterator;
+
+#pragma link C++ operators map<char*,int>::reverse_iterator;
+#pragma link C++ operators map<char*,long>::reverse_iterator;
+#pragma link C++ operators map<char*,float>::reverse_iterator;
+#pragma link C++ operators map<char*,double>::reverse_iterator;
+#pragma link C++ operators map<char*,void*>::reverse_iterator;
+#pragma link C++ operators map<char*,char*>::reverse_iterator;
+
 #if defined(G__STRING_DLL) || defined(G__ROOT)
 #pragma link C++ class map<string,int>;
 #pragma link C++ class map<string,long>;
 #pragma link C++ class map<string,float>;
 #pragma link C++ class map<string,double>;
 #pragma link C++ class map<string,void*>;
 //#pragma link C++ class map<string,string>;
+
+#pragma link C++ operators map<string,int>::iterator;
+#pragma link C++ operators map<string,long>::iterator;
+#pragma link C++ operators map<string,float>::iterator;
+#pragma link C++ operators map<string,double>::iterator;
+#pragma link C++ operators map<string,void*>::iterator;
+//#pragma link C++ operators map<string,string>::iterator;
+
+#pragma link C++ operators map<string,int>::const_iterator;
+#pragma link C++ operators map<string,long>::const_iterator;
+#pragma link C++ operators map<string,float>::const_iterator;
+#pragma link C++ operators map<string,double>::const_iterator;
+#pragma link C++ operators map<string,void*>::const_iterator;
+//#pragma link C++ operators map<string,string>::const_iterator;
+
+#pragma link C++ operators map<string,int>::reverse_iterator;
+#pragma link C++ operators map<string,long>::reverse_iterator;
+#pragma link C++ operators map<string,float>::reverse_iterator;
+#pragma link C++ operators map<string,double>::reverse_iterator;
+#pragma link C++ operators map<string,void*>::reverse_iterator;
+//#pragma link C++ operators map<string,string>::reverse_iterator;
+
 #if defined(G__GNUC) && (G__GNUC>=3)
 #pragma link off class  pair<const string,int>;
 #pragma link off class  pair<const string,long>;