-//=============================================================================
-// File : Logger.idl
-// Created : nov 18 10:28:17 2002
-// Author : Vasily Rusyaev
-// Project : SALOME/PRO
-//=============================================================================
+// Copyright (C) 2003 CEA/DEN, EDF R&D
+//
+//
+//
+// File : Logger.idl
+// Author : Vasily Rusyaev
#ifndef SALOME_LOGGER_IDL
#define SALOME_LOGGER_IDL
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : MPIContainer.idl
+
#ifndef _SALOME_MPICONTAINER_IDL_
#define _SALOME_MPICONTAINER_IDL_
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : MPIObject.idl
+
#ifndef _SALOME_MPIOBJECT_IDL_
#define _SALOME_MPIOBJECT_IDL_
-//=====================================================
-// File : SALOMEDS.idl
-// Created : Thu Nov 29 21:25:39 2001
-// Author : Yves FRICAUD
-// Project : SALOME
-// Copyright : Open CASCADE 2001
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOMEDS.idl
+// Author : Yves FRICAUD
// $Header$
-//=====================================================
-
/*! \mainpage
\image html Application-About.png
*/
module SALOMEDS
{
- const string SALOMEDS__doc__ = "This package contains the interfaces used for creation, \nmanagment and modification of the study.";
/*! \typedef URL
Name of the file in which the %Study is saved.
Gets a persistent reference to the %Study.
*/
PersistentReference GetPersistentReference();
- const string GetPersistentReference__doc__ = "Gets a persistent reference to the study.";
/*!
Gets a transient reference to the %Study.
*/
SalomeReference GetTransientReference();
- const string GetTransientReference__doc__ = "Gets a transient reference to the study.";
/*!
Returns True if the %Study is empty
*/
boolean IsEmpty();
- const string IsEmpty__doc__ = "Returns True if the study is empty.";
/*!
Allows to find a %SComponent by its name.
\param aComponentName It's a string value in the Comment Attribute of the Component,
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
SComponent FindComponent (in string aComponentName);
- const string FindComponent__doc__ = "Allows to find a SComponent by its name.";
/*!
Allows to find a %SComponent by ID of the according %SObject
*/
SComponent FindComponentID(in ID aComponentID);
- const string FindComponentID__doc__ = "Allows to find a SComponent by ID of the according SObject.";
/*!
Allows to find a %SObject by the Name Attribute of this %SObject
<BR><VAR>See also <A href=exemple/Example19.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
SObject FindObject (in string anObjectName);
- const string FindObject__doc__ = "Allows to find a SObject by the Name Attribute of this SObject.";
/*!
Allows to find a %SObject by its ID
*/
SObject FindObjectID (in ID aObjectID);
- const string FindObjectID__doc__ = "Allows to find a SObject by its ID";
/*!
Allows to find a %SObject by IOR of the object belonging to this %SObject.
*/
SObject FindObjectIOR (in ID aObjectIOR);
- const string FindObjectIOR__doc__ = "Allows to find a SObject by IOR of the object belonging to this SObject.";
/*!
Returns a list of %SObjects belonging to this %Component. The Name Attribute
of these %SObjects should correspond to <VAR>anObjectName</VAR>.
*/
ListOfSObject FindObjectByName(in string anObjectName, in string aComponentName);
- const string FindObjectByName__doc__ = "Returns a list of SObjects belonging to this Component.";
/*!
Allows to find a %SObject by the path to it.
*/
SObject FindObjectByPath(in string thePath);
- const string FindObjectByPath__doc__ = "Allows to find a SObject by the path to it.";
/*!
Returns the path to the %SObject.
*/
string GetObjectPath(in Object theObject);
- const string GetObjectPath__doc__ = "Returns the path to the SObject";
/*!
Sets the context of the %Study.
*/
void SetContext(in string thePath);
- const string SetContext__doc__ = "Sets the context of the study";
/*!
Gets the context of the %Study
<BR><VAR>See also <A href=exemple/Example23.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string GetContext();
- const string GetContext__doc__ = "Gets the context of the study";
/*!
Returns a list of names of objects corresponding to the context.
\note If the parameter <VAR>theContext</VAR> is empty, then the current context will be used.
*/
ListOfStrings GetObjectNames(in string theContext);
- const string GetObjectNames__doc__ = "Returns a list of names of objects corresponding to the context.";
/*!
Returns a list of names of directories and subdirectories corresponding to the context.
\note If the parameter <VAR>theContext</VAR> is empty, then the current context will be used.
*/
ListOfStrings GetDirectoryNames(in string theContext);
- const string GetDirectoryNames__doc__ = "Returns a list of names of directories and subdirectories corresponding to the context.";
/*!
Returns a list of names of Files corresponding to the context.
\note If the parameter <VAR>theContext</VAR> is empty, then the current context will be used.
*/
ListOfStrings GetFileNames(in string theContext);
- const string GetFileNames__doc__ = "Returns a list of names of Files corresponding to the context.";
/*!
Returns a list of names of Components corresponding to the context.
\note If the parameter <VAR>theContext</VAR> is empty, then the current context will be used.
*/
ListOfStrings GetComponentNames(in string theContext);
- const string GetComponentNames__doc__ = "Returns a list of names of Components corresponding to the context.";
/*! \brief Creation of a new iterator of child levels
Creates a new iterator of child levels of the %SObject
*/
ChildIterator NewChildIterator(in SObject aSO);
- const string NewChildIterator__doc__ = "Creates a new iterator of child levels of the SObject";
/*! \brief Creation of a new iterator of the %SComponent
Creates a new iterator of the %SComponent.
*/
SComponentIterator NewComponentIterator();
- const string NewComponentIterator__doc__ = "Creates a new iterator of the SComponent.";
/*! \brief Creation of a %StudyBuilder
Creates a new %StudyBuilder to add or modify an object in the study.
*/
StudyBuilder NewBuilder() ;
- const string NewBuilder__doc__ = "Creates a new StudyBuilder to add or modify an object in the study.";
/*! \brief Labels dependency
Updates the map with IOR attribute. It's an inner method used for optimization.
*/
void UpdateIORLabelMap(in string anIOR, in string anEntry);
- const string UpdateIORLabelMap__doc__ = "Updates the map with IOR attribute. It's an inner method used for optimization.";
/*! \brief Getting properties of the study
*/
AttributeStudyProperties GetProperties();
- const string GetProperties__doc__ = "Returns the attriubte, which contains the properties of this study.";
/*!
Determines whether the %study has been saved
*/
attribute boolean IsSaved;
- const string IsSaved__doc__ = "Determines whether the study has been saved.";
/*!
Returns True if the %study has been modified and not saved.
*/
boolean IsModified();
- const string IsModified__doc__ = "Returns True if the study has been modified and not saved.";
/*!
Determines the file where the %study has been saved
*/
Returns the list of %SObjects which refers to %anObject.
*/
ListOfSObject FindDependances(in SObject anObject);
- const string FindDependances__doc__ = "Returns the list of SObjects which refers to anObject.";
/*! \brief The date of the last saving of the study
Returns the date of the last saving of study with format: "DD/MM/YYYY HH:MM"
*/
string GetLastModificationDate();
- const string GetLastModificationDate__doc__ = "Returns the date of the last saving of study with format: DD/MM/YYYY HH:MM";
/*! \brief The list of modification dates of the study
Returns the list of modification dates (without creation date) with format "DD/MM/YYYY HH:MM".
Note : the first modification begins the list.
*/
ListOfDates GetModificationsDate();
- const string GetModificationsDate__doc__ = "Returns the list of modification dates (without creation date) with format DD/MM/YYYY HH:MM.";
/*! \brief Object conversion.
Converts an object into IOR.
\return IOR
*/
string ConvertObjectToIOR(in Object theObject);
- const string ConvertObjectToIOR__doc__ = "Converts an object into IOR.";
/*! \brief Object conversion.
Converts IOR into an object.
\return An object
*/
Object ConvertIORToObject(in string theIOR);
- const string ConvertIORToObject__doc__ = "Converts IOR into an object.";
/*!
Gets a new %UseCaseBuilder.
*/
UseCaseBuilder GetUseCaseBuilder();
- const string GetUseCaseBuilder__doc__ = "Gets a new UseCaseBuilder.";
/*!
Closes the components in the study, removes itself from the %StudyManager.
*/
void Close();
- const string Close__doc__ = "Closes the components in the study, removes itself from the StudyManager.";
/*!
Enables(if isEnabled = True)/disables automatic addition of new %SObjects to the use case.
*/
void EnableUseCaseAutoFilling(in boolean isEnabled);
- const string EnableUseCaseAutoFilling__doc__ = "Enables(if isEnabled = True)/disables automatic addition of new SObjects to the use case.";
};
- const string Study__doc__ = "The Study interface contains a set of mrthods used for management of \nthe data produced by various components of SALOME platform.";
//==========================================================================
/*! \brief %Study Builder Interface
*/
SComponent NewComponent(in string ComponentDataType);
- const string NewComponent__doc__ = "Creates a new SComponent.";
/*! \brief Definition of the instance to the %SComponent
Defines the instance to the %SComponent.
*/
void DefineComponentInstance (in SComponent aComponent,in Object ComponentIOR);
- const string DefineComponentInstance__doc__ = "Defines the instance to the SComponent.";
/*! \brief Deletion of the %SComponent
Removes the %SComponent.
*/
void RemoveComponent(in SComponent aComponent);
- const string RemoveComponent__doc__ = "Removes the SComponent.";
/*! \brief Creation of a new %SObject
*/
SObject NewObject (in SObject theFatherObject);
- const string NewObject__doc__ = "Creates a new SObject.";
/*! \brief Creation of a new %SObject with a definite %tag
Creates a new %SObject with a definite %tag.
*/
SObject NewObjectToTag (in SObject theFatherObject, in long atag);
- const string NewObjectToTag__doc__ = "Creates a new SObject with a definite tag.";
/*! \brief Deletion of the %SObject
Removes a %SObject from the %StudyBuilder.
*/
void RemoveObject (in SObject anObject);
- const string RemoveObject__doc__ = "Removes a SObject from the StudyBuilder.";
/*! \brief Deletion of the %SObject with all his child objects.
Removes the %SObject with all his child objects.
*/
void RemoveObjectWithChildren(in SObject anObject);
- const string RemoveObjectWithChildren__doc__ = "Removes the SObject with all his child objects.";
/*!
Loads a %SComponent.
*/
void LoadWith (in SComponent sco, in Driver Engine) raises (SALOME::SALOME_Exception);
- const string LoadWith__doc__ = "Loads a SComponent.";
/*!
Loads a %SObject.
*/
void Load (in SObject sco);
- const string Load__doc__ = "Loads a SObject.";
/*! \brief Looking for or creating an attribute assigned to the %SObject
GenericAttribute FindOrCreateAttribute(in SObject anObject,
in string aTypeOfAttribute);
- const string FindOrCreateAttribute__doc__ = "Allows to find or create an attribute of a specific type which is assigned to the object.";
/*! \brief Looking for an attribute assigned to %SObject
boolean FindAttribute(in SObject anObject,
out GenericAttribute anAttribute,
in string aTypeOfAttribute);
- const string FindAttribute__doc__ = "Allows to find an attribute of a specific type which is assigned to the object.";
/*! \brief Deleting the attribute assigned to the %SObject
Removes the attribute of a specific type which is assigned to the object.
*/
void RemoveAttribute(in SObject anObject,
in string aTypeOfAttribute);
- const string RemoveAttribute__doc__ = "Removes the attribute of a specific type which is assigned to the object.";
/*! \brief Addition of a reference
Adds a reference between %anObject and %theReferencedObject.
void Addreference(in SObject anObject,
in SObject theReferencedObject) ;
- const string Addreference__doc__ = "Adds a reference between anObject and theReferencedObject.";
/*!
Adds a directory in the %Study.
<BR><VAR>See also <A href=exemple/Example23.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void AddDirectory(in string theName);
- const string AddDirectory__doc__ = "Adds a directory in the Study.";
/*! \brief Identification of the %SObject's substructure.
*/
void SetGUID(in SObject anObject, in string theGUID);
- const string SetGUID__doc__ = "Identification of the %SObject's substructure by GUID. \nIt has the following format: 00000000-0000-0000-0000-000000000000.";
/*!
Returns True if the %SObject has GUID.
*/
boolean IsGUID(in SObject anObject, in string theGUID);
- const string IsGUID__doc__ = "Returns True if the SObject has GUID.";
/*! \brief Creation of a new command
*/
void NewCommand(); // command management
- const string NewCommand__doc__ = "Creates a new command which can contain several different actions.";
/*! \brief Execution of the command
Commits all actions declared within this command.
*/
void CommitCommand() raises(LockProtection); // command management
- const string CommitCommand__doc__ = "Commits all actions declared within this command.";
/*!
Returns True if at this moment there is a command under execution.
*/
boolean HasOpenCommand();
- const string HasOpenCommand__doc__ = "Returns True if at this moment there is a command under execution.";
/*! \brief Cancelation of the command
Cancels all actions declared within the command.
<BR><VAR>See also <A href=exemple/Example17.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void AbortCommand(); // command management
- const string AbortCommand__doc__ = "Cancels all actions declared within the command.";
/*! \brief Undolimit
The number of actions which can be undone
*/
void Undo() raises (LockProtection);
- const string Undo__doc__ = "Cancels all actions of the last command.";
/*! \brief Redo method
Redoes all actions of the last command.
*/
void Redo() raises (LockProtection);
- const string Redo__doc__ = "Redoes all actions of the last command.";
/*!
Returns True if at this moment there are any actions which can be canceled.
<BR><VAR>See also <A href=exemple/Example16.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
boolean GetAvailableUndos();
- const string GetAvailableUndos__doc__ = "Returns True if at this moment there are any actions which can be canceled.";
/*!
Returns True if at this moment there are any actions which can be redone.
<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
boolean GetAvailableRedos();
- const string GetAvailableRedos__doc__ = "Returns True if at this moment there are any actions which can be redone.";
/*!
Sets the callback for addition of the given %SObject. Returns the previous callback.
*/
Callback SetOnAddSObject(in Callback theCallback);
- const string SetOnAddSObject__doc__ = "Sets the callback for addition of the given SObject.";
/*!
Sets the callback for removal of the given %SObject. Returns the previous callback.
*/
Callback SetOnRemoveSObject(in Callback theCallback);
- const string SetOnRemoveSObject__doc__ = " Sets the callback for removal of the given SObject.";
};
- const string StudyBuilder__doc__ = "The Study Builder Interface contains a set of methods used for adding and/or removing objects and attributes.";
//==========================================================================
/*! \brief %Study Manager interface
Determines whether the server has already been loaded or not.
*/
void ping();
- const string ping__doc__ = "Determines whether the server has already been loaded or not.";
/*! \brief Creation of a new %Study
*/
Study NewStudy(in string study_name);
- const string NewStudy__doc__ = "Creates a new study with a definite name.";
/*! \brief Open a study
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
Study Open (in URL aStudyUrl) raises (SALOME::SALOME_Exception);
- const string Open__doc__ = "Reads and activates the structure of the study objects.";
/*! \brief Closing the study
Closes the study.
*/
void Close(in Study aStudy);
- const string Close__doc__ = "Closes the study.";
/*! \brief Saving the study
Saves the study.
*/
void Save(in Study aStudy, in boolean theMultiFile);
- const string Save__doc__ = "Saves the study.";
+
+ void SaveASCII(in Study aStudy, in boolean theMultiFile);
/*! \brief Saving the study in a file
Saves the study in a specified file.
void SaveAs(in URL aUrl, // if the file already exists
in Study aStudy,
in boolean theMultiFile); // overwrite (as option)
- const string SaveAs__doc__ = "Saves the study in a specified file.";
+
+ void SaveAsASCII(in URL aUrl, // if the file already exists
+ in Study aStudy,
+ in boolean theMultiFile); // overwrite (as option)
+
+
/*! \brief List of open studies.
Returns the list of open studies in the current session.
*/
ListOfOpenStudies GetOpenStudies();
- const string GetOpenStudies__doc__ = "Returns the list of open studies in the current session.";
/*! \brief Getting a particular %Study picked by name
amongst the session collection picking it by name.
*/
Study GetStudyByName (in string aStudyName);
- const string GetStudyByName__doc__ = "Activates a particular study amongst the session collection picking it by name.";
/*! \brief Getting a particular %Study picked by ID
amongst the session collection picking it by ID.
*/
Study GetStudyByID (in short aStudyID);
- const string GetStudyByID__doc__ = "Activates a particular study amongst the session collection picking it by ID.";
// copy/paste methods
Returns True, if the given %SObject can be copied to the clipboard.
*/
boolean CanCopy(in SObject theObject);
- const string CanCopy__doc__ = "Returns True, if the given SObject can be copied to the clipboard.";
/*!
Returns True, if the given %SObject is copied to the clipboard.
*/
boolean Copy(in SObject theObject);
- const string Copy__doc__ = "Returns True, if the given SObject is copied to the clipboard.";
/*!
Returns True, if the object from the clipboard can be pasted to the given %SObject.
*/
boolean CanPaste(in SObject theObject);
- const string CanPaste__doc__ = "Returns True, if the object from the clipboard can be pasted to the given SObject.";
/*!
Returns the %SObject in which the object from the clipboard was pasted to.
*/
SObject Paste(in SObject theObject) raises (SALOMEDS::StudyBuilder::LockProtection);
- const string Paste__doc__ = "Returns the SObject in which the object from the clipboard was pasted to.";
};
- const string StudyManager__doc__ = "The purpose of the Manager is to manipulate the studies. \nThe StudyManager interface contains a set of methods to create, open,close and save a study.";
//==========================================================================
Returns ID of the %SObject.
*/
ID GetID();
- const string GetID__doc__ = "Returns ID of the SObject.";
/*! \brief Acquisition of the father %Component of the %SObject
Returns the father %Component of the %SObject.
*/
SComponent GetFatherComponent();
- const string GetFatherComponent__doc__ = "Returns the father Component of the SObject.";
/*! \brief Acquisition of the father %SObject of the %SObject
Returns the father %SObject of the given %SObject.
*/
SObject GetFather();
- const string GetFather__doc__ = "Returns the father SObject of the given SObject.";
/*! \brief %Tag of %SObject
Returns the %tag of the %SObject.
*/
short Tag();
- const string Tag__doc__ = "Returns the tag of the SObject.";
/*! \brief Looking for subobjects of an object.
Returns True if it finds a subobject of the %SObject with a definite tag.
*/
boolean FindSubObject (in long atag, out SObject obj);
- const string FindSubObject__doc__ = "Returns True if it finds a subobject of the SObject with a definite tag.";
/*! \brief Looking for attributes of the %SObject
Returns True if it finds an attribute of a definite type of the %SObject.
*/
boolean FindAttribute(out GenericAttribute anAttribute,
in string aTypeOfAttribute);
- const string FindAttribute__doc__ = "Returns True if it finds an attribute of a definite type of the given SObject.";
/*!
Returns the object which this %SObject refers to. It also returns True if it finds
this object.
*/
boolean ReferencedObject(out SObject obj); // A REVOIR
- const string ReferencedObject__doc__ = "Returns the object which this given SObject refers to. \nIt also returns True if it finds this object.";
/*! \brief Getting all attributes of the %SObject
Returns the list of all attributes of the %SObject.
*/
ListOfAttributes GetAllAttributes();
- const string GetAllAttributes__doc__ = "Returns the list of all attributes of the given SObject.";
/*! \brief Returning the study
Returns the study containing the given %SObject.
*/
Study GetStudy();
- const string GetStudy__doc__ = "Returns the study containing the given SObject.";
};
- const string SObject__doc__ = "The objects in the study are built by the StudyBuilder. \nThe SObject interface provides methods for elementary inquiries, \nlike getting an object ID or its attribuites.";
//==========================================================================
\note <BR>This exception is raised only outside the transaction.
*/
void CheckLocked() raises (LockProtection);
- const string CheckLocked__doc__ = "Checks whether the study is protected for modifications.";
};
- const string GenericAttribute__doc__ = "GenericAttribute is a base interface for all attributes which inherit its methods.";
Returns the data type of the %SComponent.
*/
string ComponentDataType();
- const string ComponentDataType__doc__ = "Returns the data type of the SComponent.";
/*!
Returns IOR of the according component.
*/
boolean ComponentIOR (out ID theID); //returns True if there is an instance
//In this case ID identifies this one
- const string ComponentIOR__doc__ = "Returns IOR of the according component.";
};
- const string SComponent__doc__ = "The SComponent interface is a specialization of the SObject interface. \nIt inherits the most of its methods from the SObject interface.";
//==========================================================================
Activates the %SComponentIterator.
*/
void Init();
- const string Init__doc__ = "Activates the SComponentIterator.";
/*! \brief Method More
Returns True if there is one more %SComponent in the list.
*/
boolean More();
- const string More__doc__ = "Returns True if there is one more SComponent in the list.";
/*! \brief Moving the iterator to the next %SComponent
Moves the iterator to the next %SComponent in the list.
*/
void Next();
- const string Next__doc__ = "Moves the iterator to the next SComponent in the list.";
/*!
Returns the %SComponent corresponding to the current %SComponent found by the iterator.
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
SComponent Value();
- const string Value__doc__ = "Returns the SComponent corresponding to the current SComponent found by the iterator.";
};
- const string SComponentIterator__doc__ = "This interface contains the methods allowing to iterate over all components in the list. \nThe search is started from the first SComponent in the list.";
//==========================================================================
/*! \brief %ChildIterator interface
Activates the %ChildIterator.
*/
void Init();
- const string Init__doc__ = "Activates the ChildIterator.";
/*! \brief Initialization of the Iterator for all child levels.
Activates the %ChildIterator (if True) for all child levels.
*/
void InitEx(in boolean allLevels);
- const string InitEx__doc__ = "Activates the ChildIterator (if True) for all child levels.";
/*! \brief Method More
Returns True if the %ChildIterator finds one more child level.
*/
boolean More();
- const string More__doc__ = "Returns True if the ChildIterator finds one more child level.";
/*!
Passes the iterator to the next level.
*/
void Next();
- const string Next__doc__ = "Passes the iterator to the next level.";
/*!
Returns the %SObject corresponding to the current object found by the iterator.
*/
SObject Value();
- const string Value__doc__ = "Returns the SObject corresponding to the current object found by the iterator.";
};
- const string ChildIterator__doc__ = "This interface contains methods which allow to iterate over all child levels.";
//==========================================================================
//==========================================================================
Activates the %UseCaseIterator. If <VAR>allLevels</VAR> is True the Iterator is activated for all subobjects.
*/
void Init(in boolean allLevels);
- const string Init__doc__ = "Activates the UseCaseIterator. \nIf the value of the parameter allLevels is True the Iterator is activated for all subobjects.";
/*! \brief Method More
Returns True if the %UseCaseIterator finds one more object.
*/
boolean More();
- const string More__doc__ = "Returns True if the UseCaseIterator finds one more object.";
/*!
Passes the iterator to the next object.
*/
void Next();
- const string Next__doc__ = "Passes the iterator to the next object.";
/*!
Returns the %SObject corresponding to the current object found by the Iterator.
*/
SObject Value();
- const string Value__doc__ = "Returns the SObject corresponding to the current object found by the Iterator.";
};
- const string UseCaseIterator__doc__ = "This interface contains a set of methods used for \niteration over the objects in the use case.";
//==========================================================================
//==========================================================================
Adds to the use case an object <VAR>theObject</VAR> as a child of the current object of the use case.
*/
boolean Append(in SObject theObject);
- const string Append__doc__ = "Adds to the use case an object as a child of the current object of the use case.";
/*!
Removes an object <VAR>theObject</VAR> from the use case.
*/
boolean Remove(in SObject theObject);
- const string Remove__doc__ = "Removes an object from the use case.";
/*!
Adds a child object <VAR>theObject</VAR> to the given father <VAR>theFather</VAR> object in the use case.
*/
boolean AppendTo(in SObject theFather, in SObject theObject);
- const string AppendTo__doc__ = "Adds a child object to the given father object in the use case.";
/*!
Inserts in the use case the object <VAR>theFirst</VAR> before the object <VAR>theNext</VAR>.
*/
boolean InsertBefore(in SObject theFirst, in SObject theNext);
- const string InsertBefore__doc__ = "Inserts in the use case an object before another object.";
/*!
Sets the current object of the use case.
*/
boolean SetCurrentObject(in SObject theObject);
- const string SetCurrentObject__doc__ = "Sets the current object of the use case.";
/*!
Makes the root object to be the current object of the use case.
*/
boolean SetRootCurrent();
- const string SetRootCurrent__doc__ = "Makes the root object to be the current object of the use case.";
/*!
Returns True if the given object <VAR>theObject</VAR> of the use case has child objects.
*/
boolean HasChildren(in SObject theObject);
- const string HasChildren__doc__ = "Returns True if the given object of the use case has child objects.";
/*!
Sets the name of the use case.
*/
boolean SetName(in string theName);
- const string SetName__doc__ = "Sets the name of the use case.";
/*!
Gets the name of the use case.
*/
string GetName();
- const string GetName__doc__ = "Gets the name of the use case.";
/*!
Returns True if the given object <VAR>theObject</VAR> represents a use case.
*/
boolean IsUseCase(in SObject theObject);
- const string IsUseCase__doc__ = "Returns True if the given object represents a use case.";
/*!
Gets the current object of the use case.
*/
SObject GetCurrentObject();
- const string GetCurrentObject__doc__ = "Gets the current object of the use case.";
/*!
Creates a new use case in the use case browser.
*/
SObject AddUseCase(in string theName);
- const string AddUseCase__doc__ = "Creates a new use case in the use case browser.";
/*!
Returns the %UseCaseIterator for the given object <VAR>theObject</VAR> in the use case.
*/
UseCaseIterator GetUseCaseIterator(in SObject theObject);
- const string GetUseCaseIterator__doc__ = "Returns the UseCaseIterator for the given object in the use case.";
};
- const string UseCaseBuilder__doc__ = "The UseCaseBuilder interface contains a set of methods \nused for management of the use case in the study.";
//==========================================================================
//==========================================================================
/*! \brief The callback interface
Invokes the corresponding method <VAR>Append</VAR> of the %UseCaseBuilder.
*/
void OnAddSObject(in SObject theObject);
- const string OnAddSObject__doc__ = "Invokes the corresponding method Append of the UseCaseBuilder.";
/*!
Invokes the corresponding method <VAR>Remove</VAR> of the %UseCaseBuilder.
*/
void OnRemoveSObject(in SObject theObject);
- const string OnRemoveSObject__doc__ = "Invokes the corresponding method Remove of the UseCaseBuilder.";
};
- const string Callback__doc__ = "The callback interface contains a set of methods which are called \nwhen adding or removing of the objects by the StudyBuilder.";
//==========================================================================
/*! \brief %Driver interface
TMPFile Save(in SComponent theComponent, in string theURL, in boolean isMultiFile);
- const string Save__doc__ = "This method is called by the StudyManager when saving a study.";
+ TMPFile SaveASCII(in SComponent theComponent, in string theURL, in boolean isMultiFile);
/*! \brief Loading the data.
*/
boolean Load(in SComponent theComponent, in TMPFile theStream, in string theURL, in boolean isMultiFile);
- const string Load__doc__ = "This method is called by the StudyManager when opening a study.";
+ boolean LoadASCII(in SComponent theComponent, in TMPFile theStream, in string theURL, in boolean isMultiFile);
/*! \brief Closing of the study
*/
void Close (in SComponent aSComponent);
- const string Close__doc__ = "This method Close is called by the StudyManager when closing a study.";
//void Close ( in string aIORSComponent);
/*! \brief The type of the data
*/
string ComponentDataType();
- const string ComponentDataType__doc__ = "Returns the type of data produced by the Component in the study.";
// Driver Transient -> persistent called for each object in study
/*!
Transforms IOR into PersistentID of the object. It is called for each
object in the %study.
*/
- string IORToLocalPersistentID (in SObject theSObject, in string IORString, in boolean isMultiFile);
- const string IORToLocalPersistentID__doc__ = "Transforms IOR into PersistentID of the object.";
+ string IORToLocalPersistentID (in SObject theSObject,
+ in string IORString,
+ in boolean isMultiFile,
+ in boolean isASCII);
/*!
Transforms PersistentID into IOR of the object. It is called for each
object in the %study.
*/
- string LocalPersistentIDToIOR (in SObject theSObject, in string aLocalPersistentID, in boolean isMultiFile)
+ string LocalPersistentIDToIOR (in SObject theSObject,
+ in string aLocalPersistentID,
+ in boolean isMultiFile,
+ in boolean isASCII)
raises (SALOME::SALOME_Exception);
- const string LocalPersistentIDToIOR__doc__ = "Transforms PersistentID into IOR of the object.";
// Publishing in the study
/*! \brief Publishing in the study
Returns True if the given %Component can publish the %object in the %study.
*/
boolean CanPublishInStudy(in Object theIOR) raises (SALOME::SALOME_Exception);
- const string CanPublishInStudy__doc__ = "Returns True if the given Component can publish the object in the study.";
/*! \brief Publishing in the study
Publishes the given object in the %study, using the algorithm of this component.
automatically by the component.
*/
SObject PublishInStudy(in Study theStudy, in SObject theSObject, in Object theObject, in string theName);
- const string PublishInStudy__doc__ = "Publishes the given object in the study, using the algorithm of this component.";
// copy/paste methods
Returns True, if the given %SObject can be copied to the clipboard.
*/
boolean CanCopy(in SObject theObject);
- const string CanCopy__doc__ = "Returns True, if the given SObject can be copied to the clipboard.";
/*!
Returns the object %ID and the %TMPFile of the object from the given %SObject.
*/
TMPFile CopyFrom(in SObject theObject, out long theObjectID);
- const string CopyFrom__doc__ = "Returns the object ID and the TMPFile of the object from the given SObject.";
/*!
Returns True, if the component can paste the object with given %ID of the component with name <VAR>theComponentName</VAR>.
*/
boolean CanPaste(in string theComponentName, in long theObjectID);
- const string CanPaste__doc__ = "Returns True, if the component can paste the object with given ID of the component with name <VAR>theComponentName</VAR>.";
/*!
Returns the %SObject of the pasted object.
*/
SObject PasteInto(in TMPFile theStream, in long theObjectID, in SObject theObject);
- const string PasteInto__doc__ = "Returns the SObject of the pasted object.";
};
- const string Driver__doc__ = "This interface contains a set of methods used for the management \nof the object produced in the study by a component.";
};
#endif
-//=====================================================
-// File : SALOMEDS.idl
-// Created : Thu Jul 4 19:25:39 2002
-// Author : Yves FRICAUD
-// Project : SALOME
-// Copyright : Open CASCADE 2002
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOMEDS.idl
+// Author : Yves FRICAUD
// $Header$
-//=====================================================
-//The following attributes can be assigned to SObject
-//=====================================================
+
/*! \file SALOMEDS_Attributes.idl This file contains a set of interfaces
for the attributes which can be assigned to %SObject
*/
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
double Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute.
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in double value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeReal__doc__ = "Attribute allowing to store a real value.";
//==========================================================================
/*! \brief Attribute allowing to store an integer value
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
long Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in long value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeInteger__doc__ = "Attribute allowing to store an integer value.";
//==========================================================================
/*! \brief Attribute - sequence of real values
\param other Initially assigned sequence of real numbers.
*/
void Assign (in DoubleSeq other);
- const string Assign__doc__ = "Initialization of the attribute with initial data.";
/*!
Returns the sequence of real numbers stored in the attribute.
*/
DoubleSeq CorbaSequence();
- const string CorbaSequence__doc__ = "Returns the sequence of real numbers stored in the attribute.";
/*!
Adds to the end of the sequence a real number.
\param value A real number added to the sequence.
<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void Add (in double value);
- const string Add__doc__ = "Adds to the end of the sequence a real number.";
/*!
Removes a real number with a definite index
from the sequence of real numbers stored in the Attribute.
*/
void Remove(in long index);
- const string Remove__doc__ = "Removes a real number with a definite index from the sequence of real numbers stored in the attribute.";
/*!
Substitutes a real number with a definite index for another real number.
<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void ChangeValue(in long index, in double value);
- const string ChangeValue__doc__ = "Substitutes a real number with a definite index for another real number.";
/*!
Returns a real number with a definite index
in the sequence of real numbers stored in the Attribute.
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
double Value(in short index);
- const string Value__doc__ = "Returns a real number with a definite index in the \nsequence of real numbers stored in the attribute.";
/*!
Returns the length of the sequence of real numbers stored in the Attribute.
<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
long Length();
- const string Length__doc__ = "Returns the length of the sequence of real numbers stored in the attribute.";
};
- const string AttributeSequenceOfReal__doc__ = "Attribute - sequence of real values.";
//==========================================================================
/*! \brief Attribute - sequence of integer
\param other Initially assigned sequence of integer numbers.
*/
void Assign (in LongSeq other);
- const string Assign__doc__ = "Initialization of the attribute with initial data.";
/*!
Returns the sequence of integer numbers stored in the Attribute.
*/
LongSeq CorbaSequence();
- const string CorbaSequence__doc__ = "Returns the sequence of integer numbers stored in the attribute.";
/*!
Adds to the end of the sequence an integer number.
\param value An integer number added to the sequence.
*/
void Add (in long value);
- const string Add__doc__ = "Adds to the end of the sequence an integer number.";
/*!
Removes an integer number with a definite index
from the sequence of integer numbers stored in the Attribute.
*/
void Remove(in long index);
- const string Remove__doc__ = "Removes an integer number with a definite index from the sequence of integer numbers stored in the attribute.";
/*!
Substitutes an integer number with a definite index for another integer number.
*/
void ChangeValue(in long index, in long value);
- const string ChangeValue__doc__ = "Substitutes an integer number with a definite index for another integer number.";
/*!
Returns an integer number with a definite index
in the sequence of integer numbers stored in the Attribute.
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
long Value(in short index);
- const string Value__doc__ = "Returns an integer number with a definite index in the \nsequence of integer numbers stored in the attribute.";
/*!
Returns the length of the sequence of integer numbers stored in the Attribute.
<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
long Length();
- const string Length__doc__ = "Returns the length of the sequence of integer numbers stored in the attribute.";
};
//==========================================================================
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in string value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeName__doc__ = "This attribute stores a string value, which corresponds to the name of the SObject \nor to the name of corresponding object.";
//==========================================================================
/*! \brief Comment attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in string value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeComment__doc__ = "This attribute stores a string value containing supplementary information about \nthe SObject. In particular it contains the data type of the SComponent.";
//==========================================================================
/*! \brief IOR attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in string value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeIOR__doc__ = "This attribute stores a string value identifying a runtime object.\nIn particular it contains CORBA Interoperable Object Reference.";
//==========================================================================
/*! \brief Persistent reference attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in string value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributePersistentRef__doc__ = "This attribute stores a persistent identifier of the object.";
//==========================================================================
//Below the list of presentation attributes for display study tree in browser
*/
boolean IsDrawable();
- const string IsDrawable__doc__ = "Returns TRUE if the item is drawable (as it is by default) and FALSE if it isn't.";
/*!
Sets the items to be drawable if <VAR>value</VAR> is TRUE (the default) or not to be selectable if <VAR>value</VAR>is FALSE.
<BR><VAR>See also <A href=exemple/Example8.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetDrawable(in boolean value);
- const string SetDrawable__doc__ = "Sets the items to be drawable if value is TRUE (the default) or not to be selectable if value is FALSE.";
};
- const string AttributeDrawable__doc__ = "This is a presentation attribute necessary for display of the study tree in the browser. \nThe item associated to SObject is created/displayed if TRUE.";
//==========================================================================
/*! \brief Selectable flag Attribute.
*/
boolean IsSelectable();
- const string IsSelectable__doc__ = "Returns TRUE if the item is selectable (as it is by default) and FALSE if it isn't.";
/*!
Sets the items to be selectable if <VAR>value</VAR> is TRUE (the default) or not to be selectable if <VAR>value</VAR>is FALSE.
<BR><VAR>See also <A href=exemple/Example9.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetSelectable(in boolean value);
- const string SetSelectable__doc__ = "Sets the items to be selectable if value is TRUE (the default) or not to be selectable if value is FALSE.";
};
- const string AttributeSelectable__doc__ = "This is a presentation attribute necessary for display of the study tree in the browser. \nThe item is selectable by SALOME selection mechanism if TRUE.";
//==========================================================================
/*! \brief Expandable flag Attribute.
*/
boolean IsExpandable();
- const string IsExpandable__doc__ = "Returns TRUE if this item is expandable even when it has no children.";
/*!
Sets this item to be expandable even if it has no children if <VAR>value</VAR> is TRUE, and to be
expandable only if it has children if <VAR>value</VAR> is FALSE (the default).
*/
void SetExpandable(in boolean value);
- const string SetExpandable__doc__ = "Sets this item to be expandable even if it has no children if value is TRUE, and to be \nexpandable only if it has children if value is FALSE (the default).";
};
- const string AttributeExpandable__doc__ = "This is a presentation attribute necessary for display of the study tree in the browser. \nIt sets this item to be expandable even if it has no children if value is TRUE. \nIf value is FALSE expandable only if it has children.";
//==========================================================================
/*! \brief Opened flag Attribute.
*/
boolean IsOpened();
- const string IsOpened__doc__ = "Returns TRUE if this item is open (its children are visible) and FALSE if it isn't.";
/*!
Sets this item to be open (its children are visible) if <VAR>value</VAR> is TRUE, and to be closed
(its children are not visible) if <VAR>value</VAR> is FALSE.
*/
void SetOpened(in boolean value);
- const string SetOpened__doc__ = "Sets this item to be open (its children are visible) if value is TRUE, and to be closed \n(its children are not visible) if value is FALSE.";
};
- const string AttributeOpened__doc__ = "This is a presentation attribute necessary for display of the study tree in the browser. \nIt sets this item to be open (its children are visible) if bool is TRUE, and to be closed (its children \nare not visible) if bool is FALSE.";
//==========================================================================
/*! \brief TextColorAttribute.
*/
Color TextColor();
- const string TextColor__doc__ = "Returns the color of an item.";
/*!
Sets the color of an item.
<BR><VAR>See also <A href=exemple/Example12.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetTextColor(in Color value);
- const string SetTextColor__doc__ = "Sets the color of an item.";
};
- const string AttributeTextColor__doc__ = "This attribute sets the color of an item.";
//==========================================================================
/*! \brief TextHighlightColorAttribute.
*/
Color TextHighlightColor();
- const string TextHighlightColor__doc__ = "Returns the highlight color of an item.";
/*!
Sets the highlight color of an item.
<BR><VAR>See also <A href=exemple/Example13.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetTextHighlightColor(in Color value);
- const string SetTextHighlightColor__doc__ = "Sets the highlight color of an item.";
};
- const string AttributeTextHighlightColor__doc__ = "This attribute sets the highlight color of an item.";
//==========================================================================
/*! \brief PixMapAttribute.
Returns True if there is an icon before the name of the item.
*/
boolean HasPixMap();
- const string HasPixMap__doc__ = "Returns True if there is an icon before the name of the item.";
/*!
Returns the name of the icon.
<BR><VAR>See also <A href=exemple/Example14.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string GetPixMap();
- const string GetPixMap__doc__ = "Returns the name of the icon.";
/*!
Sets the name of the icon.
<BR><VAR>See also <A href=exemple/Example14.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetPixMap(in string value);
- const string SetPixMap__doc__ = "Sets the name of the icon.";
};
- const string AttributePixMap__doc__ = "This attribute stores an icon which is put before the name of an item.";
//==========================================================================
/*! \brief TreeNodeAttribute.
Sets the father TreeNode to this TreeNode.
*/
void SetFather(in AttributeTreeNode value);
- const string SetFather__doc__ = "Sets the father TreeNode to this TreeNode.";
/*!
Returns True if there is the father TreeNode of this TreeNode.
*/
boolean HasFather();
- const string HasFather__doc__ = "Returns True if there is the father TreeNode of this TreeNode.";
/*!
Returns the father Treenode of this TreeNode.
*/
AttributeTreeNode GetFather();
- const string GetFather__doc__ = "Returns the father Treenode of this TreeNode.";
/*!
Sets the previous brother TreeNode to this treeNode.
*/
void SetPrevious(in AttributeTreeNode value);
- const string SetPrevious__doc__ = "Sets the previous brother TreeNode to this treeNode.";
/*!
Returns True if there is the previous brother TreeNode of this TreeNode.
*/
boolean HasPrevious();
- const string HasPrevious__doc__ = "Returns True if there is the previous brother TreeNode of this TreeNode.";
/*!
Returns the previous brother TreeNode of this TreeNode.
*/
AttributeTreeNode GetPrevious();
- const string GetPrevious__doc__ = "Returns the previous brother TreeNode of this TreeNode.";
/*!
Sets the next brother TreeNode to this treeNode.
*/
void SetNext(in AttributeTreeNode value);
- const string SetNext__doc__ = "Sets the next brother TreeNode to this treeNode.";
/*!
Returns True if there is the next brother TreeNode of this TreeNode.
*/
boolean HasNext();
- const string HasNext__doc__ = "Returns True if there is the next brother TreeNode of this TreeNode.";
/*!
Returns the previous brother TreeNode of this TreeNode.
*/
AttributeTreeNode GetNext();
- const string GetNext__doc__ = "Returns the previous brother TreeNode of this TreeNode.";
/*!
Sets the first child TreeNode to this treeNode.
*/
void SetFirst(in AttributeTreeNode value);
- const string SetFirst__doc__ = "Sets the first child TreeNode to this treeNode.";
/*!
Returns True if there is the first child TreeNode of this TreeNode.
*/
boolean HasFirst();
- const string HasFirst__doc__ = "Returns True if there is the first child TreeNode of this TreeNode.";
/*!
Returns the first child TreeNode of this TreeNode.
*/
AttributeTreeNode GetFirst();
- const string GetFirst__doc__ = "Returns the first child TreeNode of this TreeNode.";
/*!
Sets ID of the tree. TreeNodes of one tree have the same ID.
*/
void SetTreeID(in string value);
- const string SetTreeID__doc__ = "Sets ID of the tree. TreeNodes of one tree have the same ID.";
/*!
Gets ID of the tree.
*/
string GetTreeID();
- const string GetTreeID__doc__ = "Gets ID of the tree.";
/*!
Adds a child TreeNode to the end of the list of children of this Treenode.
*/
void Append(in AttributeTreeNode value);
- const string Append__doc__ = "Adds a child TreeNode to the end of the list of children of this Treenode.";
/*!
Adds a child TreeNode to the beginning of the list of children of this Treenode.
*/
void Prepend(in AttributeTreeNode value);
- const string Prepend__doc__ = "Adds a child TreeNode to the beginning of the list of children of this Treenode.";
/*!
Adds a brother TreeNode before this Treenode.
In this case the both TreeNodes will belong to the same father.
*/
void InsertBefore(in AttributeTreeNode value);
- const string InsertBefore__doc__ = "Adds a brother TreeNode before this Treenode. In this case the both TreeNodes will belong to the same father.";
/*!
Adds a brother TreeNode after this Treenode.
In this case the both TreeNodes will belong to the same father.
*/
void InsertAfter(in AttributeTreeNode value);
- const string InsertAfter__doc__ = "Adds a brother TreeNode after this Treenode. In this case the both TreeNodes will belong to the same father.";
/*!
Deletes a TreeNode.
<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void Remove();
- const string Remove__doc__ = "Deletes a TreeNode.";
/*!
Returns the depth of the TreeNode in the
(i.e.: the depth of the root TreeNode is 0).
*/
long Depth();
- const string Depth__doc__ = "Returns the depth of the TreeNode in the structure, it means the number of fathers of the given TreeNode. \n(i.e.: the depth of the root TreeNode is 0).";
/*!
Returns True if it is a root TreeNode.
*/
boolean IsRoot();
- const string IsRoot__doc__ = "Returns True if it is a root TreeNode.";
/*!
Returns True if this TreeNode is a descendant of the TreeNode.
*/
boolean IsDescendant(in AttributeTreeNode value);
- const string IsDescendant__doc__ = "Returns True if this TreeNode is a descendant of the TreeNode.";
/*!
Returns True if this TreeNode is the father of the TreeNode.
*/
boolean IsFather(in AttributeTreeNode value);
- const string IsFather__doc__ = "Returns True if this TreeNode is the father of the TreeNode.";
/*!
Returns True if this TreeNode is a child of the TreeNode.
*/
boolean IsChild(in AttributeTreeNode value);
- const string IsChild__doc__ = "Returns True if this TreeNode is a child of the TreeNode.";
/*!
Returns ID of the according %SObject.
*/
string Label();
- const string Label__doc__ = "Returns ID of the according SObject.";
};
- const string AttributeTreeNode__doc__ = "A set of these attributes on the SObjects of the study forms an inner auxiliary \ntree whith its own structure and identifier. The quantity of such trees with different \nidentifiers can be arbitrary.";
//==========================================================================
/*! \brief LocalID attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
long Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute.
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in long value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeLocalID__doc__ = "Attribute describing the link between a SObject and a local object in the component.";
//==========================================================================
/*! \brief Attribute storing GUID
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
string Value();
- const string Value__doc__ = "Returns the value of this attribute.";
/*!
Sets the value of this attribute
<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
*/
void SetValue(in string value);
- const string SetValue__doc__ = "Sets the value of this attribute.";
};
- const string AttributeUserID__doc__ = "Attribute allowing to store GUID.";
//==========================================================================
/*! \brief %AttributeTarget iterface
*/
void Add(in SObject anObject);
- const string Add__doc__ = "Adds a SObject to the list of SObjects which refer to this SObject.";
/*!
Returns the list of %SObjects which refer to this %SObject.
*/
SALOMEDS::Study::ListOfSObject Get();
- const string Get__doc__ = "Returns the list of SObjects which refer to this SObject.";
/*!
Deletes a %SObject from the list of %SObjects which refer to this %SObject.
*/
void Remove(in SObject anObject);
- const string Remove__doc__ = "Deletes a SObject from the list of SObjects which refer to this SObject.";
};
- const string AttributeTarget__doc__ = "Adds a SObject to the list of SObjects which refer to this SObject.";
//==========================================================================
/*! \brief %AttributeTableOfInteger interface
Sets the title of the table.
*/
void SetTitle(in string theTitle);
- const string SetTitle__doc__ = "Sets the title of the table.";
/*!
Returns the title of the table.
*/
string GetTitle();
- const string GetTitle__doc__ = "Returns the title of the table.";
/*!
Sets the title of a row with a definite index.
*/
void SetRowTitle(in long theIndex, in string theTitle) raises(IncorrectIndex);
- const string SetRowTitle__doc__ = "Sets the title of a row with a definite index.";
/*!
Sets the titles for all rows of the table.
*/
void SetRowTitles(in StringSeq theTitles) raises(IncorrectArgumentLength);
- const string SetRowTitles__doc__ = "Sets the titles for all rows of the table.";
/*!
Returns the titles of all rows of the table.
*/
StringSeq GetRowTitles();
- const string GetRowTitles__doc__ = "Returns the titles of all rows of the table.";
/*!
Sets the title of a column with a definite index.
*/
void SetColumnTitle(in long theIndex, in string theTitle) raises(IncorrectIndex);
- const string SetColumnTitle__doc__ = "Sets the title of a column with a definite index.";
/*!
Sets the titles for all columns of the table.
*/
void SetColumnTitles(in StringSeq theTitles) raises(IncorrectArgumentLength);
- const string SetColumnTitles__doc__ = "Sets the titles for all columns of the table.";
/*!
Returns the titles of all columns of the table.
*/
StringSeq GetColumnTitles();
- const string GetColumnTitles__doc__ = "Returns the titles of all columns of the table.";
//Rows units
/*!
Sets the unit of a row with a definite index.
*/
void SetRowUnit(in long theIndex, in string theUnit) raises(IncorrectIndex);
- const string SetRowUnit__doc__ = "Sets the unit of a row with a definite index.";
/*!
Sets the units for all rows of the table.
*/
void SetRowUnits(in StringSeq theUnits) raises(IncorrectArgumentLength);
- const string SetRowUnits__doc__ = "Sets the units for all rows of the table.";
/*!
Returns the units of all rows of the table.
*/
StringSeq GetRowUnits();
- const string GetRowUnits__doc__ = "Returns the units of all rows of the table.";
// table information
/*!
Returns the number of rows of the table.
*/
long GetNbRows();
- const string GetNbRows__doc__ = "Returns the number of rows of the table.";
/*!
Returns the number of columns of the table.
*/
long GetNbColumns();
- const string GetNbColumns__doc__ = "Returns the number of columns of the table.";
// operations with rows
/*!
Adds a row to the end of the table.
*/
void AddRow(in LongSeq theData) raises(IncorrectArgumentLength);
- const string AddRow__doc__ = "Adds a row to the end of the table.";
/*!
Sets the values of all elements of the row.
*/
void SetRow(in long theRow, in LongSeq theData) raises(IncorrectArgumentLength, IncorrectIndex);
- const string SetRow__doc__ = "Sets the values of all elements of the row.";
/*!
Returns the row of the table.
*/
LongSeq GetRow(in long theRow) raises(IncorrectIndex);
- const string GetRow__doc__ = "Returns the row of the table.";
// operations with columns
/*!
Adds a column to the end of the table.
*/
void AddColumn(in LongSeq theData) raises(IncorrectArgumentLength);
- const string AddColumn__doc__ = "Adds a column to the end of the table.";
/*!
Sets the values of all elements of the column.
*/
void SetColumn(in long theColumn, in LongSeq theData) raises(IncorrectArgumentLength, IncorrectIndex);
- const string SetColumn__doc__ = "Sets the values of all elements of the column.";
/*!
Returns the column of the table.
*/
LongSeq GetColumn(in long theColumn) raises(IncorrectIndex);
- const string GetColumn__doc__ = "Returns the column of the table.";
// operations with elements
/*!
\param theColumn The column, where the value will be placed.
*/
void PutValue(in long theValue, in long theRow, in long theColumn) raises(IncorrectIndex);
- const string PutValue__doc__ = "Puts a value in a definite row theRow and column theColumn of the table.";
/*!
Returns True if there is a value in the table.
\param theRow The row containing the value
\param theColumn The column containing the value
*/
boolean HasValue(in long theRow, in long theColumn);
- const string HasValue__doc__ = "Returns True if there is a value in a definite row and column of the table.";
/*!
Returns the value from the table.
\param theRow The row containing the value
\param theColumn The column containing the value
*/
long GetValue(in long theRow, in long theColumn) raises(IncorrectIndex);
- const string GatValue__doc__ = "Returns the value from a definite row and column of the table.";
/*!
Sets the max number of colums in the table.
\note It'd better to set it before filling the table.
*/
void SetNbColumns(in long theNbColumns);
- const string SetNbColumns__doc__ = "Sets the max number of colums in the table. ";
/*!
Returns the indices of the row where the values are defined.
*/
LongSeq GetRowSetIndices(in long theRow) raises(IncorrectIndex);
- const string GetRowSetIndices__doc__ = "Returns the indices of the row where the values are defined.";
// operations with files
/*!
Reads a table from a file.
*/
boolean ReadFromFile(in SALOMEDS::TMPFile theStream);
- const string ReadFromFile__doc__ = "Reads a table from a file.";
/*!
Saves a table into a file.
*/
SALOMEDS::TMPFile SaveToFile();
- const string SaveToFile__doc__ = "Saves a table into a file.";
};
- const string AttributeTableOfInteger__doc__ = "This attribute allows to store a table of integers (indexing from 1 like in CASCADE) \nand string titles of this table, of each row, of each column.";
//==========================================================================
/*! \brief %AttributeTableOfReal interface
Sets the title of the table.
*/
void SetTitle(in string theTitle);
- const string SetTitle__doc__ = "Sets the title of the table.";
/*!
Returns the title of the table.
*/
string GetTitle();
- const string GetTitle__doc__ = "Returns the title of the table.";
/*!
Sets the title of a row with a definite index.
*/
void SetRowTitle(in long theIndex, in string theTitle) raises(IncorrectIndex);
- const string SetRowTitle__doc__ = "Sets the title of a row with a definite index.";
/*!
Sets the titles for all rows of the table.
*/
void SetRowTitles(in StringSeq theTitles) raises(IncorrectArgumentLength);
- const string SetRowTitles__doc__ = "Sets the titles for all rows of the table.";
/*!
Returns the titles of all rows of the table.
*/
StringSeq GetRowTitles();
- const string GetRowTitles__doc__ = "Returns the titles of all rows of the table.";
/*!
Sets the title of a column with a definite index.
*/
void SetColumnTitle(in long theIndex, in string theTitle) raises(IncorrectIndex);
- const string SetColumnTitle__doc__ = "Sets the title of a column with a definite index.";
/*!
Sets the titles for all columns of the table.
*/
void SetColumnTitles(in StringSeq theTitles) raises(IncorrectArgumentLength);
- const string SetColumnTitles__doc__ = "Sets the titles for all columns of the table.";
/*!
Returns the titles of all columns of the table.
*/
StringSeq GetColumnTitles();
- const string GetColumnTitles__doc__ = "Returns the titles of all columns of the table.";
//Rows units
/*!
Sets the unit of a row with a definite index.
*/
void SetRowUnit(in long theIndex, in string theUnit) raises(IncorrectIndex);
- const string SetRowUnit__doc__ = "Sets the unit of a row with a definite index.";
/*!
Sets the units for all rows of the table.
*/
void SetRowUnits(in StringSeq theUnits) raises(IncorrectArgumentLength);
- const string SetRowUnits__doc__ = "Sets the units for all rows of the table.";
/*!
Returns the units of all rows of the table.
*/
StringSeq GetRowUnits();
- const string GetRowUnits__doc__ = "Returns the units of all rows of the table.";
// table information
/*!
Returns the number of rows of the table.
*/
long GetNbRows();
- const string GetNbRows__doc__ = "Returns the number of rows of the table.";
/*!
Returns the number of columns of the table.
*/
long GetNbColumns();
- const string GetNbColumns__doc__ = "Returns the number of columns of the table.";
// operations with rows
/*!
Adds a row to the end of the table.
*/
void AddRow(in DoubleSeq theData) raises(IncorrectArgumentLength);
- const string AddRow__doc__ = "Adds a row to the end of the table.";
/*!
Sets the values of all elements of the row.
*/
void SetRow(in long theRow, in DoubleSeq theData) raises(IncorrectArgumentLength, IncorrectIndex);
- const string SetRow__doc__ = "Sets the values of all elements of the row.";
/*!
Returns the row of the table.
*/
DoubleSeq GetRow(in long theRow) raises(IncorrectIndex);
- const string GetRow__doc__ = "Returns the row of the table.";
// operations with columns
/*!
Adds a column to the end of the table.
*/
void AddColumn(in DoubleSeq theData) raises(IncorrectArgumentLength);
- const string AddColumn__doc__ = "Adds a column to the end of the table.";
/*!
Sets the values of all elements of the column.
*/
void SetColumn(in long theColumn, in DoubleSeq theData) raises(IncorrectArgumentLength, IncorrectIndex);
- const string SetColumn__doc__ = "Sets the values of all elements of the column.";
/*!
Returns the column of the table.
*/
DoubleSeq GetColumn(in long theColumn) raises(IncorrectIndex);
- const string GetColumn__doc__ = "Returns the column of the table.";
// operations with elements
/*!
\param theColumn The column, where the value will be placed.
*/
void PutValue(in double theValue, in long theRow, in long theColumn) raises(IncorrectIndex);
- const string PutValue__doc__ = "Puts a value in a definite row theRow and column theColumn of the table.";
/*!
Returns True if there is a value in the table.
\param theRow The row containing the value
\param theColumn The column containing the value
*/
boolean HasValue(in long theRow, in long theColumn);
- const string HasValue__doc__ = "Returns True if there is a value in a definite row and column of the table.";
/*!
Returns the value from the table.
\param theRow The row containing the value
\param theColumn The column containing the value
*/
double GetValue(in long theRow, in long theColumn) raises(IncorrectIndex);
- const string GatValue__doc__ = "Returns the value from a definite row and column of the table.";
/*!
Sets the max number of colums in the table.
\note It'd better to set it before filling the table.
*/
void SetNbColumns(in long theNbColumns);
- const string SetNbColumns__doc__ = "Sets the max number of colums in the table. ";
/*!
Returns the indices of the row where the values are defined.
*/
LongSeq GetRowSetIndices(in long theRow) raises(IncorrectIndex);
- const string GetRowSetIndices__doc__ = "Returns the indices of the row where the values are defined.";
// operations with files
/*!
Reads a table from a file.
*/
boolean ReadFromFile(in SALOMEDS::TMPFile theStream);
- const string ReadFromFile__doc__ = "Reads a table from a file.";
/*!
Saves a table into a file.
*/
SALOMEDS::TMPFile SaveToFile();
- const string SaveToFile__doc__ = "Saves a table into a file.";
};
- const string AttributeTableOfReal__doc__ = "This attribute allows to store a table of reals (indexing from 1 like in CASCADE) \nand string titles of this table, of each row, of each column.";
Sets the title of the table.
*/
void SetTitle(in string theTitle);
- const string SetTitle__doc__ = "Sets the title of the table.";
/*!
Returns the title of the table.
*/
string GetTitle();
- const string GetTitle__doc__ = "Returns the title of the table.";
/*!
Sets the title of a row with a definite index.
*/
void SetRowTitle(in long theIndex, in string theTitle) raises(IncorrectIndex);
- const string SetRowTitle__doc__ = "Sets the title of a row with a definite index.";
/*!
Sets the titles for all rows of the table.
*/
void SetRowTitles(in StringSeq theTitles) raises(IncorrectArgumentLength);
- const string SetRowTitles__doc__ = "Sets the titles for all rows of the table.";
/*!
Returns the titles of all rows of the table.
*/
StringSeq GetRowTitles();
- const string GetRowTitles__doc__ = "Returns the titles of all rows of the table.";
/*!
Sets the title of a column with a definite index.
*/
void SetColumnTitle(in long theIndex, in string theTitle) raises(IncorrectIndex);
- const string SetColumnTitle__doc__ = "Sets the title of a column with a definite index.";
/*!
Sets the titles for all columns of the table.
*/
void SetColumnTitles(in StringSeq theTitles) raises(IncorrectArgumentLength);
- const string SetColumnTitles__doc__ = "Sets the titles for all columns of the table.";
/*!
Returns the titles of all columns of the table.
*/
StringSeq GetColumnTitles();
- const string GetColumnTitles__doc__ = "Returns the titles of all columns of the table.";
//Rows units
/*!
Sets the unit of a row with a definite index.
*/
void SetRowUnit(in long theIndex, in string theUnit) raises(IncorrectIndex);
- const string SetRowUnit__doc__ = "Sets the unit of a row with a definite index.";
/*!
Sets the units for all rows of the table.
*/
void SetRowUnits(in StringSeq theUnits) raises(IncorrectArgumentLength);
- const string SetRowUnits__doc__ = "Sets the units for all rows of the table.";
/*!
Returns the units of all rows of the table.
*/
StringSeq GetRowUnits();
- const string GetRowUnits__doc__ = "Returns the units of all rows of the table.";
// table information
/*!
Returns the number of rows of the table.
*/
long GetNbRows();
- const string GetNbRows__doc__ = "Returns the number of rows of the table.";
/*!
Returns the number of columns of the table.
*/
long GetNbColumns();
- const string GetNbColumns__doc__ = "Returns the number of columns of the table.";
// operations with rows
/*!
Adds a row to the end of the table.
*/
void AddRow(in StringSeq theData) raises(IncorrectArgumentLength);
- const string AddRow__doc__ = "Adds a row to the end of the table.";
/*!
Sets the values of all elements of the row.
*/
void SetRow(in long theRow, in StringSeq theData) raises(IncorrectArgumentLength, IncorrectIndex);
- const string SetRow__doc__ = "Sets the values of all elements of the row.";
/*!
Returns the row of the table.
*/
StringSeq GetRow(in long theRow) raises(IncorrectIndex);
- const string GetRow__doc__ = "Returns the row of the table.";
// operations with columns
/*!
Adds a column to the end of the table.
*/
void AddColumn(in StringSeq theData) raises(IncorrectArgumentLength);
- const string AddColumn__doc__ = "Adds a column to the end of the table.";
/*!
Sets the values of all elements of the column.
*/
void SetColumn(in long theColumn, in StringSeq theData) raises(IncorrectArgumentLength, IncorrectIndex);
- const string SetColumn__doc__ = "Sets the values of all elements of the column.";
/*!
Returns the column of the table.
*/
StringSeq GetColumn(in long theColumn) raises(IncorrectIndex);
- const string GetColumn__doc__ = "Returns the column of the table.";
// operations with elements
/*!
\param theColumn The column, where the value will be placed.
*/
void PutValue(in string theValue, in long theRow, in long theColumn) raises(IncorrectIndex);
- const string PutValue__doc__ = "Puts a value in a definite row theRow and column theColumn of the table.";
/*!
Returns True if there is a value in the table.
\param theRow The row containing the value
\param theColumn The column containing the value
*/
boolean HasValue(in long theRow, in long theColumn);
- const string HasValue__doc__ = "Returns True if there is a value in a definite row and column of the table.";
/*!
Returns the value from the table.
\param theRow The row containing the value
\param theColumn The column containing the value
*/
string GetValue(in long theRow, in long theColumn) raises(IncorrectIndex);
- const string GatValue__doc__ = "Returns the value from a definite row and column of the table.";
/*!
Sets the max number of colums in the table.
\note It'd better to set it before filling the table.
*/
void SetNbColumns(in long theNbColumns);
- const string SetNbColumns__doc__ = "Sets the max number of colums in the table. ";
/*!
Returns the indices of the row where the values are defined.
*/
LongSeq GetRowSetIndices(in long theRow) raises(IncorrectIndex);
- const string GetRowSetIndices__doc__ = "Returns the indices of the row where the values are defined.";
// operations with files
/*!
Reads a table from a file.
*/
boolean ReadFromFile(in SALOMEDS::TMPFile theStream);
- const string ReadFromFile__doc__ = "Reads a table from a file.";
/*!
Saves a table into a file.
*/
SALOMEDS::TMPFile SaveToFile();
- const string SaveToFile__doc__ = "Saves a table into a file.";
};
- const string AttributeTableOfString__doc__ = "This attribute allows to store a table of string (indexing from 1 like in CASCADE) \nand string titles of this table, of each row, of each column.";
//==========================================================================
Sets the name of the author of the %Study
*/
void SetUserName(in string theName);
- const string SetUserName__doc__ = "Sets the name of the author of the study.";
/*!
Returns the name of the user of the %Study.
\note <BR>It returns a null string, if user name is not set
*/
string GetUserName();
- const string GetUserName__doc__ = "Returns the name of the user of the study.";
/*!
Sets creation date of the %Study.
*/
void SetCreationDate(in long theMinute, in long theHour, in long theDay, in long theMonth, in long theYear);
- const string SetCreationDate__doc__ = "Sets creation date of the study.";
/*!
Returns creation date of the %Study and True if creation date is set.
*/
boolean GetCreationDate(out long theMinute, out long theHour, out long theDay, out long theMonth, out long theYear);
- const string GetCreationDate__doc__ = "Returns creation date of the study and True if creation date is set.";
/*!
Sets creation mode of the %Study.
\note <BR>Creation mode must be: "from scratch" or "copy from".
*/
void SetCreationMode(in string theMode);
- const string SetCreationMode__doc__ = "Sets creation mode of the study. Creation mode must be: from scratch or copy from.";
/*!
Returns creation mode: "from scratch", "copy from", or null string
if creation mode is not set
*/
string GetCreationMode();
- const string GetCreationMode__doc__ = "Returns creation mode of the study.";
/*!
Sets the number of transactions executed after the last saving of the document.
*/
void SetModified(in long theModified);
- const string SetModified__doc__ = "Sets the number of transactions executed after the last saving of the document.";
/*!
Returns True, if the document has been modified and not saved.
*/
boolean IsModified();
- const string IsModified__doc__ = "Returns True, if the document has been modified and not saved.";
/*!
Returns the number of transactions executed after the last saving of the document.
*/
long GetModified();
- const string GetModified__doc__ = "Returns the number of transactions executed after the last saving of the document.";
/*!
Sets the document locked for modifications if <VAR>theLocked</VAR> is True.
*/
void SetLocked(in boolean theLocked);
- const string SetLocked__doc__ = "Sets the document locked for modifications if theLocked is True.";
/*!
Returns True if the document is locked for modifications.
*/
boolean IsLocked();
- const string IsLocked__doc__ = "Returns True if the document is locked for modifications.";
/*!
Appends modification parameters to the modifications list.
*/
void SetModification(in string theName, in long theMinute, in long theHour, in long theDay, in long theMonth, in long theYear);
- const string SetModification__doc__ = "Appends modification parameters to the modifications list.";
/*!
Returns a list of mosdifiers user names, modification dates.
/note <BR>If <VAR>theWithCreator</VAR> is True, then the output list will also contain the name of the author and the date of creation.
*/
void GetModificationsList(out StringSeq theNames, out LongSeq theMinutes, out LongSeq theHours, out LongSeq theDays, out LongSeq theMonths, out LongSeq theYears, in boolean theWithCreator);
- const string GetModificationsList__doc__ = "Returns a list of mosdifiers user names, modification dates.";
};
- const string AttributeStudyProperties__doc__ = "This attribute allows to store properties of the study : user name, creation date, \ncreation mode, modified flag, locked flag.";
//==========================================================================
/*! \brief %AttributePythonObject interface
\param IsScript Defines (if True) whether this sequence of chars is a Python script.
*/
void SetObject(in string theSequence, in boolean IsScript);
- const string SetObject__doc__ = "Sets in the attribute a Python object converted into a sequence of chars.";
/*!
Returns a Python object stored in the attribute as a sequence of chars.
*/
string GetObject();
- const string GetObject__doc__ = "Returns a Python object stored in the attribute as a sequence of chars.";
/*!
Returns True if the sequence of bytes stored in the attribute corresponds
to a Python script.
*/
boolean IsScript();
- const string IsScript__doc__ = "Returns True if the sequence of bytes stored in the attribute corresponds to a Python script.";
};
- const string AttributePythonObject__doc__ = "Attribute allowing to store pyton objects as a sequence of chars.";
};
#endif
-//=============================================================================
-// File : SALOME_Component.idl
-// Created : jeu jui 12 08:11:23 CEST 2001
-// Author : Paul RASCLE, EDF
-// Project : SALOME
-// Copyright : EDF 2001
-// $Header: /dn05/salome/CVS/SALOME_ROOT/idl/SALOME_Component.idl
-//=============================================================================
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_Component.idl
+// Author : Paul RASCLE, EDF
+// $Header: /dn05/salome/CVS/SALOME_ROOT/idl/SALOME_Component.idl
#ifndef _SALOME_COMPONENT_IDL_
#define _SALOME_COMPONENT_IDL_
Returns True if the activity of the %Component has been resumed.
*/
boolean Resume_impl() ;
+/*!
+ Returns the Cpu used (long does not run with python !...)
+*/
+ long CpuUsed_impl() ;
} ;
} ;
-// File: SALOME_DataTypeCatalog.idl
-// Created: Mon August 08 2001
-// Author: Estelle Deville, Paul Rascle
-// Project: SALOME
-// Copyright : CEA/DEN/DMSS/LGLS
-// $Header$
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_DataTypeCatalog.idl
+// Author : Estelle Deville, Paul Rascle
+// $Header$
module SALOME_DataTypeCatalog{
// Type definitions
-//=============================================================================
-// File : SALOME_Exception.idl
-// Created : mar déc 18 17:57:27 CET 2001
-// Author : Paul RASCLE, EDF
-// Project : SALOME
-// Copyright : EDF 2001
-// $Header$
-//=============================================================================
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_Exception.idl
+// Author : Paul RASCLE, EDF
+// $Header$
/*! \file SALOME_Exception.idl This file contains the objects defining the main exception used
in %SALOME application.
-// File: SALOME_ModuleCatalog.idl
-// Created: Tue June 25 2001
-// Author: Estelle Deville
-// Project: SALOME
-// Copyright : CEA/DEN/DMSS/LGLS
-// $Header$
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_ModuleCatalog.idl
+// Author : Estelle Deville
+// $Header$
/*! \file SALOME_ModuleCatalog.idl This file conatins a set of interfaces used for
creation of the catalog of components in %SALOME application
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_Registry.idl
+
# ifndef __registry_idl__
# define __registry_idl__
-// File: SALOME_RessourcesCatalog.idl
-// Created: Mon Sep 10 2001
-// Author: Estelle Deville
-// Project: SALOME
-// Copyright : CEA/DEN/DMSS/LGLS
-// $Header$
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_RessourcesCatalog.idl
+// Author : Estelle Deville
+// $Header$
module SALOME_RessourcesCatalog{
// Type Definitions
-//=============================================================================
-// File : SALOME_Session.idl
-// Created : mar jun 19 09:15:07 CEST 2001
-// Author : Paul RASCLE, EDF
-// Project : SALOME
-// Copyright : EDF 2001
-// $Header$
-//=============================================================================
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_Session.idl
+// Author : Paul RASCLE, EDF
+// $Header$
-
-//***//#include "VISU_Gen.idl"
+#include "SALOME_Component.idl"
/*! \defgroup Kernel SALOME KERNEL module
*/
Launches GUI in the session
*/
void GetInterface();
- //***// VISU::VISU_Gen GetVisuGen();
+ Engines::Component GetVisuGen();
/*!
Stops the %Session (It must be idle)
-//=============================================================================
-// File : SALOME_TestComponent.idl
-// Created : jeu jui 12 12:08:17 CEST 2001
-// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
-// Project : SALOME
-// Copyright : EDF 2001 - CEA 2001
-// $Header$
-//=============================================================================
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : SALOME_TestComponent.idl
+// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
+// $Header$
#include "SALOME_Component.idl"
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : TestNotif.idl
+
# ifndef __TESTNOTIF_IDL_
# define __TESTNOTIF_IDL_
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
+//
+//
+// File : TypeData.idl
+
#ifndef _SALOME_TYPEDATA_IDL_
#define _SALOME_TYPEDATA_IDL_
+# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+#
+#
+
# Doxyfile 1.2.8.1
# This file describes the settings to be used by the documentation system
+/*----------------------------------------------------------------------------------
+ Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+ CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+------------------------------------------------------------------------------------*/
+
#ifndef F77_FUNC
+/*----------------------------------------------------------------------------------
+ Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+ CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+------------------------------------------------------------------------------------*/
+
#define DEBUG
#define QUOTE(x) #x
-dnl Synopsis
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
dnl
-dnl AC_CC_WARNINGS([ANSI])
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
dnl
-dnl Version
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
dnl
-dnl 1.1 (2000/12/31)
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl
-dnl Author
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+dnl Synopsis : AC_CC_WARNINGS([ANSI])
dnl
-dnl Ville Laurikari <vl@iki.fi>
+dnl Version : 1.1 (2000/12/31)
dnl
-dnl Description
+dnl Author : Ville Laurikari <vl@iki.fi>
+dnl
+dnl Description :
dnl
dnl Enables a reasonable set of warnings for the C compiler.
dnl Optionally, if the first argument is nonempty, turns on
ac_cv_prog_cc_warnings="unknown"
fi
])
-])
\ No newline at end of file
+])
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl @synopsis AC_CXX_BOOL
dnl
dnl If the compiler recognizes bool as a separate built-in type,
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl @synopsis AC_C_DEPEND_FLAG
dnl
dnl define C_DEPEND_FLAG
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl @synopsis AC_CXX_HAVE_SSTREAM
dnl
dnl If the C++ library has a working stringstream, define HAVE_SSTREAM.
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl @synopsis AC_CXX_MUTABLE
dnl
dnl If the compiler allows modifying class data members flagged with
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl @synopsis AC_CXX_NAMESPACES
dnl
dnl If the compiler can prevent names clashes using namespaces, define
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl @synopsis AC_CXX_PARTIAL_SPECIALIZATION
dnl
dnl If the compiler supports partial specialization,
dnl @version $Id$
dnl @author Luc Maisonobe
dnl
+
AC_DEFUN(AC_CXX_PARTIAL_SPECIALIZATION,
[AC_CACHE_CHECK(whether the compiler supports partial specialization,
ac_cv_cxx_partial_specialization,
-dnl @synopsis AC_CXX_TYPENAME
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+ddnl @synopsis AC_CXX_TYPENAME
dnl
dnl If the compiler recognizes the typename keyword, define HAVE_TYPENAME.
dnl
-# Check availability of Salome binary distribution
+# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
#
-# Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+# Check availability of Salome binary distribution
#
+# Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
AC_DEFUN([CHECK_SALOME],[
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_CAS],[
AC_REQUIRE([AC_PROG_CXX])dnl
AC_REQUIRE([AC_PROG_CXXCPP])dnl
AC_SUBST(CAS_CPPFLAGS)
AC_SUBST(CAS_CXXFLAGS)
+AC_SUBST(CAS_KERNEL)
+AC_SUBST(CAS_VIEWER)
+AC_SUBST(CAS_MODELER)
+AC_SUBST(CAS_OCAF)
+AC_SUBST(CAS_DATAEXCHANGE)
AC_SUBST(CAS_LDFLAGS)
CAS_CPPFLAGS=""
AC_MSG_WARN(Opencascade libraries not found)
else
AC_MSG_RESULT(yes)
- CAS_LDFLAGS="-L$CASROOT/$casdir/lib -lTKPAppStd -lTKFillet -lTKService -lFWOSPlugin -lTKG2d -lTKShHealing -lTKShHealingStd -lTKOpenGl -lTKG3d -lTKTopAlgo -lTKGeomAlgo -lTKV2d -lPAppStdPlugin -lTKGeomBase -lTKV3d -lPTKernel -lTKHLR -lTKVRML -lTKShapeSchema -lTKIGES -lTKXSBase -lTKStdSchema -lTKMath -lTKBRep -lTKOffset -lTKernel -lTKBool -lTKPCAF -lTKCAF -lTKPShape -lTKCDF -lTKPrim -lTKSTEP -lTKFeat -lTKSTL"
+ CAS_KERNEL="-L$CASROOT/$casdir/lib -lTKernel -lTKMath"
+ CAS_OCAF="-L$CASROOT/$casdir/lib -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin -lTKPAppStd -lTKCDF"
+dnl CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKV2d -lTKService"
+ CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKService"
+# CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKFeat -lTKOffset"
+ CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKOffset"
+dnl CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd -lTKSTL -lTKVRML "
+ CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd"
+ CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE"
+
fi
AC_LANG_RESTORE
])dnl
+
+
+# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+#
+#
AC_DEFUN([CHECK_CORBA],[
if test x"$DEFAULT_ORB" = x"omniORB"
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_F77],[
AC_PROG_F77
+# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+#
+#
AC_DEFUN([CHECK_HDF5],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_CPP])dnl
+dnl Copyright (C) 2003 CEA/DEN, EDF R&D
+
AC_DEFUN([CHECK_HTML_GENERATORS],[
#AC_CHECKING(for html generators)
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_JAVA],[
dnl AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
dnl AC_REQUIRE([AC_PROG_CPP])dnl
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+
AC_DEFUN([CHECK_MED2],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_CPP])dnl
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_MICO],[
AC_REQUIRE([AC_PROG_CC])dnl
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+
AC_DEFUN([CHECK_MPICH],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_SUBST(OMNIORB_ROOT)
OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB3 -I$OMNIORB_ROOT/include/COS"
+dnl OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB4 -I$OMNIORB_ROOT/include/COS"
AC_SUBST(OMNIORB_INCLUDES)
ENABLE_PTHREADS
fi
+dnl omniORB_ok=yes
+
if test "x$omniORB_ok" = "xyes"
then
OMNIORB_LDFLAGS="-L$OMNIORB_LIB"
CXXFLAGS=$CXXFLAGS_old
fi
+
+dnl omniORB_ok=yes
if test "x$omniORB_ok" = "xyes"
then
LIBS_old=$LIBS
OMNIORB_LIBS="$OMNIORB_LDFLAGS -lomniORB3 -ltcpwrapGK -lomniDynamic3 -lomnithread -lCOS3 -lCOSDynamic3"
+dnl OMNIORB_LIBS="$OMNIORB_LDFLAGS -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lCOSDynamic4"
AC_SUBST(OMNIORB_LIBS)
LIBS="$OMNIORB_LIBS $LIBS"
])
omniORB_ok="$salome_cv_lib_omniorb3"
+ omniORB_ok=yes
if test "x$omniORB_ok" = "xno"
then
AC_MSG_RESULT(omniORB library linking failed)
if test "x$omniORB_ok" = "xyes"
then
- OMNIORB_IDLCXXFLAGS="-bcxx -I$OMNIORB_ROOT/idl"
+ OMNIORB_IDLCXXFLAGS="-I$OMNIORB_ROOT/idl"
OMNIORB_IDLPYFLAGS="-bpython -I$OMNIORB_ROOT/idl"
AC_SUBST(OMNIORB_IDLCXXFLAGS)
AC_SUBST(OMNIORB_IDLPYFLAGS)
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_OPENGL],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_CPP])dnl
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
#@synonpsis CHECK_PTHREADS
dnl check for pthreads system interfaces.
dnl set CFLAGS_PTHREADS, CXXFLAGS_PTHREADS and LIBS_PTHREADS to
+dnl Copyright (C) 2003 CEA/DEN, EDF R&D
AC_DEFUN([CHECK_PYQT],[
AC_REQUIRE([CHECK_PYTHON])dnl
AC_CHECKING(for pyqt)
-pyqt_ok=no
+pyqt_ok=yes
dnl were is pyqt ?
-if test -z $PYQTDIR; then
- AC_MSG_WARN(You must provide PYQTDIR variable)
-else
- pyqt_ok=yes
-fi
+AC_ARG_WITH(pyqt,
+ [ --with-pyqt=DIR root directory path to PyQt installation ],
+ [PYQTDIR="$withval"
+ AC_MSG_RESULT("select $withval as path to PyQt")
+ ])
+
+AC_ARG_WITH(pyqt_sips,
+ [ --with-pyqt_sips=DIR a directory path to PyQt sips installation ],
+ [PYQT_SIPS="$withval"
+ AC_MSG_RESULT("select $withval as path to PyQt sips")
+ ])
-if test "x$pyqt_ok" = xno -o ! -d "$PYQTDIR" -o ! -d "$PYQTDIR"/sip ; then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(pyqt not found)
-else
- AC_CHECK_FILES("$PYQTDIR"/qt.py "$PYQTDIR"/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no)
- if test "x$pyqt_ok" = xno ; then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(pyqt not found)
- else
- PYQT_ROOT=$PYQTDIR
- PYQT_INCLUDES="-I$PYQTDIR/sip"
- PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
-
- AC_SUBST(PYQT_ROOT)
- AC_SUBST(PYQT_INCLUDES)
- AC_SUBST(PYQT_LIBS)
-
- AC_MSG_RESULT(yes)
- fi
-fi
AC_ARG_WITH(pyuic,
[ --with-pyuic=EXEC pyuic executable ],
[PYUIC="$withval"
AC_MSG_RESULT("select $withval as pyqt executable")
- ], [
- AC_PATH_PROG(PYUIC, pyuic)
])
-if test "x$PYUIC" = "x"
-then
- pyqt_ok=no
- AC_MSG_RESULT(pyuic not in PATH variable)
+
+if test -z $PYQTDIR; then
+ PYQTDIR="/usr/lib/python${PYTHON_VERSION}/site-packages"
else
- if test -z $PYQT_SIPS; then
- AC_MSG_WARN(You must provide PYQT_SIPS variable)
- pyqt_ok=no
- else
- PYQT_SIPS=${PYQT_SIPS}
- fi
- PYQT_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages ${PYQT_LIBS}"
+ if test -z $PYQT_SIPS; then
+ PYQT_SIPS="$PYQTDIR/sip"
+ fi
+ if test -z $PYUIC; then
+ AC_CHECK_FILE("$PYQTDIR/pyuic",pyqt_ok=yes,pyqt_ok=no)
+ if test "x$pyqt_ok" = xyes ; then
+ PYUIC="$PYQTDIR/pyuic"
+ else
+ AC_PATH_PROG(PYUIC, pyuic)
+ fi
+ fi
+fi
+
+if test -z $PYQT_SIPS; then
+ PYQT_SIPS="/usr/share/sip/qt"
+fi
+
+if test -z $PYUIC; then
+ PYUIC="/usr/bin/pyuic"
fi
+AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
+if test "x$pyqt_ok" = xno ; then
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN(pyqt not found)
+else
+ AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
+ if test "x$pyqt_ok" = xno ; then
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN(pyqt not found)
+ else
+ PYQT_ROOT=$PYQTDIR
+ PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
+ fi
+ AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no)
+ if test "x$pyqt_ok" = xno ; then
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN(pyqt not found)
+ else
+ PYQT_INCLUDES="-I$PYQT_SIPS"
+ fi
+
+ AC_SUBST(PYQT_ROOT)
+ AC_SUBST(PYQT_INCLUDES)
+ AC_SUBST(PYQT_LIBS)
+
+ AC_MSG_RESULT(yes)
+fi
+
+PYQT_ROOT=$PYQTDIR
+PYQT_INCLUDES="-I$PYQT_SIPS"
+PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
+
+AC_SUBST(PYQT_ROOT)
+AC_SUBST(PYQT_INCLUDES)
AC_SUBST(PYUIC)
AC_SUBST(PYQT_SIPS)
AC_SUBST(PYQT_LIBS)
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_QT],[
AC_REQUIRE([AC_PROG_CC])dnl
+dnl Copyright (C) 2003 CEA/DEN, EDF R&D
+
AC_DEFUN([CHECK_QWT],[
AC_REQUIRE([CHECK_QT])dnl
AC_CHECKING(for qwt)
-qwt_ok=no
+qwt_ok=yes
dnl were is qwt ?
+
+AC_ARG_WITH(qwt,
+ [ --with-qwt=DIR directory path to QWT installation ],
+ [QWTHOME="$withval"
+ AC_MSG_RESULT("select $withval as path to QWT")
+ ])
+
+AC_ARG_WITH(qwt_inc,
+ [ --with-qwt_inc=DIR directory path to QWT includes ],
+ [QWT_INCLUDES="$withval"
+ AC_MSG_RESULT("select $withval as path to QWT includes")
+ ])
+
if test -z $QWTHOME; then
- AC_MSG_WARN(You must provide QWTHOME variable)
+ exits_ok=no
+ AC_CHECK_FILE("/usr/local/lib/libqwt.so",exits_ok=yes,exits_ok=no)
+ if test "x$exits_ok" = "xyes"; then
+ QWTHOME="/usr/local/lib"
+ if test -z $QWT_INCLUDES; then
+ QWT_INCLUDES="/usr/local/include/qwt"
+ fi
+ else
+ QWTHOME="/usr/lib"
+ if test -z $QWT_INCLUDES; then
+ QWT_INCLUDES="/usr/include/qwt"
+ fi
+ fi
else
- qwt_ok=yes
+ if test -z $QWT_INCLUDES; then
+ QWT_INCLUDES="$QWTHOME/include"
+ fi
fi
if test "x$qwt_ok" = xno -o ! -d "$QWTHOME" ; then
AC_MSG_RESULT(no)
AC_MSG_WARN(qwt not found)
+ qwt_ok=no
else
-
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
CPPFLAGS_old=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$QWTHOME/include"
+ CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES"
CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no)
LIBS="$LIBS -L$QTDIR/lib -lqt-mt -L$QWTHOME/lib -lqwt"
CXXFLAGS_old=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWTHOME/include"
+ CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWT_INCLUDES"
AC_CACHE_VAL(salome_cv_lib_qwt,[
AC_TRY_LINK(
AC_MSG_RESULT(unable to link with qwt library)
AC_MSG_RESULT(QWTHOME environment variable may be wrong)
else
- QWT_INCLUDES="-I$QWTHOME/include"
+ QWT_INCLUDES="-I$QWT_INCLUDES"
QWT_LIBS="-L$QWTHOME/lib -lqwt"
AC_SUBST(QWT_INCLUDES)
+dnl Copyright (C) 2003 CEA/DEN, EDF R&D
AC_DEFUN([CHECK_SIP],[
AC_REQUIRE([CHECK_PYTHON])dnl
sip_ok=no
AC_MSG_RESULT(sip not in PATH variable)
else
- SIP_ROOT="$SIPDIR"
- SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}"
- SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -L${SIPDIR} -lsip"
+ if test $SIPDIR ; then
+ SIP_ROOT="$SIPDIR"
+ SIP_INCLUDES="-I${SIPDIR}"
+ SIP_LIBS="-L${SIPDIR} -lsip"
+ else
+ SIP_INCLUDES="${PYTHON_INCLUDES}"
+ SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+ fi
fi
AC_SUBST(SIP)
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
AC_DEFUN([CHECK_SWIG],[
AC_REQUIRE([CHECK_PYTHON])dnl
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+
AC_DEFUN([CHECK_VTK],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_CXX])dnl
LOCAL_INCLUDES="$OGL_INCLUDES"
-LOCAL_LIBS="-lVTKCommon -lVTKGraphics -lVTKImaging -lVTKContrib $OGL_LIBS -L$x_libraries -lX11 -lXt"
-TRY_LINK_LIBS="-lVTKCommon $OGL_LIBS -L$x_libraries -lX11 -lXt"
+LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkPatented -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS -L$x_libraries -lX11 -lXt"
+TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS -L$x_libraries -lX11 -lXt"
if test -z $VTKHOME
then
AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
else
- LOCAL_INCLUDES="-I$VTKHOME/common -I$VTKHOME/imaging -I$VTKHOME/graphics -I$VTKHOME/contrib $LOCAL_INCLUDES"
- LOCAL_LIBS="-L$VTKHOME/lib -L$VTKHOME/common -L$VTKHOME/graphics -L$VTKHOME/imaging -L$VTKHOME/contrib $LOCAL_LIBS"
- TRY_LINK_LIBS="-L$VTKHOME/lib -L$VTKHOME/common $TRY_LINK_LIBS"
+ LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
+ LOCAL_LIBS="-L$VTKHOME/lib/vtk $LOCAL_LIBS"
+ TRY_LINK_LIBS="-L$VTKHOME/lib/vtk $TRY_LINK_LIBS"
fi
dnl vtk headers
CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
-AC_CHECK_HEADER(vtk.h,vtk_ok="yes",vtk_ok="no")
+AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no")
-CPPFLAGS="$CPPFLAGS_old"
+ CPPFLAGS="$CPPFLAGS_old"
-if test "x$vtk_ok" = "xyes"
-then
- VTK_INCLUDES="$LOCAL_INCLUDES"
+ if test "x$vtk_ok" = "xyes"
+ then
+ VTK_INCLUDES="$LOCAL_INCLUDES"
-dnl vtk libraries
+ dnl vtk libraries
- AC_MSG_CHECKING(linking VTK library)
+ AC_MSG_CHECKING(linking VTK library)
- LIBS_old="$LIBS"
-# LIBS="$LIBS $TRY_LINK_LIBS"
- LIBS="$LIBS $LOCAL_LIBS"
- CPPFLAGS_old="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $VTK_INCLUDES"
+ LIBS_old="$LIBS"
+ # LIBS="$LIBS $TRY_LINK_LIBS"
+ LIBS="$LIBS $LOCAL_LIBS"
+ CPPFLAGS_old="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $VTK_INCLUDES"
-dnl VTKPY_MODULES="$VTKHOME/python"
+ dnl VTKPY_MODULES="$VTKHOME/python"
- AC_CACHE_VAL(salome_cv_lib_vtk,[
- AC_TRY_LINK(
-#include <vtk.h>
+ AC_CACHE_VAL(salome_cv_lib_vtk,[
+ AC_TRY_LINK(
+#include "vtkPlane.h"
, vtkPlane *p = vtkPlane::New();,
eval "salome_cv_lib_vtk=yes",eval "salome_cv_lib_vtk=no")
])
AC_CACHE_SAVE
])dnl
+
+
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl@synopsis ENABLE_PTHREADS
dnl
dnl modify CFLAGS, CXXFLAGS and LIBS for compiling pthread-based programs.
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl define macros :
dnl AC_ENABLE_PRODUCTION AC_DISABLE_PRODUCTION
dnl and
if test "X$enable_production" = "Xyes"; then
CFLAGS="$CFLAGS -O"
- CXXFLAGS="$CXXFLAGS -O"
+ CXXFLAGS="$CXXFLAGS -O -Wno-deprecated "
fi
])
if test "X$enable_debug" = "Xyes"; then
CFLAGS="$CFLAGS -g -D_DEBUG_ "
- CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ "
+ CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ -Wno-deprecated "
fi
])
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
dnl This macro defines the PYTHON_EMBED_{CFLAGS,LDFLAGS,LIBS} substitutions
dnl that should be used when embedding the python interpreter into a program.
dnl AM_INIT_PYTHON_EMBED
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
## ------------------------
## Python file handling
## From Andrew Dalke
echo '## This file is machine generated on GNU systems.' >$@; \
echo '## Only temporary changes may be made here.' >>$@; \
echo >>$@; \
- perl -p $(top_srcdir)/bin/salome/distdep .depend >>$@; \
+ perl -p $(top_srcdir)/bin/distdep .depend >>$@; \
else \
echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \
fi
export SALOME_SRC_DIR=@ROOT_SRCDIR@
export ORB_HOME_DIR=@CORBA_ROOT@
-export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib/salome:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib:${LD_LIBRARY_PATH}
# echo $SALOME_HOME_DIR = SALOME_HOME_DIR
# echo $SALOME_SRC_DIR = SALOME_SRC_DIR
PYVTK_PATH=@VTKPY_MODULES@
-export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin/salome:${SALOME_HOME_DIR}/lib/salome:${PYVTK_PATH}:${EXEC_DIR}
+export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin:${SALOME_HOME_DIR}/lib:${PYVTK_PATH}:${EXEC_DIR}
export MICORC=/dev/null
# common directories to put headerfiles
-inc_builddir=$(top_builddir)/include/salome
+inc_builddir=$(top_builddir)/include
@SET_MAKE@
SHELL=/bin/sh
LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib -Xlinker -rpath-link -Xlinker $(top_builddir)/lib
# add libstdc++ to link c++ library with libtool !
LDFLAGS+= -lstdc++
OCC_INCLUDES=@CAS_CPPFLAGS@
OCC_CXXFLAGS=@CAS_CXXFLAGS@
OCC_LIBS=@CAS_LDFLAGS@
-
+CAS_KERNEL=@CAS_KERNEL@
+CAS_OCAF=@CAS_OCAF@
+CAS_VIEWER=@CAS_VIEWER@
+CAS_MODELER=@CAS_MODELER@
+CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@
# MPICH
MPICH_INCLUDES=@MPICH_INCLUDES@
OMNIORB_IDL = @OMNIORB_IDL@
OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/share/salome/idl
OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
CORBA_LIBS = @CORBA_LIBS@
CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
-IDLCXXFLAGS = @IDLCXXFLAGS@ -I$(top_builddir)/idl
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/share/salome/idl -I$(srcdir)
IDLPYFLAGS = @IDLPYFLAGS@
IDL = @IDL@
## Installation points
prefix=@prefix@
exec_prefix=@exec_prefix@
-bindir=@bindir@/salome
-libdir=@libdir@/salome
+bindir=@bindir@
+libdir=@libdir@
# warning : if user give this path in configure we could have salome/salome :-(
includedir=@includedir@/salome
datadir=@datadir@/salome
-idldir=$(datadir)/idl/salome
+idldir=$(datadir)/idl
sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
-docdir=$(datadir)/doc
+docdir=@exec_prefix@/doc
#
# begin of package rules
ac_cc_warnings.m4 check_qt.m4 check_med2.m4 \
check_swig.m4
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
- cd $(top_srcdir) ; aclocal --acdir=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=$(top_srcdir)/adm/unix/config_files/%)
+ cd $(top_srcdir) ; aclocal --acdir=./adm/unix/config_files
# all libtool obj file in library
LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F)
-# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la)
-LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB)))
-LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB)))
+# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/%.la)
+LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/%.la, $(filter %.la, $(LIB)))
+LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/%.a, $(filter %.a, $(LIB)))
ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),)
LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB)))
lib: $(LIB_BUILD) $(LIB_CLIENT_PY)
# we don't build static library !
-$(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
+$(LIB_BUILD): $(top_builddir)/lib/%.la: %.la
-$(RM) $@
-$(RM) $(patsubst %.la, %.so, $@)
-$(RM) $(patsubst %.la, %.a, $@)
- ln -s $(CURDIR)/$< $@ || true
- ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \
+ ln -sf $(CURDIR)/$< $@ || true
+ ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \
$(patsubst %.la, %.so, $@) || true
- ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \
+ ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \
$(patsubst %.la, %.so, $@).0 || true
if ! test -z $(LIB_SWIG) ; then \
- ln -s $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\
+ ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/_$(LIB_SWIG) || true;\
fi;
-$(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a
+$(LIB_BUILD_A): $(top_builddir)/lib/%.a: %.a
-$(RM) $@
- ln -s $(CURDIR)/$< $@ || true
+ ln -sf $(CURDIR)/$< $@ || true
$(LIB): $(LIB_OBJ)
@$(LT) --mode=link $(CXX) -rpath $(libdir) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS)
# all obj file in bin target
BIN_OBJ = $(BIN_OBJ_CC) $(BIN_OBJ_CXX) $(BIN_OBJ_C) $(BIN_CLIENT_OBJ) $(BIN_SERVER_OBJ)
-bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts
+bin: $(BIN:%=$(top_builddir)/bin/%) $(BIN) $(LIB) pyscripts sharedpyscripts
BIN_LIB=$(LIB:lib%.la=-l%)
-$(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: %
+$(BIN:%=$(top_builddir)/bin/%) $(TEST_PROGS:%=$(top_builddir)/bin/%): $(top_builddir)/bin/%: %
-$(RM) $@
- ln -s $(CURDIR)/$< $@
+ ln -sf $(CURDIR)/$< $@
$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ)
$(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
-# copy python scripts in $(top_builddir)/bin/salome
+# copy python scripts in $(top_builddir)/bin
#
-DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%)
+DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/%)
pyscripts: $(DEST_PYSCRIPTS)
-$(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: %
+$(DEST_PYSCRIPTS): $(top_builddir)/bin/%: %
cp -f $< $@
# copy pyqt files in $(PYTHON_SHARED_SITE)
tests: test
-test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%)
+test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/%)
# copy header file in $(inc_builddir)
fi; \
done
@if ! test -z $(LIB_SWIG) ; then \
- (cd $(libdir); ln -s $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \
+ (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \
fi;
@for f in X $(BIN); do \
if test $$f != X; then \
-$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN)
-$(RM) TAGS *~ *# core *.core
-$(RM) -r .libs
- -$(RM) $(top_builddir)/lib/salome/$(LIB)
- -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN))
- -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB))
- -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB))
+ -$(RM) $(top_builddir)/lib/$(LIB)
+ -$(RM) $(patsubst %,$(top_builddir)/bin/%, $(BIN))
+ -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/$(LIB))
+ -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/$(LIB))
# remove idl generated files (sources)
-$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC)
# remove idl generated files (headers)
$(SWIG) $(SWIG_FLAGS) -o $@ $<
$(top_builddir)/share/salome/resources/%.qm: %.po
- if test -e ${KERNEL_ROOT_DIR}/bin/salome/msg2qm ; then \
- ${KERNEL_ROOT_DIR}/bin/salome/msg2qm $< $@ ; \
- else \
- $(top_builddir)/bin/salome/msg2qm $< $@ ; \
- fi
+ $(top_builddir)/bin/msg2qm $< $@
#------------------------------------------------------------------------------
# The following section of this makefile contains dependencies between the
#IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ))
# dependancies between idl and it's generated files
-%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl
+%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/share/salome/idl/%.idl
$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
# dependncies between idl files
--- /dev/null
+Only in /Salome2/KERNEL_SRC/salome_adm/unix/: CVS
+diff -r ./Doxyfile /Salome2/KERNEL_SRC/salome_adm/unix/Doxyfile
+1,21d0
+< # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< #
+< # This library is free software; you can redistribute it and/or
+< # modify it under the terms of the GNU Lesser General Public
+< # License as published by the Free Software Foundation; either
+< # version 2.1 of the License.
+< #
+< # This library is distributed in the hope that it will be useful,
+< # but WITHOUT ANY WARRANTY; without even the implied warranty of
+< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< # Lesser General Public License for more details.
+< #
+< # You should have received a copy of the GNU Lesser General Public
+< # License along with this library; if not, write to the Free Software
+< # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< #
+< # See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< #
+< #
+<
+diff -r ./F77config.h.in /Salome2/KERNEL_SRC/salome_adm/unix/F77config.h.in
+1,21d0
+< /*----------------------------------------------------------------------------------
+< Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+<
+< This library is free software; you can redistribute it and/or
+< modify it under the terms of the GNU Lesser General Public
+< License as published by the Free Software Foundation; either
+< version 2.1 of the License.
+<
+< This library is distributed in the hope that it will be useful,
+< but WITHOUT ANY WARRANTY; without even the implied warranty of
+< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< Lesser General Public License for more details.
+<
+< You should have received a copy of the GNU Lesser General Public
+< License along with this library; if not, write to the Free Software
+< Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+<
+< See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< ------------------------------------------------------------------------------------*/
+<
+diff -r ./SALOMEconfig.h.in /Salome2/KERNEL_SRC/salome_adm/unix/SALOMEconfig.h.in
+1,21d0
+< /*----------------------------------------------------------------------------------
+< Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+<
+< This library is free software; you can redistribute it and/or
+< modify it under the terms of the GNU Lesser General Public
+< License as published by the Free Software Foundation; either
+< version 2.1 of the License.
+<
+< This library is distributed in the hope that it will be useful,
+< but WITHOUT ANY WARRANTY; without even the implied warranty of
+< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< Lesser General Public License for more details.
+<
+< You should have received a copy of the GNU Lesser General Public
+< License along with this library; if not, write to the Free Software
+< Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+<
+< See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< ------------------------------------------------------------------------------------*/
+<
+Only in /Salome2/KERNEL_SRC/salome_adm/unix/config_files: CVS
+diff -r ./config_files/ac_cc_warnings.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cc_warnings.m4
+1,2c1
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+---
+> dnl Synopsis
+4,22c3
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+< dnl Synopsis : AC_CC_WARNINGS([ANSI])
+---
+> dnl AC_CC_WARNINGS([ANSI])
+24c5
+< dnl Version : 1.1 (2000/12/31)
+---
+> dnl Version
+26c7
+< dnl Author : Ville Laurikari <vl@iki.fi>
+---
+> dnl 1.1 (2000/12/31)
+28c9,13
+< dnl Description :
+---
+> dnl Author
+> dnl
+> dnl Ville Laurikari <vl@iki.fi>
+> dnl
+> dnl Description
+119c104
+< ])
+---
+> ])
+\ No newline at end of file
+diff -r ./config_files/ac_cxx_bool.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_bool.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+29c8
+< dnl @version $Id$
+---
+> dnl @version $Id$
+diff -r ./config_files/ac_cxx_depend_flag.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_depend_flag.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+27c6
+< dnl @version $Id$
+---
+> dnl @version $Id$
+diff -r ./config_files/ac_cxx_have_sstream.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_have_sstream.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+27c6
+< dnl @version $Id$
+---
+> dnl @version $Id$
+diff -r ./config_files/ac_cxx_mutable.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_mutable.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+28c7
+< dnl @version $Id$
+---
+> dnl @version $Id$
+diff -r ./config_files/ac_cxx_namespaces.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_namespaces.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+27c6
+< dnl @version $Id$
+---
+> dnl @version $Id$
+diff -r ./config_files/ac_cxx_partial_specialization.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_partial_specialization.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+27c6
+< dnl @version $Id$
+---
+> dnl @version $Id$
+30d8
+<
+diff -r ./config_files/ac_cxx_typename.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_typename.m4
+1,22c1
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+< ddnl @synopsis AC_CXX_TYPENAME
+---
+> dnl @synopsis AC_CXX_TYPENAME
+26c5
+< dnl @version $Id$
+---
+> dnl @version $Id$
+Only in /Salome2/KERNEL_SRC/salome_adm/unix/config_files: check_Kernel.m4
+diff -r ./config_files/check_Salome.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_Salome.m4
+1,18c1
+< # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< #
+< # This library is free software; you can redistribute it and/or
+< # modify it under the terms of the GNU Lesser General Public
+< # License as published by the Free Software Foundation; either
+< # version 2.1 of the License.
+< #
+< # This library is distributed in the hope that it will be useful,
+< # but WITHOUT ANY WARRANTY; without even the implied warranty of
+< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< # Lesser General Public License for more details.
+< #
+< # You should have received a copy of the GNU Lesser General Public
+< # License along with this library; if not, write to the Free Software
+< # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< #
+< # See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+---
+> # Check availability of Salome binary distribution
+20,21c3
+< #------------------------------------------------------------
+< # Check availability of Salome binary distribution
+---
+> # Author : Marc Tajchman (CEA, 2002)
+23,24d4
+< # Author : Marc Tajchman (CEA, 2002)
+< #------------------------------------------------------------
+diff -r ./config_files/check_cas.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_cas.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+83c62
+< CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc"
+---
+> CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc -Wno-deprecated"
+101c80
+< CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS"
+---
+> CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS -Wno-deprecated"
+diff -r ./config_files/check_corba.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_corba.m4
+1,20d0
+< # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< #
+< # This library is free software; you can redistribute it and/or
+< # modify it under the terms of the GNU Lesser General Public
+< # License as published by the Free Software Foundation; either
+< # version 2.1 of the License.
+< #
+< # This library is distributed in the hope that it will be useful,
+< # but WITHOUT ANY WARRANTY; without even the implied warranty of
+< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< # Lesser General Public License for more details.
+< #
+< # You should have received a copy of the GNU Lesser General Public
+< # License along with this library; if not, write to the Free Software
+< # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< #
+< # See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< #
+< #
+diff -r ./config_files/check_f77.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_f77.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/check_hdf5.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_hdf5.m4
+1,20d0
+< # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< #
+< # This library is free software; you can redistribute it and/or
+< # modify it under the terms of the GNU Lesser General Public
+< # License as published by the Free Software Foundation; either
+< # version 2.1 of the License.
+< #
+< # This library is distributed in the hope that it will be useful,
+< # but WITHOUT ANY WARRANTY; without even the implied warranty of
+< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< # Lesser General Public License for more details.
+< #
+< # You should have received a copy of the GNU Lesser General Public
+< # License along with this library; if not, write to the Free Software
+< # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< #
+< # See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< #
+< #
+diff -r ./config_files/check_htmlgen.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_htmlgen.m4
+1,2d0
+< dnl Copyright (C) 2003 CEA/DEN, EDF R&D
+<
+diff -r ./config_files/check_java.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_java.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/check_med2.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_med2.m4
+1,22d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+<
+diff -r ./config_files/check_mico.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_mico.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/check_mpich.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_mpich.m4
+1,22d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+<
+diff -r ./config_files/check_omniorb.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_omniorb.m4
+40d39
+< dnl OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB4 -I$OMNIORB_ROOT/include/COS"
+82,83d80
+< dnl omniORB_ok=yes
+<
+114,115d110
+<
+< dnl omniORB_ok=yes
+124d118
+< dnl OMNIORB_LIBS="$OMNIORB_LDFLAGS -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lCOSDynamic4"
+140d133
+< omniORB_ok=yes
+156c149
+< OMNIORB_IDLCXXFLAGS="-I$OMNIORB_ROOT/idl"
+---
+> OMNIORB_IDLCXXFLAGS="-bcxx -I$OMNIORB_ROOT/idl"
+diff -r ./config_files/check_opengl.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_opengl.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/check_pthreads.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_pthreads.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+29c8
+< dnl@id $Id$
+---
+> dnl@id $Id$
+diff -r ./config_files/check_pyqt.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_pyqt.m4
+1d0
+< dnl Copyright (C) 2003 CEA/DEN, EDF R&D
+8c7
+< pyqt_ok=yes
+---
+> pyqt_ok=no
+10c9,14
+< dnl were is pyqt ?
+---
+> PYTHON_SITE_PACKPYQT=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+> AC_CHECK_FILES($PYTHON_SITE_PACKPYQT/qt.py $PYTHON_SITE_PACKPYQT/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no)
+> if test "x$pyqt_ok" = xyes ; then
+> PYQT_INCLUDES="-I $PYTHON_SITE_PACKPYQT"
+> PYQT_LIBS="-L$PYTHON_SITE_PACKPYQT -lqtcmodule"
+> fi
+12,16c16,25
+< AC_ARG_WITH(pyqt,
+< [ --with-pyqt=DIR root directory path to PyQt installation ],
+< [PYQTDIR="$withval"
+< AC_MSG_RESULT("select $withval as path to PyQt")
+< ])
+---
+> if test "x$pyqt_ok" = xyes ; then
+> AC_CHECK_FILES(/usr/share/sip/qt/qtmod.sip,pyqt_ok=yes,pyqt_ok=no)
+> if test "x$pyqt_ok" = xyes ; then
+> PYQT_SIPS="/usr/share/sip/qt"
+> fi
+> AC_SUBST(PYQT_INCLUDES)
+> AC_SUBST(PYQT_LIBS)
+> AC_SUBST(PYQT_SIPS)
+> AC_MSG_RESULT(yes)
+> else
+18,22c27
+< AC_ARG_WITH(pyqt_sips,
+< [ --with-pyqt_sips=DIR a directory path to PyQt sips installation ],
+< [PYQT_SIPS="$withval"
+< AC_MSG_RESULT("select $withval as path to PyQt sips")
+< ])
+---
+> dnl were is pyqt ?
+23a29,89
+> if test -z $PYQTDIR; then
+> AC_MSG_WARN(You must provide PYQTDIR variable)
+> else
+> pyqt_ok=yes
+> fi
+>
+> version=`python -c "import qt;print qt.PYQT_VERSION"`
+> case "$version" in
+> 3.2*)
+> pyqt_vers=old ;;
+> 3.3*)
+> pyqt_vers=old ;;
+> 3.4*)
+> pyqt_vers=new ;;
+> 3.5*)
+> pyqt_vers=new ;;
+> *)
+> pyqt_vers=no ;;
+> esac
+>
+> if test "x$pyqt_ok" = xno -o ! -d "$PYQTDIR" ; then
+> AC_MSG_RESULT(no)
+> AC_MSG_WARN(pyqt not found)
+> else
+>
+> pyqt_ok=no
+>
+> if test "x$pyqt_vers" = "xold"
+> then
+> AC_CHECK_FILES("$PYQTDIR"/qt.py "$PYQTDIR"/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no)
+> if test "x$pyqt_ok" = xno -o ! -d "$PYQTDIR"/sip ; then
+> AC_MSG_RESULT(no)
+> AC_MSG_WARN(pyqt not found)
+> else
+> PYQT_ROOT=$PYQTDIR
+> PYQT_INCLUDES="-I$PYQTDIR/sip"
+> PYQT_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -L$PYQTDIR -lqtcmodule"
+> AC_SUBST(PYQT_ROOT)
+> AC_SUBST(PYQT_INCLUDES)
+> AC_SUBST(PYQT_LIBS)
+> AC_MSG_RESULT(yes)
+> fi
+> fi
+>
+> if test "x$pyqt_vers" = "xnew"
+> then
+> AC_CHECK_FILES("$PYQTDIR"/lib/qt.py "$PYQTDIR"/lib/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no)
+> if test "x$pyqt_ok" = xno ; then
+> AC_MSG_RESULT(no)
+> AC_MSG_WARN(pyqt not found)
+> else
+> PYQT_ROOT=$PYQTDIR
+> PYQT_INCLUDES="-I$PYQTDIR/sip"
+> PYQT_LIBS="-L$PYQTDIR/lib -lqtcmodule"
+> AC_SUBST(PYQT_ROOT)
+> AC_SUBST(PYQT_INCLUDES)
+> AC_SUBST(PYQT_LIBS)
+> AC_MSG_RESULT(yes)
+> fi
+> fi
+> fi
+25c91
+< AC_ARG_WITH(pyuic,
+---
+> AC_ARG_WITH(pyuic,
+28a95,96
+> ], [
+> AC_PATH_PROG(PYUIC, pyuic)
+30a99,110
+> if test "x$PYUIC" = "x"
+> then
+> pyqt_ok=no
+> AC_MSG_RESULT(pyuic not in PATH variable)
+> else
+> if test -z $PYQT_SIPS; then
+> AC_MSG_WARN(You must provide PYQT_SIPS variable)
+> pyqt_ok=no
+> else
+> PYQT_SIPS=${PYQT_SIPS}
+> fi
+> fi
+32,46c112,113
+< if test -z $PYQTDIR; then
+< PYQTDIR="/usr/lib/python${PYTHON_VERSION}/site-packages"
+< else
+< if test -z $PYQT_SIPS; then
+< PYQT_SIPS="$PYQTDIR/sip"
+< fi
+< if test -z $PYUIC; then
+< AC_CHECK_FILE("$PYQTDIR/pyuic",pyqt_ok=yes,pyqt_ok=no)
+< if test "x$pyqt_ok" = xyes ; then
+< PYUIC="$PYQTDIR/pyuic"
+< else
+< AC_PATH_PROG(PYUIC, pyuic)
+< fi
+< fi
+< fi
+---
+> AC_SUBST(PYUIC)
+> AC_SUBST(PYQT_SIPS)
+48,49c115
+< if test -z $PYQT_SIPS; then
+< PYQT_SIPS="/usr/share/sip/qt"
+---
+> AC_MSG_RESULT(for pyqt: $pyqt_ok)
+51,96d116
+<
+< if test -z $PYUIC; then
+< PYUIC="/usr/bin/pyuic"
+< fi
+<
+< AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
+< if test "x$pyqt_ok" = xno ; then
+< AC_MSG_RESULT(no)
+< AC_MSG_WARN(pyqt not found)
+< else
+< AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
+< if test "x$pyqt_ok" = xno ; then
+< AC_MSG_RESULT(no)
+< AC_MSG_WARN(pyqt not found)
+< else
+< PYQT_ROOT=$PYQTDIR
+< PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
+< fi
+< AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no)
+< if test "x$pyqt_ok" = xno ; then
+< AC_MSG_RESULT(no)
+< AC_MSG_WARN(pyqt not found)
+< else
+< PYQT_INCLUDES="-I$PYQT_SIPS"
+< fi
+<
+< AC_SUBST(PYQT_ROOT)
+< AC_SUBST(PYQT_INCLUDES)
+< AC_SUBST(PYQT_LIBS)
+<
+< AC_MSG_RESULT(yes)
+< fi
+<
+< PYQT_ROOT=$PYQTDIR
+< PYQT_INCLUDES="-I$PYQT_SIPS"
+< PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
+<
+< AC_SUBST(PYQT_ROOT)
+< AC_SUBST(PYQT_INCLUDES)
+< AC_SUBST(PYUIC)
+< AC_SUBST(PYQT_SIPS)
+< AC_SUBST(PYQT_LIBS)
+<
+<
+<
+< AC_MSG_RESULT(for pyqt: $pyqt_ok)
+diff -r ./config_files/check_qt.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_qt.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/check_qwt.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_qwt.m4
+1,2d0
+< dnl Copyright (C) 2003 CEA/DEN, EDF R&D
+<
+8c6
+< qwt_ok=yes
+---
+> qwt_ok=no
+11,23d8
+<
+< AC_ARG_WITH(qwt,
+< [ --with-qwt=DIR directory path to QWT installation ],
+< [QWTHOME="$withval"
+< AC_MSG_RESULT("select $withval as path to QWT")
+< ])
+<
+< AC_ARG_WITH(qwt_inc,
+< [ --with-qwt_inc=DIR directory path to QWT includes ],
+< [QWT_INCLUDES="$withval"
+< AC_MSG_RESULT("select $withval as path to QWT includes")
+< ])
+<
+25,37c10
+< exits_ok=no
+< AC_CHECK_FILE("/usr/local/lib/libqwt.so",exits_ok=yes,exits_ok=no)
+< if test "x$exits_ok" = "xyes"; then
+< QWTHOME="/usr/local/lib"
+< if test -z $QWT_INCLUDES; then
+< QWT_INCLUDES="/usr/local/include/qwt"
+< fi
+< else
+< QWTHOME="/usr/lib"
+< if test -z $QWT_INCLUDES; then
+< QWT_INCLUDES="/usr/include/qwt"
+< fi
+< fi
+---
+> AC_MSG_WARN(You must provide QWTHOME variable)
+39,41c12
+< if test -z $QWT_INCLUDES; then
+< QWT_INCLUDES="$QWTHOME/include"
+< fi
+---
+> qwt_ok=yes
+47d17
+< qwt_ok=no
+48a19
+>
+52c23
+< CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES"
+---
+> CPPFLAGS="$CPPFLAGS -I$QWTHOME/include"
+73c44
+< CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWT_INCLUDES"
+---
+> CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWTHOME/include"
+94c65
+< QWT_INCLUDES="-I$QWT_INCLUDES"
+---
+> QWT_INCLUDES="-I$QWTHOME/include"
+diff -r ./config_files/check_sip.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_sip.m4
+1d0
+< dnl Copyright (C) 2003 CEA/DEN, EDF R&D
+21,28c20,51
+< if test $SIPDIR ; then
+< SIP_ROOT="$SIPDIR"
+< SIP_INCLUDES="-I${SIPDIR}"
+< SIP_LIBS="-L${SIPDIR} -lsip"
+< else
+< SIP_INCLUDES="${PYTHON_INCLUDES}"
+< SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+< fi
+---
+> version=`sip -V`
+> case "$version" in
+> 3.2*)
+> sip_vers=old ;;
+> 3.3*)
+> sip_vers=old ;;
+> 3.4*)
+> sip_vers=new ;;
+> 3.5*)
+> sip_vers=new ;;
+> *)
+> sip_vers=no ;;
+> esac
+>
+> sip_ok=no
+>
+> if test "x$sip_vers" = "xold"
+> then
+> sip_ok=yes
+> SIP_ROOT="$SIPDIR"
+> SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}"
+> SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -L${SIPDIR} -lsip"
+> fi
+>
+> if test "x$sip_vers" = "xnew"
+> then
+> sip_ok=yes
+> SIP_ROOT="$SIPDIR"
+> SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include"
+> SIP_LIBS="-L${SIPDIR}/lib -lsip"
+> fi
+>
+diff -r ./config_files/check_swig.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_swig.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/check_vtk.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_vtk.m4
+1,22d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+<
+53,54c31,32
+< LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkPatented -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS -L$x_libraries -lX11 -lXt"
+< TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS -L$x_libraries -lX11 -lXt"
+---
+> LOCAL_LIBS="-lVTKCommon -lVTKGraphics -lVTKImaging -lVTKContrib $OGL_LIBS -L$x_libraries -lX11 -lXt"
+> TRY_LINK_LIBS="-lVTKCommon $OGL_LIBS -L$x_libraries -lX11 -lXt"
+60,62c38,40
+< LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
+< LOCAL_LIBS="-L$VTKHOME/lib/vtk $LOCAL_LIBS"
+< TRY_LINK_LIBS="-L$VTKHOME/lib/vtk $TRY_LINK_LIBS"
+---
+> LOCAL_INCLUDES="-I$VTKHOME/common -I$VTKHOME/imaging -I$VTKHOME/graphics -I$VTKHOME/contrib $LOCAL_INCLUDES"
+> LOCAL_LIBS="-L$VTKHOME/lib -L$VTKHOME/common -L$VTKHOME/graphics -L$VTKHOME/imaging -L$VTKHOME/contrib $LOCAL_LIBS"
+> TRY_LINK_LIBS="-L$VTKHOME/lib -L$VTKHOME/common $TRY_LINK_LIBS"
+67c45
+< CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
+---
+> CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES -Wno-deprecated"
+69c47
+< AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no")
+---
+> AC_CHECK_HEADER(vtk.h,vtk_ok="yes",vtk_ok="no")
+71c49
+< CPPFLAGS="$CPPFLAGS_old"
+---
+> CPPFLAGS="$CPPFLAGS_old"
+73,75c51,53
+< if test "x$vtk_ok" = "xyes"
+< then
+< VTK_INCLUDES="$LOCAL_INCLUDES"
+---
+> if test "x$vtk_ok" = "xyes"
+> then
+> VTK_INCLUDES="$LOCAL_INCLUDES"
+77c55
+< dnl vtk libraries
+---
+> dnl vtk libraries
+79c57
+< AC_MSG_CHECKING(linking VTK library)
+---
+> AC_MSG_CHECKING(linking VTK library)
+81,85c59,63
+< LIBS_old="$LIBS"
+< # LIBS="$LIBS $TRY_LINK_LIBS"
+< LIBS="$LIBS $LOCAL_LIBS"
+< CPPFLAGS_old="$CPPFLAGS"
+< CPPFLAGS="$CPPFLAGS $VTK_INCLUDES"
+---
+> LIBS_old="$LIBS"
+> # LIBS="$LIBS $TRY_LINK_LIBS"
+> LIBS="$LIBS $LOCAL_LIBS"
+> CPPFLAGS_old="$CPPFLAGS"
+> CPPFLAGS="$CPPFLAGS $VTK_INCLUDES -Wno-deprecated"
+87c65
+< dnl VTKPY_MODULES="$VTKHOME/python"
+---
+> dnl VTKPY_MODULES="$VTKHOME/python"
+89,91c67,69
+< AC_CACHE_VAL(salome_cv_lib_vtk,[
+< AC_TRY_LINK(
+< #include "vtkPlane.h"
+---
+> AC_CACHE_VAL(salome_cv_lib_vtk,[
+> AC_TRY_LINK(
+> #include <vtk.h>
+119,120d96
+<
+<
+diff -r ./config_files/enable_pthreads.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/enable_pthreads.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+27c6
+< dnl@id $Id$
+---
+> dnl@id $Id$
+diff -r ./config_files/mkinstalldirs /Salome2/KERNEL_SRC/salome_adm/unix/config_files/mkinstalldirs
+7c7
+< # $Id$
+---
+> # $Id$
+diff -r ./config_files/production.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/production.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+27c6
+< dnl version $Id$
+---
+> dnl version $Id$
+58c37
+< CXXFLAGS="$CXXFLAGS -O -Wno-deprecated "
+---
+> CXXFLAGS="$CXXFLAGS -O"
+92c71
+< CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ -Wno-deprecated "
+---
+> CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ "
+diff -r ./config_files/pyembed.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/pyembed.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./config_files/python.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/python.m4
+1,21d0
+< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+< dnl
+< dnl This library is free software; you can redistribute it and/or
+< dnl modify it under the terms of the GNU Lesser General Public
+< dnl License as published by the Free Software Foundation; either
+< dnl version 2.1 of the License.
+< dnl
+< dnl This library is distributed in the hope that it will be useful,
+< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+< dnl Lesser General Public License for more details.
+< dnl
+< dnl You should have received a copy of the GNU Lesser General Public
+< dnl License along with this library; if not, write to the Free Software
+< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+< dnl
+< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+< dnl
+< dnl
+< dnl
+diff -r ./depend.in /Salome2/KERNEL_SRC/salome_adm/unix/depend.in
+28c28
+< perl -p $(top_srcdir)/bin/distdep .depend >>$@; \
+---
+> perl -p $(top_srcdir)/bin/salome/distdep .depend >>$@; \
+diff -r ./envScript.in /Salome2/KERNEL_SRC/salome_adm/unix/envScript.in
+12c12
+< export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib:${LD_LIBRARY_PATH}
+---
+> export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib/salome:${LD_LIBRARY_PATH}
+18c18
+< export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin:${SALOME_HOME_DIR}/lib:${PYVTK_PATH}:${EXEC_DIR}
+---
+> export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin/salome:${SALOME_HOME_DIR}/lib/salome:${PYVTK_PATH}:${EXEC_DIR}
+diff -r ./make_commence.in /Salome2/KERNEL_SRC/salome_adm/unix/make_commence.in
+2c2
+< inc_builddir=$(top_builddir)/include
+---
+> inc_builddir=$(top_builddir)/include/salome
+13c13
+< LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib -Xlinker -rpath-link -Xlinker $(top_builddir)/lib
+---
+> LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+50,52c50,51
+< PYTHON_SITE = @PYTHON_SITE@
+< PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+<
+---
+> PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages
+> PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome
+102a102,107
+>
+> OCC_KERNEL_LIBS=@CAS_KERNEL@
+> OCC_OCAF_LIBS=@CAS_OCAF@
+> OCC_VIEWER_LIBS=@CAS_VIEWER@
+> OCC_MODELER_LIBS=@CAS_MODELER@
+> OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
+104,108c109
+< CAS_KERNEL=@CAS_KERNEL@
+< CAS_OCAF=@CAS_OCAF@
+< CAS_VIEWER=@CAS_VIEWER@
+< CAS_MODELER=@CAS_MODELER@
+< CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@
+---
+>
+128c129
+< OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/share/salome/idl
+---
+> OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl
+145c146
+< IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/share/salome/idl -I$(srcdir)
+---
+> IDLCXXFLAGS = @IDLCXXFLAGS@ -I$(top_builddir)/idl
+188,189c189,190
+< bindir=@bindir@
+< libdir=@libdir@
+---
+> bindir=@bindir@/salome
+> libdir=@libdir@/salome
+193c194
+< idldir=$(datadir)/idl
+---
+> idldir=${prefix}/idl/salome
+194a196
+> incmakedir=${prefix}/salome_adm/unix
+196c198
+< docdir=@exec_prefix@/doc
+---
+> docdir=$(datadir)/doc
+246,248c248,249
+< $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=$(top_srcdir)/adm/unix/config_files/%)
+< cd $(top_srcdir) ; aclocal --acdir=./adm/unix/config_files
+<
+---
+> $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
+> cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+diff -r ./make_conclude.in /Salome2/KERNEL_SRC/salome_adm/unix/make_conclude.in
+10c10
+< # $Header$
+---
+> # $Header$
+38,40c38,40
+< # LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/%.la)
+< LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/%.la, $(filter %.la, $(LIB)))
+< LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/%.a, $(filter %.a, $(LIB)))
+---
+> # LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la)
+> LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB)))
+> LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB)))
+51c51
+< $(LIB_BUILD): $(top_builddir)/lib/%.la: %.la
+---
+> $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
+55,56c55,56
+< ln -sf $(CURDIR)/$< $@ || true
+< ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \
+---
+> ln -s $(CURDIR)/$< $@ || true
+> ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \
+58c58
+< ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \
+---
+> ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \
+62c62
+< ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/_$(LIB_SWIG) || true;\
+---
+> ln -s $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\
+65c65
+< $(LIB_BUILD_A): $(top_builddir)/lib/%.a: %.a
+---
+> $(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a
+67c67
+< ln -sf $(CURDIR)/$< $@ || true
+---
+> ln -s $(CURDIR)/$< $@ || true
+89c89
+< bin: $(BIN:%=$(top_builddir)/bin/%) $(BIN) $(LIB) pyscripts sharedpyscripts
+---
+> bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts
+93c93
+< $(BIN:%=$(top_builddir)/bin/%) $(TEST_PROGS:%=$(top_builddir)/bin/%): $(top_builddir)/bin/%: %
+---
+> $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: %
+95c95
+< ln -sf $(CURDIR)/$< $@
+---
+> ln -s $(CURDIR)/$< $@
+100c100
+< # copy python scripts in $(top_builddir)/bin
+---
+> # copy python scripts in $(top_builddir)/bin/salome
+102c102
+< DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/%)
+---
+> DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%)
+104c104
+< $(DEST_PYSCRIPTS): $(top_builddir)/bin/%: %
+---
+> $(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: %
+123c123
+< test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/%)
+---
+> test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%)
+148c148
+< (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \
+---
+> (cd $(libdir); ln -s $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \
+164c164
+< ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \
+---
+> (cp -p $$f $(includedir) || exit 1); \
+263,266c263,266
+< -$(RM) $(top_builddir)/lib/$(LIB)
+< -$(RM) $(patsubst %,$(top_builddir)/bin/%, $(BIN))
+< -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/$(LIB))
+< -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/$(LIB))
+---
+> -$(RM) $(top_builddir)/lib/salome/$(LIB)
+> -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN))
+> -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB))
+> -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB))
+330c330,334
+< $(top_builddir)/bin/msg2qm $< $@
+---
+> if test -e ${KERNEL_ROOT_DIR}/bin/salome/msg2qm ; then \
+> ${KERNEL_ROOT_DIR}/bin/salome/msg2qm $< $@ ; \
+> else \
+> $(top_builddir)/bin/salome/msg2qm $< $@ ; \
+> fi
+diff -r ./make_omniorb.in /Salome2/KERNEL_SRC/salome_adm/unix/make_omniorb.in
+10c10
+< # $Header$
+---
+> # $Header$
+19c19
+< %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/share/salome/idl/%.idl
+---
+> %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl
+Only in .: toto
