From 3c9d7b0dece29312633ea19b69d42884c709b693 Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 7 Mar 2008 07:47:31 +0000 Subject: [PATCH] Join modifications from BR_Dev_For_4_0 tag V4_1_1. --- AUTHORS | 0 COPYING | 504 ++++++++++++++++++ ChangeLog | 0 Makefile.am | 44 ++ Makefile.in | 120 ----- NEWS | 0 README | 0 adm_local/Makefile.am | 19 + adm_local/unix/Makefile.am | 22 + adm_local/unix/config_files/Makefile.am | 23 + adm_local/unix/make_commence.in | 291 ---------- adm_local/unix/make_common_starter.am | 54 ++ adm_local/unix/make_conclude.in | 346 ------------ adm_local/unix/make_omniorb.in | 56 -- bin/Makefile.am | 35 ++ build_configure | 290 ++++------ configure.in.base => configure.ac | 162 +++--- idl/Makefile.am | 157 ++++++ idl/Makefile.in | 98 ---- resources/COMPONENTCatalog.xml.in | 69 +-- .../Makefile.in => resources/Makefile.am | 52 +- resources/SalomeApp.xml | 2 +- src/AddComponent/{Makefile.in => Makefile.am} | 61 ++- .../{Makefile.in => Makefile.am} | 63 ++- src/CalculatorComponent/CalculatorEngine.cxx | 101 ++-- .../Makefile.am} | 61 +-- src/CalculatorComponent/Makefile.in | 59 -- .../{Makefile.in => Makefile.am} | 59 +- src/DivComponent/{Makefile.in => Makefile.am} | 45 +- .../{Makefile.in => Makefile.am} | 27 +- src/{Makefile.in => Makefile.am} | 29 +- src/MulComponent/{Makefile.in => Makefile.am} | 47 +- .../{Makefile.in => Makefile.am} | 52 +- src/SIGNALSComponent_Swig/Makefile.am | 102 ++++ src/SIGNALSComponent_Swig/Makefile.in | 60 --- .../libSIGNALSComponent_Swig.i | 20 + src/SubComponent/{Makefile.in => Makefile.am} | 47 +- src/SyrComponent/Makefile.am | 75 +++ src/SyrComponent/Makefile.in | 60 --- .../{Makefile.in => Makefile.am} | 26 +- .../{Makefile.in => Makefile.am} | 65 ++- src/TypesCheck/Makefile.am | 72 +++ .../{Makefile.in => Makefile.am} | 47 +- 43 files changed, 1735 insertions(+), 1787 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 Makefile.am delete mode 100644 Makefile.in create mode 100644 NEWS create mode 100644 README create mode 100644 adm_local/Makefile.am create mode 100644 adm_local/unix/Makefile.am create mode 100644 adm_local/unix/config_files/Makefile.am delete mode 100644 adm_local/unix/make_commence.in create mode 100644 adm_local/unix/make_common_starter.am delete mode 100644 adm_local/unix/make_conclude.in delete mode 100644 adm_local/unix/make_omniorb.in create mode 100644 bin/Makefile.am rename configure.in.base => configure.ac (77%) create mode 100644 idl/Makefile.am delete mode 100644 idl/Makefile.in rename adm_local/Makefile.in => resources/Makefile.am (65%) rename src/AddComponent/{Makefile.in => Makefile.am} (50%) rename src/AdditionComponent/{Makefile.in => Makefile.am} (50%) rename src/{TypesCheck/Makefile.in => CalculatorComponent/Makefile.am} (59%) delete mode 100755 src/CalculatorComponent/Makefile.in rename src/DataStreamComponent/{Makefile.in => Makefile.am} (50%) rename src/DivComponent/{Makefile.in => Makefile.am} (65%) rename src/FactorialComponent/{Makefile.in => Makefile.am} (79%) rename src/{Makefile.in => Makefile.am} (63%) rename src/MulComponent/{Makefile.in => Makefile.am} (65%) rename src/SIGNALSComponent/{Makefile.in => Makefile.am} (52%) create mode 100644 src/SIGNALSComponent_Swig/Makefile.am delete mode 100644 src/SIGNALSComponent_Swig/Makefile.in rename src/SubComponent/{Makefile.in => Makefile.am} (65%) create mode 100755 src/SyrComponent/Makefile.am delete mode 100755 src/SyrComponent/Makefile.in rename src/SyrControlComponent/{Makefile.in => Makefile.am} (77%) rename src/TestFunctions/{Makefile.in => Makefile.am} (51%) create mode 100755 src/TypesCheck/Makefile.am rename src/UndefinedSymbolComponent/{Makefile.in => Makefile.am} (64%) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..b1e3f5a --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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, or (at your option) any later version. + + 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 + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..be9ccfa --- /dev/null +++ b/Makefile.am @@ -0,0 +1,44 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header: +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + + +SUBDIRS = idl adm_local resources src bin + +DIST_SUBDIRS = idl adm_local resources src bin + +DISTCLEANFILES = a.out aclocal.m4 configure + +salomeinclude_DATA=COMPONENT_version.h + +EXTRA_DIST+= \ + build_configure \ + clean_configure \ + LICENCE + +dist-hook: + rm -rf `find $(distdir) -name CVS` diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 9109cee..0000000 --- a/Makefile.in +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -* Makefile *- -# -# Author : C. Caremoli -# Date : 10/10/2003 -# $Header$ -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl - - -@COMMENCE@ - -SUBDIRS = idl src adm_local - -RESOURCES_FILES = \ - COMPONENTCatalog.xml SalomeApp.xml - -BIN_SCRIPT= VERSION - -include_list = include/salome/SALOMEconfig.h \ - include/salome/COMPONENT_version.h - -ifneq ($(HAVE_SSTREAM),yes) - include_list += include/salome/sstream -endif - -inc: idl $(include_list) - -bin: bin/salome/VERSION - -bin/salome/VERSION : bin/VERSION - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref - -$(RM) $@ - $(LN_S) ../../$< $@ - -# test if SALOMEconfig.h has changed (contents) -salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h - @if ! [ -a $@ ]; then \ - cp -p -f $< $@; \ - fi; \ - if ! cmp $< $@; then \ - cp -p -f $< $@; \ - fi; \ - -include/salome/sstream: salome_adm/unix/sstream - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/COMPONENT_version.h: COMPONENT_version.h - -$(RM) $@ - $(LN_S) ../../$< $@ - -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 - -# doc is already build : if you want to had documents, go manually to doc and run 'make doc' -#doc: -# (cd doc && $(MAKE) $@) || exit 1 - -install-end: -# finish libtool install -# @$(LT) --mode=finish $(libdir) - -install-include: $(include_list) - $(INSTALL) -d $(includedir) - @for f in X $(include_list); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - $(INSTALL_PROGRAM) $^ $(bindir) - -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl - -distclean: distclean-other - -distclean-other: - -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old - -$(RM) salome_adm/unix/make_* - -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h - -$(RM) config.cache config.log config.status - -@MODULE@ - -install: install-bin install-include install-end - diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am new file mode 100644 index 0000000..7ae83a6 --- /dev/null +++ b/adm_local/Makefile.am @@ -0,0 +1,19 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +SUBDIRS = unix diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am new file mode 100644 index 0000000..facd4e6 --- /dev/null +++ b/adm_local/unix/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am new file mode 100644 index 0000000..6b8f8ae --- /dev/null +++ b/adm_local/unix/config_files/Makefile.am @@ -0,0 +1,23 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocalm4_DATA=\ +check_COMPONENT.m4\ +README diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in deleted file mode 100644 index 9196dc4..0000000 --- a/adm_local/unix/make_commence.in +++ /dev/null @@ -1,291 +0,0 @@ -# common directories to put headerfiles -inc_builddir=$(top_builddir)/include/salome - -@SET_MAKE@ -SHELL=@SHELL@ - -# header missing - -HAVE_SSTREAM=@HAVE_SSTREAM@ - - -LIBS=@LIBS@ -LIBSFORBIN=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -# add libstdc++ to link c++ library with libtool ! -LDFLAGS+= @STDLIB@ -LDFLAGSFORBIN+= @STDLIB@ - -CP=@CP@ - -# CPP - -CPP=@CPP@ -CXXCPP=@CXXCPP@ -CPPFLAGS=@CPPFLAGS@ -I$(inc_builddir) -I$(srcdir) -I. - -# C - -CC = @CC@ -CFLAGS = @CFLAGS@ -C_DEPEND_FLAG = @C_DEPEND_FLAG@ - -# C++ - -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ - -# JAVA - -JAVA_INCLUDES = @JAVA_INCLUDES@ -JAVA_LIBS = @JAVA_LIBS@ -JAVA_LDPATH = @JAVA_LDPATH@ - -# PYTHON - -PYTHON = @PYTHON@ -PYTHONHOME = @PYTHONHOME@ -PYTHON_INCLUDES = @PYTHON_INCLUDES@ -PYTHON_LIBS = @PYTHON_LIBS@ -PYTHON_VERSION = @PYTHON_VERSION@ -# Changes from the SalomePro V1.2c -#PYTHON_SITE = @PYTHON_SITE@ -#PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ -PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome - -# QT - -QT_ROOT = @QT_ROOT@ -QT_INCLUDES = @QT_INCLUDES@ -QT_MT_INCLUDES = @QT_INCLUDES@ -DQT_THREAD_SUPPORT -QT_LIBS = @QT_LIBS@ -QT_MT_LIBS = @QT_MT_LIBS@ - -MOC = @MOC@ -UIC = @UIC@ - - -#QWT - -QWT_INCLUDES=@QWT_INCLUDES@ -QWT_LIBS=@QWT_LIBS@ - -# SIP -SIP = @SIP@ -SIP_INCLUDES = @SIP_INCLUDES@ -SIP_LIBS = @SIP_LIBS@ - -# PYQT -PYQT_SIPS = @PYQT_SIPS@ -PYQT_LIBS = @PYQT_LIBS@ - -# openGL -OGL_INCLUDES=@OGL_INCLUDES@ -OGL_LIBS=@OGL_LIBS@ - -# VTK -VTK_INCLUDES=@VTK_INCLUDES@ -VTK_LIBS=@VTK_LIBS@ - -# HDF5 - -HDF5_INCLUDES=@HDF5_INCLUDES@ -HDF5_LIBS=@HDF5_LIBS@ -HDF5_MT_LIBS=@HDF5_MT_LIBS@ - -# MED2 - -MED2_INCLUDES=@MED2_INCLUDES@ -MED2_LIBS=@MED2_LIBS@ -MED2_MT_LIBS=@MED2_MT_LIBS@ - -# OpenCasCade - -OCC_INCLUDES=@CAS_CPPFLAGS@ -OCC_CXXFLAGS=@CAS_CXXFLAGS@ - -#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@ -#OCC_LIBS=@CAS_LDFLAGS@ -CAS_KERNEL=@CAS_KERNEL@ -CAS_OCAF=@CAS_OCAF@ -CAS_VIEWER=@CAS_VIEWER@ -CAS_MODELER=@CAS_MODELER@ -CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ -CAS_LDPATH=@CAS_LDPATH@ - -# MPICH - -MPICH_INCLUDES=@MPICH_INCLUDES@ -MPICH_LIBS=@MPICH_LIBS@ - -# Swig C++ Python - -SWIG = @SWIG@ -SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I. - -# OMNIORB - -OMNIORB_ROOT = @OMNIORB_ROOT@ -OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ -OMNIORB_LIBS = @OMNIORB_LIBS@ -OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ - -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome - -OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ -OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ -OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ - -OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ -OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ -OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ - -# Default ORB - -CORBA_ROOT = @CORBA_ROOT@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CORBA_LIBS = @CORBA_LIBS@ -CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ - -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome - -IDLPYFLAGS = @IDLPYFLAGS@ - -IDL = @IDL@ - -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_CXX = @IDL_CLN_CXX@ -IDL_CLN_OBJ = @IDL_CLN_OBJ@ - -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_CXX = @IDL_SRV_CXX@ -IDL_SRV_OBJ = @IDL_SRV_OBJ@ - -CPPFLAGS+= $(CORBA_INCLUDES) -CXXFLAGS+= $(CORBA_CXXFLAGS) - -# add corba libs when link salome application ! -#LDFLAGS+= $(CORBA_LIBS) -LIBS+=$(CORBA_LIBS) - -DOXYGEN = @DOXYGEN@ - -## Shared libraries -LT_STATIC_EXEC=@LT_STATIC_EXEC@ -DYNAMIC_DIRS=@DYNAMIC_DIRS@ -LT_LIB=libtool -LT=$(top_builddir)/libtool -LT_COMPILE=$(LT) --mode=compile $(CC) -LT_LINK_LIB=$(LT_LIB) --mode=link $(CC) -rpath $(libdir) -LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) -LT_RUN=$(LT) --mode=execute -LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) -LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) -LT_UNINSTALL=$(LT) --mode=uninstall $(RM) - -INSTALL=@INSTALL@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_DATA=@INSTALL_DATA@ - -# create a symbolic link (or a copie ?) -LN_S=@LN_S@ - -KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ - -KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ -KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ - -MED_ROOT_DIR=@MED_ROOT_DIR@ -MED_CXXFLAGS=@MED_CXXFLAGS@ -MED_LDFLAGS=@MED_LDFLAGS@ - -## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@/salome -libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome -# warning : if user give this path in configure we could have salome/salome :-( -includedir=@includedir@/salome -datadir=@datadir@/salome -idldir=$(prefix)/idl/salome -sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules -incmakedir=${prefix}/salome_adm/unix - -docdir=$(datadir)/doc - -# -# begin of package rules -# - -.PHONY: all lib bin inc resources tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean - -.SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm - -all: - $(MAKE) inc - $(MAKE) depend_idl - $(MAKE) depend - $(MAKE) lib - $(MAKE) bin - $(MAKE) resources - -# -# add target to build administrative files -# - -Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in - cd $(top_builddir) ; ./config.status - -LOCAL_MAKE = make_commence make_conclude make_omniorb - -KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript - -$(top_builddir)/config.status: $(top_srcdir)/configure \ - $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ - $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) - cd $(top_builddir) ; ./config.status --recheck - -# VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) -ifneq ($(top_srcdir),$(srcdir)) -configure: $(top_srcdir)/configure -endif - -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4 - cd $(top_srcdir) ; autoconf - -$(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base - cd $(top_srcdir) && ./build_configure - - -ACLOCAL_KERNEL = \ -ac_cxx_bool.m4 check_corba.m4 \ -ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ -ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ -ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 python.m4 \ -ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_swig.m4 - -ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.m4 - -ACLOCAL_MED = check_Med2.m4 - -$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ - $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \ - $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ - -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ - -I @MED_ROOT_DIR@/adm_local/unix/config_files - diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am new file mode 100644 index 0000000..5339413 --- /dev/null +++ b/adm_local/unix/make_common_starter.am @@ -0,0 +1,54 @@ +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# + +# Standard directory for installation +salomeincludedir = $(includedir)/@PACKAGE@ +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ +bindir = $(prefix)/bin/@PACKAGE@ +salomescriptdir = $(bindir) + +# Directory for installing idl files +salomeidldir = $(prefix)/idl/@PACKAGE@ + +# Directory for installing resource files +salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir =$(pkgpythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/@PACKAGE@ + +# common rules + +# moc-files generation +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# qm-files generation +%.qm: %.po + $(MSG2QM) $< $@ + +EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) + +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm + +# tests +tests: unittest + +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in deleted file mode 100644 index 19ac4e0..0000000 --- a/adm_local/unix/make_conclude.in +++ /dev/null @@ -1,346 +0,0 @@ -#======================================================================= -# This section of this makefile comes from the file -# 'adm/unix/make_conclude' which was generated with config.status -# from file adm/unix/make_conclude.in -#======================================================================= -# -* Makefile *- -# -# Authors : Patrick GOLDBRONN (CEA) - Marc Tajchman (CEA) -# Date : 6/07/2001 -# $Header$ -# - -# ORB Specifics rules -@CORBA@ - -# transform idl reference in appropriate obj file -LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -LIB_SERVER_SRC = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) -LIB_MOC_SRC = $(LIB_MOC:%.h=%_moc.cxx) -LIB_SRC+=$(LIB_MOC_SRC) -LIB_SWIG_SRC = $(SWIG_DEF:%.i=%_wrap.cxx) -LIB_DEP= $(LIB_SRC) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(LIB_SWIG_SRC) - -LIB_CLIENT_OBJ = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) -LIB_SERVER_OBJ = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) - - -# transform c file in appropriate libtool obj file (.c, .cc and .cxx) -LIB_OBJ_C = $(patsubst %.c, %.lo, $(filter %.c, $(LIB_SRC))) -LIB_OBJ_CC = $(patsubst %.cc, %.lo, $(filter %.cc, $(LIB_SRC))) -LIB_OBJ_CXX = $(patsubst %.cxx, %.lo, $(filter %.cxx, $(LIB_SRC))) -LIB_SWIG_OBJ = $(LIB_SWIG_SRC:%.cxx=%.lo) -LIB_OBJ_F = $(patsubst %.f, %.lo, $(filter %.f, $(LIB_SRC))) - -# 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@LIB_LOCATION_SUFFIX@/salome/%.la) -LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la, $(filter %.la, $(LIB))) -LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a, $(filter %.a, $(LIB))) - -ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) -LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) -else -LIB_SWIG = -endif - -lib: $(LIB_BUILD) $(LIB_CLIENT_PY) -# we don't build static library ! - -$(LIB_BUILD): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la: %.la - -$(RM) $@ - -$(RM) $(patsubst %.la, %.so, $@) - -$(RM) $(patsubst %.la, %.a, $@) - ln -sf $(CURDIR)/$< $@ || true - ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \ - $(patsubst %.la, %.so, $@) || true - ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ - $(patsubst %.la, %.so, $@).0 || true - - if test "X$(LIB_SWIG)" != "X"; then \ - ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/_$(LIB_SWIG) || true;\ - fi; - -$(LIB_BUILD_A): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a: %.a - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ || true - -$(LIB): $(LIB_OBJ) - @$(LT) --mode=link $(CXX) -rpath $(libdir) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS) - -# transform idl reference in appropriate obj file -BIN_CLIENT_SRC = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -BIN_SERVER_SRC = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) -BIN_MOC_SRC = $(BIN_MOC:%.h=%_moc.cxx) -BIN_SRC+=$(BIN_MOC_SRC) -BIN_DEP=$(BIN:%=%.cxx) $(BIN_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) - -BIN_CLIENT_OBJ = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) -BIN_SERVER_OBJ = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) -# transform c file in appropriate libtool obj file (.c) -BIN_OBJ_C = $(patsubst %.c, %.o, $(filter %.c, $(BIN_SRC))) -# transform c++ file in appropriate libtool obj file (.cc and .cxx) -BIN_OBJ_CC = $(patsubst %.cc, %.o, $(filter %.cc, $(BIN_SRC))) -BIN_OBJ_CXX = $(patsubst %.cxx, %.o, $(filter %.cxx, $(BIN_SRC))) -# 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_LIB=$(LIB:lib%.la=-l%) - -$(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: % - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ - -$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) - $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) - -# copy python scripts in $(top_builddir)/bin/salome -# -DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%) -pyscripts: $(DEST_PYSCRIPTS) -$(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % - cp -f $< $@ - -# copy pyqt files in $(PYTHON_SHARED_SITE) -# -PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules - -$(PYTHON_SHARED_SITE): - $(INSTALL) -d $@ - -DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(PYTHON_SHARED_SITE)/%) -sharedpyscripts: $(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) -$(DEST_SHAREDPYSCRIPTS): $(PYTHON_SHARED_SITE)/%: % - cp -f $< $@ - -check: test - -tests: test - -test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%) - - -# copy header file in $(inc_builddir) -# -DEST_HEADERS = $(EXPORT_HEADERS:%=$(inc_builddir)/%) -inc: $(DEST_HEADERS) -$(DEST_HEADERS): $(inc_builddir)/%: % - cp -f $< $@ - -# build resources file (icons and messages) : .qm file from .po file -resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm) - -# Make installation directories if they don't exist. -$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): - $(INSTALL) -d $@ && chmod 755 $@ - -# Install the library, the public header files, and programs. -install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm - @for f in X $(LIB); do \ - if test $$f != X; then \ - ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ - fi; \ - done - @if test "X$(LIB_SWIG)" != "X"; then \ - (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 \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ - fi; \ - done -# Install tests programmes in bindir - @for f in X $(TEST_PROGS); do \ - if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ - fi; \ - done -# Install exported includes in includedir - @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ - if test $$f != X; then \ - (cp -p -f $$f $(includedir) || exit 1); \ - fi; \ - done - -# Install python script in $(bindir) -install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) - -$(EXPORT_PYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(bindir)/. - -#install-python: $(bindir) $(EXPORT_PYSCRIPTS) -# @for f in X $(EXPORT_PYSCRIPTS); do \ -# if test $$f != X; then \ -# ($(INSTALL_PROGRAM) $$f $(bindir)/. || exit 1); \ -# fi; \ -# done - -# Install pyqt script in $(install-sharedpyqt) -install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) - -$(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(sharedpydir)/. - - -# generic rule to install .qm files : -install-qm: resources - $(INSTALL) -d $(datadir)/resources - @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1); \ - fi; \ - done - -# Removes those things that `make install' (would have) installed. -uninstall: - @if test "X$(LIB)" != X; then \ - for f in $(LIB); do \ - $(LT_UNINSTALL) $(libdir)/$$f; \ - done; \ - fi - @if test "X$(BIN)" != X; then \ - for f in $(BIN); do \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - done; \ - fi - @for f in X $(TEST_PROGS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - fi; \ - done -# Uninstall exported includes in includedir - @for f in X $(EXPORT_HEADERS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(includedir)/$$f; \ - fi; \ - done -# Uninstall python script in $(bindir) - @for f in X $(EXPORT_PYSCRIPTS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f ; \ - fi; \ - done - -# Uninstall pyqt script in $(sharedpydir) - @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ - fi; \ - done - -# Uninstall qm files - @for f in X $(PO_FILES:%.po=%.qm); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(datadir)/resources/$$f ; \ - fi; \ - done - -# remove all dependencies files -# -cleandep: - -$(RM) .dep* - -# Removes temporary files without removing the final target files. That is, -# remove things like object files but not libraries or executables. -# -mostlyclean: cleandep - -$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o) - -$(RM) $(BIN_OBJ) $(BIN:%=%.o) - -$(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o) - -$(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN) - -# Like `mostlyclean' except it also removes the final targets: things like -# libraries and executables. This target doesn't remove any file that -# is part of the SALOME distribution. -# -clean: mostlyclean - -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN) - -$(RM) TAGS *~ *# core *.core - -$(RM) -r .libs - -$(RM) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB) - -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN)) - -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) - -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) -# remove idl generated files (sources) - -$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) -# remove idl generated files (headers) - -$(RM) $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_H)) - -$(RM) $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_H)) - -$(RM) $(LIB_MOC_SRC) $(BIN_MOC_SRC) - -$(RM) $(LIB_SWIG_SRC) - -# Like `clean' except it also removes files that were created by running -# configure. If you've unpacked the source and built without creating -# any other files, then `make distclean' will leave only the files that were -# in the distribution. -# -distclean: clean - #remove qm file ! - -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm) - #remove include files - -$(RM) $(DEST_HEADERS) - -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep* - @if test -f $(srcdir)/Makefile.in; then \ - (@SETX@; $(RM) Makefile); \ - fi - - -#implicits rules -.cc.o: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cc.lo: - $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cxx.o: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cxx.lo: - $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - -.c.lo: - $(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $< - -.f.o: - $(FC) $(FFLAGS) -c $< -o $@ - -.f.lo: - $(LT) --mode=compile $(FC) $(FFLAGS) -c $< - -.ui.h: - $(UIC) -o $@ $< - -.ui.cxx: - $(UIC) -o $@ -i $*.h $< - -#pattern rules -%_moc.cxx : %.h - $(MOC) $< -o $@ - -%_wrap.cxx : %.i - $(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 - -#------------------------------------------------------------------------------ -# The following section of this makefile contains dependencies between the -# source files and the header files. If GNU make and GCC are being used then -# the dependencies are in the form of rules that cause the information to -# be kept updated automatically. Otherwise the dependencies are listed -# explicitly and come from the `.distdep' files in the various directories. -# These files are part of the distribution and are generated automatically on -# GNU/GCC systems. -#------------------------------------------------------------------------------ - -@DEPEND@ diff --git a/adm_local/unix/make_omniorb.in b/adm_local/unix/make_omniorb.in deleted file mode 100644 index 8e82576..0000000 --- a/adm_local/unix/make_omniorb.in +++ /dev/null @@ -1,56 +0,0 @@ -#======================================================================= -# Begin specific part to omniorb -# (include from file adm/unix/make_omniorb generated by -# adm/unix/make_omniorb.in) -#======================================================================= -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 29/06/2001 -# $Header$ -# - -# Client and server object are the same with omniorb -# There are one header file and one source file generate - -#IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ)) - -# dependancies between idl and it's generated files -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${KERNEL_ROOT_DIR}/idl/salome/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${MED_ROOT_DIR}/idl/salome/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -# dependncies between idl files -depend_idl: .depidl - -# we use cpp to generate dependencies between idl files. -# we change cpp output to keep only idl file and transform it to get a suitable rule -.depidl: $(IDL_FILES) - @touch $@ - @for dep in $? dummy; do \ - if [ $$dep != "dummy" ]; then \ - echo Building dependencies for $$dep; \ - basedep=`basename $$dep .idl`; \ - header="$$basedep"$(IDL_CLN_H); \ - sed '\%^'"$$header"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(CPP) $(C_DEPEND_FLAG) -I$(srcdir) $$dep 2>/dev/null | \ - sed `echo "s%$$basedep\\.idl%$$header:%g"` | \ - sed 's% $(srcdir)/% %g' | \ - sed 's% $(top_srcdir)/% %g' | \ - sed 's% $(top_builddir)/% %g' | \ - sed 's%^.*:\.o: *%%' | sed 's%^ *\\ *%%'| sed 's%^ *\(.*\):%\1:%' | \ - sed 's/\.idl/$(IDL_CLN_H)/' >>$@; \ - echo '' >>$@; \ - fi; \ - done ; - --include .depidl - -#======================================================================= -# End specific part to omniorb -#======================================================================= diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 0000000..b7e87c7 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,35 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# -* Makefile *- +# +# Author : Guillaume Boulant (CSSI) +# Module : COMPONENT +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# These files are data, module or lib files +nodist_salomescript_DATA= VERSION + +EXTRA_DIST+= VERSION.in diff --git a/build_configure b/build_configure index d67de27..d5d1fcd 100755 --- a/build_configure +++ b/build_configure @@ -5,12 +5,14 @@ # and regenerating configure script # # Author : Marc Tajchman - CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Date : 10/10/2002 # $Header$ # ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +COMPONENT_WITH_GUI="yes" ######################################################################## # Test if the KERNEL_ROOT_DIR is set correctly @@ -26,12 +28,27 @@ fi # echo "failed : KERNEL_SRC variable is not correct !" # exit #fi + +for option +do + case $option in + -with-ihm | --with-ihm) + COMPONENT_WITH_GUI="yes" + break;; + -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no) + COMPONENT_WITH_GUI="no" + break;; + esac +done + ######################################################################## # Test if the GUI_ROOT_DIR is set correctly -if test ! -d "${GUI_ROOT_DIR}"; then - echo "failed : GUI_ROOT_DIR variable is not correct !" - exit +if test ${COMPONENT_WITH_GUI} = yes; then + if test ! -d "${GUI_ROOT_DIR}"; then + echo "failed : GUI_ROOT_DIR variable is not correct !" + exit + fi fi ######################################################################## @@ -42,206 +59,85 @@ if test ! -d "${MED_ROOT_DIR}"; then exit fi -######################################################################## -# find_in - utility function -# -# usage : -# find_in directory filename -# -# Finds files following the *.in pattern, recursively in the -# directory (first argument). -# Results are appended into the file (second argument) -# -# Difference from the standard unix find is that files are tested -# before directories -# - -find_in() -{ - i=0 - f=$2 - -# if the first argument is not a directory, returns - - if [ ! -d "$1" ] ; then - return - fi - -# dont look in the CVS directories - - case $1 in - */CVS) return ;; - */adm_local/*) return ;; - *) ;; - esac - -# for each regular file contained in the directory -# test if it's a .in file - - for i in "$1"/* - do - if [ -f "$i" ] ; then - case $i in - *.in) echo " "$i" \\" >> $f;; - *) ;; - esac - fi - done - -# for each subdirectory of the first argument, proceeds recursively - - for i in "$1"/* - do - if [ -d "$i" ] ; then - find_in "$i" "$f" - fi - done -} - - -####################################################################### -# Generate list of .in files (Makefile.in, config.h.in, etc) -# appending it in file configure.in - cd ${CONF_DIR} ABS_CONF_DIR=`pwd` -# -# Common part of the configure.in file -# -chmod u+w configure.in.base -if \cp -f configure.in.base configure.in_tmp1 -then - echo -else - echo - echo "error : can't create files in" ${CONF_DIR} - echo "aborting ..." - chmod u-w configure.in.base - exit -fi -chmod u-w configure.in.base - -if [ -e "${CONF_DIR}/salome_adm" ] ; then - \rm -f ${CONF_DIR}/salome_adm -fi +mkdir -p salome_adm/unix/config_files +#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files +#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix -# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files -echo "" >> configure.in_tmp1 -echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 +cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix -echo "" >> configure.in_tmp1 -echo "AC_OUTPUT([ \\" >> configure.in_tmp1 - -# -# List of .in files in the adm/unix directory -# These files MUST be on top of AC_OUTPUT list so we -# put them "manually" -# -# Attention, l'ordre d'entrée des fichiers doit être choisi avec -# précision -# -echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 - -echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 - -# _CS_gbo Pour assurer ls construction correct de la chaîne de -# dépendance, il apparaît nécessaire de surcharger le make_conclude -# (resp. make_commence) pardéfaut, c'est à dire le make_conclude de -# salome_adm, par le make_conclude (resp. make_commence) du module, -# c'est à dire le make_conclude (resp. make_commence) du répertoire -# adm_local -echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1 - -\rm -f configure.in_tmp2 configure.in_tmp3 -touch configure.in_tmp2 - -find_in . configure.in_tmp2 - -# _CS_gbo_100204 Mise à jour du filtre pour prise en compte des -# restrictions imposées par les versions récente de autoconf. - sed -e '/^...salome_adm/d' \ - -e '/configure.in/d' \ - -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1 - -echo "])" >> configure.in_tmp1 - -# delete the link created for AC_OUTPUT -echo "" >> configure.in_tmp1 -#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1 -\mv configure.in_tmp1 configure.in_new -\rm -f configure.in_tmp2 configure.in_tmp3 - - -######################################################################## -# Create new (or replace old) configure.in file -# Print a message if the file is write protected -# - -echo -if test ! -f configure.in -then - echo -n "Creating new file 'configure.in' ... " - if \mv configure.in_new configure.in >& /dev/null - then - echo "done" - else - echo "error, check your file permissions" - fi -else - echo -n "Updating 'configure.in' file ... " - if \cp configure.in configure.in_old >& /dev/null - then - echo - else - echo - echo - echo "Can't backup previous configure.in" - echo -n "Continue (you will not be able to revert) - (Y/N) ? " - read R - case "x$R" in - xn*) exit;; - xN*) exit;; - esac - echo - echo -n " " - fi - if \cp configure.in_new configure.in >& /dev/null - then - echo "done" - else - echo - echo "error, can't update previous configure.in" - fi -fi - -######################################################################## -# Use autoconf to rebuild the configure script -# - -if test -f configure -then - echo -n "Updating 'configure' script ... " -else - echo -n "Creating 'configure' script ... " -fi +#if test ${COMPONENT_WITH_GUI} = yes; then +# cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files +#fi -aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${MED_ROOT_DIR}/adm_local/unix/config_files -if autoconf -then - echo "done" +#cp -f ${MED_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files + +# remove KERNEL deprecated configure files +#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \ +# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \ +# check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing +# do +# rm -f salome_adm/unix/config_files/${deprecated} +# done + + +# ____________________________________________________________________ +# aclocal creates the aclocal.m4 file from the standard macro and the +# custom macro embedded in the directory salome_adm/unix/config_files +# and KERNEL config_files directory. +# output: +# aclocal.m4 +# autom4te.cache (directory) +echo "====================================================== aclocal" + +if test ${COMPONENT_WITH_GUI} = yes; then + aclocal -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files || exit 1 else - echo "failed (check file permissions and/or user quotas ...)" + aclocal -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files || exit 1 fi -cd ${ORIG_DIR} - -echo +# ____________________________________________________________________ +# libtoolize creates some configuration files (ltmain.sh, +# config.guess and config.sub). It only depends on the libtool +# version. The files are created in the directory specified with the +# AC_CONFIG_AUX_DIR() tag (see configure.ac). +# output: +# salome_adm/unix/config_files/config.guess +# salome_adm/unix/config_files/config.sub +# salome_adm/unix/config_files/ltmain.sh +#echo "====================================================== libtoolize" + +libtoolize --force --copy --automake || exit 1 + +# ____________________________________________________________________ +# autoconf creates the configure script from the file configure.ac (or +# configure.in if configure.ac doesn't exist) +# output: +# configure +echo "====================================================== autoconf" + +autoconf + +# ____________________________________________________________________ +# automake creates some scripts used in building process +# (install-sh, missing, ...). It only depends on the automake +# version. The files are created in the directory specified with the +# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also +# creates the Makefile.in files from the Makefile.am files. +# output: +# salome_adm/unix/config_files/compile +# salome_adm/unix/config_files/depcomp +# salome_adm/unix/config_files/install-sh +# salome_adm/unix/config_files/missing +# salome_adm/unix/config_files/py-compile +# Makefile.in (from Makefile.am) +echo "====================================================== automake" + +automake --copy --gnu --add-missing diff --git a/configure.in.base b/configure.ac similarity index 77% rename from configure.in.base rename to configure.ac index d6659c9..718626e 100644 --- a/configure.in.base +++ b/configure.ac @@ -15,18 +15,19 @@ # Created from configure.in.base # -AC_INIT(src) -AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files) +AC_INIT([Salome2 Project COMPONENT module], [4.1.1], [webmaster.salome@opencascade.com], [salome]) +AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE -PACKAGE=salome -AC_SUBST(PACKAGE) - -VERSION=3.2.0 -XVERSION=0x030200 -AC_SUBST(VERSION) +XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) +# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) +MODULE_NAME=component +AC_SUBST(MODULE_NAME) + dnl dnl Initialize source and build root directories dnl @@ -222,6 +223,8 @@ echo CHECK_PYTHON +AM_PATH_PYTHON(2.3) + dnl echo dnl echo --------------------------------------------- dnl echo testing java @@ -357,24 +360,26 @@ echo CHECK_HTML_GENERATORS -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Testing full GUI -echo --------------------------------------------- -echo - -CHECK_CORBA_IN_GUI -if test "x${CORBA_IN_GUI}" != "xyes"; then - echo "failed : For configure COMPONENT module necessary full GUI !" - exit +if test "${COMPONENT_WITH_GUI}" = "yes"; then + echo + echo --------------------------------------------- + echo Testing GUI + echo --------------------------------------------- + echo + + CHECK_SALOME_GUI + + echo + echo --------------------------------------------- + echo Testing full GUI + echo --------------------------------------------- + echo + + CHECK_CORBA_IN_GUI + if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure COMPONENT module necessary full GUI !" + exit + fi fi echo @@ -421,15 +426,6 @@ echo echo "Default ORB : $DEFAULT_ORB" echo -dnl generals files which could be included in every makefile - -AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module - -dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend - dnl We don t need to say when we re entering directories if we re using dnl GNU make becuase make does it for us. if test "X$GMAKE" = "Xyes"; then @@ -437,68 +433,6 @@ if test "X$GMAKE" = "Xyes"; then else AC_SUBST(SETX) SETX="set -x" fi - -# make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl -do -# if test ! -d $rep ; then -# eval mkdir $rep -# fi - $INSTALL -d $rep -done - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy resources directories - -#for i in `find $ROOT_SRCDIR -name 'resources' -print` -#do -# local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -# local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -# mkdir -p $local_res_dir -# cd $local_res_dir -# ln -fs $i -# echo $local_res -# cd $ROOT_BUILDDIR -#done - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome -for i in `find $ROOT_SRCDIR/bin` -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR/bin,.,"` - case "$local_bin" in - *.in | *~) ;; - . | */CVS | */CVS/* | ./salome) ;; - *) $INSTALL $i $local_bin; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript - -dnl copy xml files to the build tree (lib directory) -dnl pourquoi ???? - -#cd lib -#for i in `find $ROOT_SRCDIR -name "*.xml" -print` -#do -# ln -fs $i -# echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -#done -#cd $ROOT_BUILDDIR - - echo echo --------------------------------------------- echo generating Makefiles and configure files @@ -509,4 +443,36 @@ AC_OUTPUT_COMMANDS([ \ chmod +x ./bin/*; \ ]) -## do not delete this line +# This list is initiated using autoscan and must be updated manually +# when adding a new file .in to manage. When you execute +# autoscan, the Makefile list is generated in the output file configure.scan. +# This could be helpfull to update de configuration. +AC_OUTPUT([ \ + ./salome_adm/unix/SALOMEconfig.h \ + ./adm_local/Makefile \ + ./adm_local/unix/Makefile \ + ./adm_local/unix/config_files/Makefile \ + ./bin/VERSION \ + ./bin/Makefile \ + ./COMPONENT_version.h \ + ./src/Makefile \ + ./src/AddComponent/Makefile \ + ./src/AdditionComponent/Makefile \ + ./src/CalculatorComponent/Makefile \ + ./src/DataStreamComponent/Makefile \ + ./src/DivComponent/Makefile \ + ./src/FactorialComponent/Makefile \ + ./src/MulComponent/Makefile \ + ./src/SIGNALSComponent/Makefile \ + ./src/SIGNALSComponent_Swig/Makefile \ + ./src/SubComponent/Makefile \ + ./src/SyrComponent/Makefile \ + ./src/SyrControlComponent/Makefile \ + ./src/TestFunctions/Makefile \ + ./src/TypesCheck/Makefile \ + ./src/UndefinedSymbolComponent/Makefile \ + ./resources/Makefile \ + ./resources/COMPONENTCatalog.xml \ + ./idl/Makefile \ + Makefile \ +]) diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 0000000..b7a800d --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,157 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# +# This Makefile is responsible of generating the client and server +# implementation of IDL interfaces for both C++ and python usage. +# The building process of the C++ files is in charge of each source +# package and then is not manage here. +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +BASEIDL_FILES = \ + AddComponent.idl \ + AdditionComponent.idl \ + DivComponent.idl \ + FactorialComponent.idl \ + MulComponent.idl \ + SubComponent.idl \ + SyrComponent.idl \ + SyrControlComponent.idl \ + TypesCheck.idl \ + DataStreamComponent.idl \ + SIGNALSComponent.idl \ + UndefinedSymbolComponent.idl \ + Calculator.idl + +EXTRA_DIST+= $(BASEIDL_FILES) + +# This variable defines the files to be installed +salomeidl_DATA = $(BASEIDL_FILES) + +# GUI idl common library +lib_LTLIBRARIES = libSalomeIDLCOMPONENT.la + +# Sources built from idl files +BASEIDL_SOURCES =\ + AddComponentSK.cc \ + AdditionComponentSK.cc \ + DivComponentSK.cc \ + FactorialComponentSK.cc \ + MulComponentSK.cc \ + SubComponentSK.cc \ + SyrComponentSK.cc \ + SyrControlComponentSK.cc \ + TypesCheckSK.cc \ + DataStreamComponentSK.cc \ + SIGNALSComponentSK.cc \ + UndefinedSymbolComponentSK.cc \ + CalculatorSK.cc +DYNIDL_SOURCES = \ + AddComponentDynSK.cc \ + AdditionComponentDynSK.cc \ + DivComponentDynSK.cc \ + FactorialComponentDynSK.cc \ + MulComponentDynSK.cc \ + SubComponentDynSK.cc \ + SyrComponentDynSK.cc \ + SyrControlComponentDynSK.cc \ + TypesCheckDynSK.cc \ + DataStreamComponentDynSK.cc \ + SIGNALSComponentDynSK.cc \ + UndefinedSymbolComponentDynSK.cc \ + CalculatorDynSK.cc + +nodist_libSalomeIDLCOMPONENT_la_SOURCES = ${BASEIDL_SOURCES} ${DYNIDL_SOURCES} +${DYNIDL_SOURCES}: ${BASEIDL_SOURCES} + +# header files must be exported: other modules have to use this library +nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) + +libSalomeIDLCOMPONENT_la_CPPFLAGS =\ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ \ + @CORBA_INCLUDES@ + +libSalomeIDLCOMPONENT_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeIDLCOMPONENT_la_LIBADD = \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ + $(MED_LDFLAGS) -lSalomeIDLMED \ + @CORBA_LIBS@ + +# These variables defines the building process of CORBA files +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = \ + @OMNIORB_IDLPYFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(MED_ROOT_DIR)/idl/salome + +IDLCXXFLAGS = \ + -bcxx \ + @IDLCXXFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(MED_ROOT_DIR)/idl/salome \ + -I$(top_builddir)/salome_adm/unix +IDLPYFLAGS = \ + @IDLPYFLAGS@ \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(MED_ROOT_DIR)/idl/salome + +# potential problem on parallel make on the following - multiple outputs +SUFFIXES = .idl .hh SK.cc +.idlSK.cc: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< +.idl.hh: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< + +install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) + $(INSTALL) -d $(pkgpythondir) + ls $^ | while read file; do \ + $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ + done + +# uninstall-local removes too much, but it works in distcheck +uninstall-local: + rm -rf $(pkgpythondir)/* + +mostlyclean-local: + -rm -f *.hh *.cc .depidl + +# we use cpp to generate dependencies between idl files. +# option x c tells the preprocessor to consider idl as a c file. +# if an idl is modified, all idl dependencies are rebuilt + +.depidl: $(BASEIDL_FILES) + @echo "" > $@ + @for dep in $^ dummy; do \ + if [ $$dep != "dummy" ]; then \ + echo Building dependencies for $$dep; \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + sed 's/\.o/\SK.cc/' >>$@; \ + fi; \ + done ; + +-include .depidl diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 4d3ce9c..0000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:${KERNEL_ROOT_DIR}/idl/salome - -@COMMENCE@ - -IDL_FILES = \ - AddComponent.idl \ - AdditionComponent.idl \ - DivComponent.idl \ - FactorialComponent.idl \ - MulComponent.idl \ - SubComponent.idl \ - SyrComponent.idl \ - SyrControlComponent.idl \ - TypesCheck.idl \ - DataStreamComponent.idl \ - SIGNALSComponent.idl \ - UndefinedSymbolComponent.idl \ - Calculator.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -# we copy all idl file in $(top_builddir)/idl -inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(top_builddir)/idl/salome: - mkdir $@ - -$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) -# $(CP) $< $@ - cp -f $^ $(top_builddir)/idl/salome - - -lib: pyidl - -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ - -pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) - -$(PYTHON_BUILD_SITE): - $(INSTALL) -d $@ - -$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< - - -# install python client (generated from idl file -install: install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(idldir) - $(INSTALL_DATA) $^ $(idldir) - - -install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(PYTHON_SITE_INSTALL) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ - fi ; \ - done ; - -#@ CONCLUDE @ - -cleandep: - -$(RM) .dep* - -distclean: - -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(RM) Makefile - diff --git a/resources/COMPONENTCatalog.xml.in b/resources/COMPONENTCatalog.xml.in index 38e9309..7ebd158 100644 --- a/resources/COMPONENTCatalog.xml.in +++ b/resources/COMPONENTCatalog.xml.in @@ -8,6 +8,15 @@ + + + + + + + + + @@ -201,7 +210,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder object @@ -224,7 +233,7 @@ Test - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder object @@ -247,7 +256,7 @@ Test - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder object @@ -316,7 +325,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder Object @@ -355,7 +364,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder Object @@ -370,7 +379,7 @@ Second number - SuperVisionTest::Adder + SuperVisionTest/Adder anOtherAdder Adder Object @@ -399,7 +408,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder Object @@ -423,7 +432,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Adder Object @@ -446,7 +455,7 @@ Adder - SuperVisionTest::Adder + SuperVisionTest/Adder Adder Object @@ -485,7 +494,7 @@ 1 - AddInterface + AddComponent + ... @@ -664,7 +673,7 @@ - AdditionComponent::Adder + AdditionComponent/Adder Adder Adder object @@ -687,7 +696,7 @@ Test - AdditionComponent::Adder + AdditionComponent/Adder Adder Adder object @@ -710,7 +719,7 @@ Test - AdditionComponent::Adder + AdditionComponent/Adder Adder Adder object @@ -725,17 +734,17 @@ AddComponent1 - AddInterface + AddComponent unknown Adder2 - AddInterface + AddComponent unknown Adder3 - AddInterface + AddComponent unknown @@ -747,17 +756,17 @@ RetAddComponent1 - AddInterface + AddComponent unknown RetAdder2 - AddInterface + AddComponent unknown RetAdder3 - AddInterface + AddComponent unknown @@ -779,7 +788,7 @@ - AddComponent::Adder + AddComponent/Adder Adder Adder Object @@ -818,7 +827,7 @@ - AddComponent::Adder + AddComponent/Adder Adder Adder Object @@ -833,7 +842,7 @@ Second number - AddComponent::Adder + AddComponent/Adder anOtherAdder Adder Object @@ -862,7 +871,7 @@ - AddComponent::Adder + AddComponent/Adder Adder Adder Object @@ -886,7 +895,7 @@ - AddComponent::Adder + AddComponent/Adder Adder Adder Object @@ -909,7 +918,7 @@ Adder - AddComponent::Adder + AddComponent/Adder Adder Object @@ -926,7 +935,7 @@ return - AddInterface + AddComponent unknown @@ -1989,14 +1998,14 @@ 0 - SuperVisionTest::Adder + SuperVisionTest/Adder InObjRef - SuperVisionTest::Adder + SuperVisionTest/Adder OutObjRef @@ -2047,7 +2056,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder InObjRef @@ -2089,7 +2098,7 @@ - SuperVisionTest::Adder + SuperVisionTest/Adder OutObjRef diff --git a/adm_local/Makefile.in b/resources/Makefile.am similarity index 65% rename from adm_local/Makefile.in rename to resources/Makefile.am index cfbe6f4..5a7d7a2 100644 --- a/adm_local/Makefile.in +++ b/resources/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D +# Copyright (C) 2005 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 @@ -16,44 +17,17 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:$(srcdir)/adm_local - - -all: resources - -install: - cp -rf @top_srcdir@/adm_local @prefix@ - -bin: - -resources : - cp -rf @top_srcdir@/adm_local $(top_builddir) - -inc: - -lib: - -depend: - -depend_idl: - -install-end: - -install-include: - -install-bin: - -uninstall: - -uninstall-idl: - -distclean: +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header$ +# -clean: +include $(top_srcdir)/adm_local/unix/make_common_starter.am -distclean-other: +dist_salomeres_DATA = \ + SalomeApp.xml +nodist_salomeres_DATA = COMPONENTCatalog.xml diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index 1dfb2bc..2323390 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -5,6 +5,6 @@
- +
diff --git a/src/AddComponent/Makefile.in b/src/AddComponent/Makefile.am similarity index 50% rename from src/AddComponent/Makefile.in rename to src/AddComponent/Makefile.am index 4dac9a7..3ed811e 100755 --- a/src/AddComponent/Makefile.in +++ b/src/AddComponent/Makefile.am @@ -23,41 +23,56 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest -# $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ AddComponent_Impl.hxx \ Adder_Impl.hxx # Libraries targets -LIB = libAddComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libAddComponentEngine.la +dist_libAddComponentEngine_la_SOURCES = \ AddComponent_Impl.cxx \ Adder_Impl.cxx -LIB_SERVER_IDL = SALOME_ContainerManager.idl \ - SALOME_Component.idl SALOME_Exception.idl \ - AddComponent.idl - # Executables targets -BIN = AddComponent_CheckOfUndefined -BIN_SRC = HandleServerSideSignals.cxx -BIN_SERVER_IDL = +bin_PROGRAMS = AddComponent_CheckOfUndefined +dist_AddComponent_CheckOfUndefined_SOURCES = \ + AddComponent_CheckOfUndefined.cxx \ + HandleServerSideSignals.cxx -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +${bin_PROGRAMS}: ${lib_LTLIBRARIES} -LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +libAddComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix +libAddComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeHDFPersist \ + -lSalomeBatch \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager \ + -lSALOMEBasics \ + -lSalomeIDLKernel -@CONCLUDE@ +AddComponent_CheckOfUndefined_CPPFLAGS = \ + $(libAddComponentEngine_la_CPPFLAGS) +AddComponent_CheckOfUndefined_LDFLAGS = \ + ./libAddComponentEngine.la \ + $(libAddComponentEngine_la_LDFLAGS) diff --git a/src/AdditionComponent/Makefile.in b/src/AdditionComponent/Makefile.am similarity index 50% rename from src/AdditionComponent/Makefile.in rename to src/AdditionComponent/Makefile.am index 7217c50..4a96cef 100755 --- a/src/AdditionComponent/Makefile.in +++ b/src/AdditionComponent/Makefile.am @@ -23,42 +23,57 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest -# $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ AdditionComponent_Impl.hxx \ Addition_Adder_Impl.hxx # Libraries targets -LIB = libAdditionComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libAdditionComponentEngine.la +dist_libAdditionComponentEngine_la_SOURCES = \ AdditionComponent_Impl.cxx \ Addition_Adder_Impl.cxx -LIB_SERVER_IDL = SALOME_ContainerManager.idl \ - SALOME_Component.idl \ - AddComponent.idl \ - AdditionComponent.idl - # Executables targets -BIN = AdditionComponent_CheckOfUndefined -BIN_SRC = -BIN_SERVER_IDL = SALOME_Exception.idl +bin_PROGRAMS = AdditionComponent_CheckOfUndefined +dist_AdditionComponent_CheckOfUndefined_SOURCES = \ + AdditionComponent_CheckOfUndefined.cxx + +${bin_PROGRAMS}: ${lib_LTLIBRARIES} -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +libAdditionComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../AddComponent \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +libAdditionComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeHDFPersist \ + -lSalomeBatch \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager \ + -lSALOMEBasics \ + -lSalomeIDLKernel -@CONCLUDE@ +AdditionComponent_CheckOfUndefined_CPPFLAGS = \ + $(libAdditionComponentEngine_la_CPPFLAGS) +AdditionComponent_CheckOfUndefined_LDFLAGS = \ + ./libAdditionComponentEngine.la \ + $(libAdditionComponentEngine_laLDFLAGS) diff --git a/src/CalculatorComponent/CalculatorEngine.cxx b/src/CalculatorComponent/CalculatorEngine.cxx index a447b89..8860351 100644 --- a/src/CalculatorComponent/CalculatorEngine.cxx +++ b/src/CalculatorComponent/CalculatorEngine.cxx @@ -106,6 +106,7 @@ CalculatorEngine::CalculatorEngine() CalculatorEngine::~CalculatorEngine() { + delete _NS; } static omni_mutex aPutToStudyMutex; @@ -178,9 +179,13 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi SCRUTE(FirstField); SCRUTE(SecondField); + CORBA::String_var field1_name = FirstField -> getName(); + CORBA::String_var field2_name = SecondField -> getName(); + CORBA::String_var field_description = FirstField -> getDescription(); + string message = string("\n CalculatorEngine::Add : ") + - string("\n first field name --> ") + FirstField -> getName() + - string("\n second field name --> ") + SecondField -> getName(); + string("\n first field name --> ") + string(field1_name.in()) + + string("\n second field name --> ") + string(field2_name.in()); sendMessage(NOTIF_TRACE, message.c_str()); @@ -198,13 +203,15 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi string * component_unit = new string[nb_comp1]; for (int i=0 ; i getComponentName(i+1)); - component_unit[i].assign(FirstField -> getComponentUnit(i+1)); + CORBA::String_var name = FirstField -> getComponentName(i+1); + CORBA::String_var unit = FirstField -> getComponentUnit(i+1); + component_name[i].assign(name.in()); + component_unit[i].assign(unit.in()); if (same_support) { - if ( - (component_name[i] != SecondField -> getComponentName(i+1)) || - (component_unit[i] != SecondField -> getComponentUnit(i+1))) + CORBA::String_var name2 = SecondField -> getComponentName(i+1); + CORBA::String_var unit2 = SecondField -> getComponentUnit(i+1); + if ( (component_name[i] != name2.in()) || (component_unit[i] != unit2.in())) same_support = false; } } @@ -215,15 +222,15 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi int len_value1 = 0; int len_value2 = 0; - SALOME_MED::SUPPORT_ptr support1 = FirstField -> getSupport(); - SALOME_MED::SUPPORT_ptr support2 = SecondField -> getSupport(); + SALOME_MED::SUPPORT_var support1 = FirstField -> getSupport(); + SALOME_MED::SUPPORT_var support2 = SecondField -> getSupport(); SCRUTE(support1); SCRUTE(support2); - SALOME_MED::MESH_ptr mesh1 = support1 -> getMesh(); - SALOME_MED::MESH_ptr mesh2 = support2 -> getMesh(); + SALOME_MED::MESH_var mesh1 = support1 -> getMesh(); + SALOME_MED::MESH_var mesh2 = support2 -> getMesh(); SCRUTE(mesh1); SCRUTE(mesh2); @@ -231,14 +238,14 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi if (same_support && support1 != support2) same_support = false; if (support1 -> isOnAllElements()) - len_value1 = support1 -> getMesh() -> getNumberOfElements(support1 -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); + len_value1 = mesh1-> getNumberOfElements(support1 -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); else len_value1 = support1 -> getNumberOfElements(SALOME_MED::MED_ALL_ELEMENTS); SCRUTE(len_value1); if (support2 -> isOnAllElements()) - len_value2 = support2 -> getMesh() -> getNumberOfElements(support2 -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); + len_value2 = mesh2-> getNumberOfElements(support2 -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); else len_value2 = support2 -> getNumberOfElements(SALOME_MED::MED_ALL_ELEMENTS); @@ -282,10 +289,20 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi fieldloc -> allocValue(nb_comp1,len_value1); fieldloc -> setValue(new_value); fieldloc -> setName("-new_Add-"); - fieldloc -> setDescription( FirstField -> getDescription() ); + fieldloc -> setDescription( field_description.in() ); fieldloc -> setComponentsNames(component_name); fieldloc -> setMEDComponentsUnits(component_unit); + delete [] new_value; + delete first_value; + if (same_support) + delete second_value; + delete [] component_name; + delete [] component_unit; + mesh1->Destroy(); + mesh2->Destroy(); + support2->Destroy(); + // Control int until_index = ( 20 > len_value1)? len_value1 : 20; PrintFieldValues (fieldloc,until_index); @@ -299,7 +316,9 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi SUPPORT *support1Clt=new SUPPORTClient(support1); fieldloc->setSupport(support1Clt); - TFieldDouble_i * NewField = new TFieldDouble_i(fieldloc) ; + support1Clt->removeReference(); + + TFieldDouble_i * NewField = new TFieldDouble_i(fieldloc,true) ; SALOME_MED::FIELDDOUBLE_ptr myFieldIOR = NewField->_this() ; //sleep(4); @@ -329,8 +348,8 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Mul(SALOME_MED::FIELDDOUBLE_ptr Ol SCRUTE(x1); // Name and description of field - string field_name = OldField -> getName(); - string field_description = OldField -> getDescription(); + CORBA::String_var field_name = OldField -> getName(); + CORBA::String_var field_description = OldField -> getDescription(); // Number of components int nb_comp = OldField -> getNumberOfComponents(); @@ -338,8 +357,10 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Mul(SALOME_MED::FIELDDOUBLE_ptr Ol string * component_unit = new string[nb_comp]; for (int i=0 ; i getComponentName(i+1); - component_unit[i] = OldField -> getComponentUnit(i+1); + CORBA::String_var name = OldField -> getComponentName(i+1); + component_name[i] = name.in(); + CORBA::String_var unit = OldField -> getComponentUnit(i+1); + component_unit[i] = unit.in(); } MESSAGE("CalculatorEngine::Mul Number of entities in the Support of the field"); @@ -347,16 +368,16 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Mul(SALOME_MED::FIELDDOUBLE_ptr Ol // Number of entities in the Support of the field int len_value = 0; - SALOME_MED::SUPPORT_ptr support = OldField -> getSupport(); + SALOME_MED::SUPPORT_var support = OldField -> getSupport(); SCRUTE(support); - SALOME_MED::MESH_ptr mesh = support -> getMesh(); + SALOME_MED::MESH_var mesh = support -> getMesh(); SCRUTE(mesh); if (support -> isOnAllElements()) - len_value = support -> getMesh() -> getNumberOfElements(support -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); + len_value = mesh-> getNumberOfElements(support -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); else len_value = support -> getNumberOfElements(SALOME_MED::MED_ALL_ELEMENTS); @@ -379,10 +400,15 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Mul(SALOME_MED::FIELDDOUBLE_ptr Ol fieldloc -> allocValue(nb_comp,len_value); fieldloc -> setValue(new_value); fieldloc -> setName("-new_Mul-"); - fieldloc -> setDescription(field_description); + fieldloc -> setDescription(field_description.in()); fieldloc -> setComponentsNames(component_name); fieldloc -> setMEDComponentsUnits(component_unit); + delete old_value; + delete [] new_value; + delete [] component_name; + delete [] component_unit; + mesh->Destroy(); // Creation of the new CORBA field @@ -390,7 +416,8 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Mul(SALOME_MED::FIELDDOUBLE_ptr Ol SUPPORT *supportClt=new SUPPORTClient(support); fieldloc->setSupport(supportClt); - TFieldDouble_i * NewField = new TFieldDouble_i(fieldloc) ; + supportClt->removeReference(); + TFieldDouble_i * NewField = new TFieldDouble_i(fieldloc,true) ; SALOME_MED::FIELDDOUBLE_ptr myFieldIOR = NewField->_this() ; //sleep(4); @@ -416,10 +443,10 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_p BEGIN_OF("CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_ptr FirstField,CORBA::Double x1)"); // Name and description of field - string field_name = FirstField -> getName(); - string field_description = FirstField -> getDescription(); + CORBA::String_var field_name = FirstField -> getName(); + CORBA::String_var field_description = FirstField -> getDescription(); - SALOME_MED::SUPPORT_ptr FirstSupport = FirstField -> getSupport(); + SALOME_MED::SUPPORT_var FirstSupport = FirstField -> getSupport(); // Number of components int nb_comp = FirstField -> getNumberOfComponents(); @@ -429,8 +456,10 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_p string * component_unit = new string[nb_comp]; for (int i = 0 ; i getComponentName(i+1); - component_unit[i] = FirstField -> getComponentUnit(i+1); + CORBA::String_var name = FirstField -> getComponentName(i+1); + component_name[i] = name.in(); + CORBA::String_var unit = FirstField -> getComponentUnit(i+1); + component_unit[i] = unit.in(); } MESSAGE("CalculatorEngine::Constant Number of entities in the Support of the field"); @@ -440,12 +469,12 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_p SCRUTE(FirstSupport); - SALOME_MED::MESH_ptr mesh = FirstSupport -> getMesh(); + SALOME_MED::MESH_var mesh = FirstSupport -> getMesh(); SCRUTE(mesh); if ( FirstSupport -> isOnAllElements() ) - len_value = FirstSupport -> getMesh() -> getNumberOfElements(FirstSupport -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); + len_value = mesh -> getNumberOfElements(FirstSupport -> getEntity(),SALOME_MED::MED_ALL_ELEMENTS); else len_value = FirstSupport -> getNumberOfElements(SALOME_MED::MED_ALL_ELEMENTS); @@ -465,10 +494,15 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_p fieldloc -> allocValue(nb_comp,len_value); fieldloc -> setValue(new_value); fieldloc -> setName("-new_Const_Field-"); - fieldloc -> setDescription(field_description); + fieldloc -> setDescription(field_description.in()); fieldloc -> setComponentsNames(component_name); fieldloc -> setMEDComponentsUnits(component_unit); + delete [] new_value; + delete [] component_name; + delete [] component_unit; + mesh->Destroy(); + // Control int until_index = ( 20 > len_value)? len_value : 20 ; PrintFieldValues (fieldloc,until_index); @@ -479,7 +513,8 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_p SUPPORT *supportClt=new SUPPORTClient(FirstSupport); fieldloc->setSupport(supportClt); - TFieldDouble_i * NewField = new TFieldDouble_i(fieldloc) ; + supportClt->removeReference(); + TFieldDouble_i * NewField = new TFieldDouble_i(fieldloc,true) ; SALOME_MED::FIELDDOUBLE_ptr myFieldIOR = NewField->_this() ; diff --git a/src/TypesCheck/Makefile.in b/src/CalculatorComponent/Makefile.am similarity index 59% rename from src/TypesCheck/Makefile.in rename to src/CalculatorComponent/Makefile.am index 5fc50d6..ef3c80d 100755 --- a/src/TypesCheck/Makefile.in +++ b/src/CalculatorComponent/Makefile.am @@ -23,39 +23,40 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = \ - TypesCheck_Impl.hxx - # Libraries targets -LIB = libTypesCheckEngine.la -LIB_SRC = \ - TypesCheck_Impl.cxx - -LIB_SERVER_IDL = SALOME_Component.idl \ - TypesCheck.idl \ - AddComponent.idl -# Executables targets -BIN = TypesCheck_CheckOfUndefined -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -@CONCLUDE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am +# Libraries targets +lib_LTLIBRARIES = libCalculatorEngine.la + +dist_libCalculatorEngine_la_SOURCES = \ + CalculatorEngine.cxx + +libCalculatorEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(HDF5_INCLUDES) \ + $(MED2_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libCalculatorEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + $(MED_LDFLAGS) \ + -lMEDEngine \ + -lMEDClientcmodule diff --git a/src/CalculatorComponent/Makefile.in b/src/CalculatorComponent/Makefile.in deleted file mode 100755 index aa4d4b4..0000000 --- a/src/CalculatorComponent/Makefile.in +++ /dev/null @@ -1,59 +0,0 @@ -# SuperVisionTest AddComponent : example of component that adds two numbers -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : , CEA -# Module : SuperVisionTest -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libCalculatorEngine.la -LIB_SRC = CalculatorEngine.cxx -#LIB_SERVER_IDL = Calculator.idl SALOME_Exception.idl SALOME_Component.idl SALOMEDS.idl SALOMEDS_Attributes.idl MED.idl -LIB_SERVER_IDL = Calculator.idl SALOME_Comm.idl SALOME_ContainerManager.idl -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_Component.idl SALOMEDS.idl SALOME_GenericObj.idl SALOMEDS_Attributes.idl MED.idl -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -EXPORT_HEADERS = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(MED2_INCLUDES) $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace $(MED_LDFLAGS) -lMEDEngine -lMEDClientcmodule - - -MED.hh MEDSK.cc: ${MED_ROOT_DIR}/idl/salome/MED.idl - omniidl -bcxx -Wbtp -I${KERNEL_ROOT_DIR}/idl/salome $^ - -@CONCLUDE@ diff --git a/src/DataStreamComponent/Makefile.in b/src/DataStreamComponent/Makefile.am similarity index 50% rename from src/DataStreamComponent/Makefile.in rename to src/DataStreamComponent/Makefile.am index 8c0c0e9..ecd5021 100644 --- a/src/DataStreamComponent/Makefile.in +++ b/src/DataStreamComponent/Makefile.am @@ -23,39 +23,54 @@ # # File : Makefile.in # Author : Jean Rahuel +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SUPERV # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ DataStreamComponent_Impl.hxx # Libraries targets -LIB = libDataStreamFactoryEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libDataStreamFactoryEngine.la +dist_libDataStreamFactoryEngine_la_SOURCES = \ DataStreamComponent_Impl.cxx -LIB_SERVER_IDL = SALOME_Component.idl \ - DataStreamComponent.idl - # Executables targets -BIN = DataStreamComponent_CheckOfUndefined -BIN_SRC = -BIN_SERVER_IDL = +bin_PROGRAMS = DataStreamComponent_CheckOfUndefined + +${bin_PROGRAMS}: ${lib_LTLIBRARIES} + +dist_DataStreamComponent_CheckOfUndefined_SOURCES = \ + DataStreamComponent_CheckOfUndefined.cxx -CPPFLAGS+= $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +libDataStreamFactoryEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../AddComponent \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +libDataStreamFactoryEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + -lSalomeResourcesManager \ + -lSALOMEBasics \ + -lSalomeIDLKernel -@CONCLUDE@ +DataStreamComponent_CheckOfUndefined_CPPFLAGS = \ + $(libDataStreamFactoryEngine_la_CPPFLAGS) +DataStreamComponent_CheckOfUndefined_LDFLAGS = \ + ./libDataStreamFactoryEngine.la \ + $(libDataStreamFactoryEngine_la_LDFLAGS) diff --git a/src/DivComponent/Makefile.in b/src/DivComponent/Makefile.am similarity index 65% rename from src/DivComponent/Makefile.in rename to src/DivComponent/Makefile.am index 728bbf5..2f0b247 100755 --- a/src/DivComponent/Makefile.in +++ b/src/DivComponent/Makefile.am @@ -23,35 +23,34 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ DivComponent.hxx # Libraries targets -LIB = libDivComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libDivComponentEngine.la +dist_libDivComponentEngine_la_SOURCES = \ DivComponent.cxx -LIB_SERVER_IDL = SALOME_Component.idl \ - DivComponent.idl - -# Executables targets -BIN = -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification - -@CONCLUDE@ - +libDivComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libDivComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification diff --git a/src/FactorialComponent/Makefile.in b/src/FactorialComponent/Makefile.am similarity index 79% rename from src/FactorialComponent/Makefile.in rename to src/FactorialComponent/Makefile.am index cdbb320..c66b280 100644 --- a/src/FactorialComponent/Makefile.in +++ b/src/FactorialComponent/Makefile.am @@ -23,29 +23,10 @@ # # File : Makefile.in # Author : Fausto MALVAGI - Marc TAJCHMAN +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest -# $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ - -EXPORT_PYSCRIPTS = FactorialComponent.py - -# Libraries targets - -LIB = -LIB_SRC = -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -LDFLAGS+= - - -@CONCLUDE@ +dist_salomescript_DATA = \ + FactorialComponent.py diff --git a/src/Makefile.in b/src/Makefile.am similarity index 63% rename from src/Makefile.in rename to src/Makefile.am index 71efe8b..fa41621 100755 --- a/src/Makefile.in +++ b/src/Makefile.am @@ -21,19 +21,26 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest # $Header: -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ - -SUBDIRS = AddComponent AdditionComponent DivComponent FactorialComponent MulComponent SubComponent SyrComponent SyrControlComponent TypesCheck DataStreamComponent SIGNALSComponent UndefinedSymbolComponent SIGNALSComponent_Swig TestFunctions CalculatorComponent - -#SUBDIRS = AddComponent AdditionComponent DivComponent FactorialComponent MulComponent SubComponent SyrComponent SyrControlComponent TypesCheck DataStreamComponent SIGNALSComponent UndefinedSymbolComponent SIGNALSComponent_Swig TestFunctions - -@MODULE@ +SUBDIRS = \ + AddComponent \ + AdditionComponent \ + DivComponent \ + FactorialComponent \ + MulComponent \ + SubComponent \ + SyrComponent \ + SyrControlComponent \ + TypesCheck \ + DataStreamComponent \ + SIGNALSComponent \ + UndefinedSymbolComponent \ + SIGNALSComponent_Swig \ + TestFunctions \ + CalculatorComponent diff --git a/src/MulComponent/Makefile.in b/src/MulComponent/Makefile.am similarity index 65% rename from src/MulComponent/Makefile.in rename to src/MulComponent/Makefile.am index 6d5c409..e4500ed 100755 --- a/src/MulComponent/Makefile.in +++ b/src/MulComponent/Makefile.am @@ -23,37 +23,34 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest -# $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ MulComponent.hxx # Libraries targets -LIB = libMulComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libMulComponentEngine.la +dist_libMulComponentEngine_la_SOURCES = \ MulComponent.cxx -LIB_SERVER_IDL = SALOME_Component.idl \ - MulComponent.idl - -# Executables targets -BIN = -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification - -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -@CONCLUDE@ - +libMulComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libMulComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification diff --git a/src/SIGNALSComponent/Makefile.in b/src/SIGNALSComponent/Makefile.am similarity index 52% rename from src/SIGNALSComponent/Makefile.in rename to src/SIGNALSComponent/Makefile.am index 8a2d966..b8f19c6 100755 --- a/src/SIGNALSComponent/Makefile.in +++ b/src/SIGNALSComponent/Makefile.am @@ -23,38 +23,48 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ SIGNALSComponent_Impl.hxx # Libraries targets -LIB = libSIGNALSComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libSIGNALSComponentEngine.la +dist_libSIGNALSComponentEngine_la_SOURCES = \ SIGNALSComponent_Impl.cxx -LIB_SERVER_IDL = SALOME_Component.idl \ - SIGNALSComponent.idl +bin_PROGRAMS = SIGNALSComponent_CheckOfUndefined +dist_SIGNALSComponent_CheckOfUndefined_SOURCES = \ + SIGNALSComponent_CheckOfUndefined.cxx \ + HandleServerSideSignals.cxx -# Executables targets -BIN = SIGNALSComponent_CheckOfUndefined -BIN_SRC = HandleServerSideSignals.cxx -BIN_SERVER_IDL = +${bin_PROGRAMS}: ${lib_LTLIBRARIES} -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification +libSIGNALSComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +libSIGNALSComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification -@CONCLUDE@ +SIGNALSComponent_CheckOfUndefined_CPPFLAGS = \ + $(libSIGNALSComponentEngine_la_CPPFLAGS) +SIGNALSComponent_CheckOfUndefined_LDFLAGS = \ + ./libSIGNALSComponentEngine.la \ + $(libSIGNALSComponentEngine_la_LDFLAGS) diff --git a/src/SIGNALSComponent_Swig/Makefile.am b/src/SIGNALSComponent_Swig/Makefile.am new file mode 100644 index 0000000..fb72e60 --- /dev/null +++ b/src/SIGNALSComponent_Swig/Makefile.am @@ -0,0 +1,102 @@ +# SuperVisionTest SIGNALSComponent : example of component that devides two numbers +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SuperVisionTest +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# =============================================================== +# Swig targets +# =============================================================== +# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) +# +# Step 1: build the wrapping source files with swig +# +# libSALOME_LifeCycleCORBA.i -- swig --> swig_wrap.cpp +# libSALOME_Swig.py +# +# Step 2: build the dynamic library from cpp built source files and +# dependant libraries. +# +# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSALOME_Swig.la +# + | +# dependant libs | +# +# The file libSALOME_Swigcmodule.py will be installed in +# /lib/python/site-package/salome. +# The library will be installed in the same place. +# + +# this option puts it to dist +#BUILT_SOURCES = swig_wrap.cpp + +SWIG_FLAGS = \ + @SWIG_FLAGS@ \ + -I$(srcdir) + +SWIG_SOURCES = libSIGNALSComponent_Swig.i + +# Libraries targets +lib_LTLIBRARIES = libSIGNALSComponent_Swigcmodule.la + +nodist_pkgpython_DATA = libSIGNALSComponent_Swig.py +libSMESH_Swig.py: swig_wrap.cpp + +libSIGNALSComponent_Swigcmodule_la_SOURCES = \ + $(BUILT_SOURCES) \ + $(SWIG_SOURCES) + +nodist_libSIGNALSComponent_Swigcmodule_la_SOURCES = swig_wrap.cpp + +libSIGNALSComponent_Swigcmodule_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../SIGNALSComponent \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libSIGNALSComponent_Swigcmodule_la_LDFLAGS = \ + ../SIGNALSComponent/libSIGNALSComponentEngine.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = \ + swig_wrap.cpp + +install-exec-hook: $(libdir)/_libSIGNALSComponent_Swig.so + +$(libdir)/_libSIGNALSComponent_Swig.so: + ( cd $(libdir); ln -sf libSIGNALSComponent_Swigcmodule.so _libSIGNALSComponent_Swig.so; ) diff --git a/src/SIGNALSComponent_Swig/Makefile.in b/src/SIGNALSComponent_Swig/Makefile.in deleted file mode 100644 index 0072316..0000000 --- a/src/SIGNALSComponent_Swig/Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ -# SuperVisionTest SIGNALSComponent : example of component that devides two numbers -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : , CEA -# Module : SuperVisionTest -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - - -# Libraries targets -LIB = libSIGNALSComponent_Swigcmodule.la - -SWIG_DEF = libSIGNALSComponent_Swig.i -EXPORT_PYSCRIPTS = libSIGNALSComponent_Swig.py - -LIB_SERVER_IDL = SALOME_Component.idl \ - SIGNALSComponent.idl \ - UndefinedSymbolComponent.idl - - -# Executables targets -BIN = -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSIGNALSComponentEngine - -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -@CONCLUDE@ - diff --git a/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i b/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i index 228e62c..2d329e4 100644 --- a/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i +++ b/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i @@ -29,6 +29,26 @@ #include "SIGNALSComponent_Impl.hxx" %} +/* + managing C++ exception in the Python API +*/ +%exception +{ + class PyAllowThreadsGuard { + public: + // Py_BEGIN_ALLOW_THREADS + PyAllowThreadsGuard() { _save = PyEval_SaveThread(); } + // Py_END_ALLOW_THREADS + ~PyAllowThreadsGuard() { PyEval_RestoreThread(_save); } + private: + PyThreadState *_save; + }; + + PyAllowThreadsGuard guard; + + $action +} + class SIGNALSComponent_Impl { public: SIGNALSComponent_Impl(){}; diff --git a/src/SubComponent/Makefile.in b/src/SubComponent/Makefile.am similarity index 65% rename from src/SubComponent/Makefile.in rename to src/SubComponent/Makefile.am index bc6ccac..6dda148 100755 --- a/src/SubComponent/Makefile.in +++ b/src/SubComponent/Makefile.am @@ -23,37 +23,34 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ SubComponent.hxx # Libraries targets -LIB = libSubComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libSubComponentEngine.la +dist_libSubComponentEngine_la_SOURCES = \ SubComponent.cxx -LIB_SERVER_IDL = SALOME_Component.idl \ - SubComponent.idl - -# Executables targets -BIN = -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification - -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -@CONCLUDE@ - +libSubComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libSubComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification diff --git a/src/SyrComponent/Makefile.am b/src/SyrComponent/Makefile.am new file mode 100755 index 0000000..e210f3b --- /dev/null +++ b/src/SyrComponent/Makefile.am @@ -0,0 +1,75 @@ +# SuperVisionTest SyrComponent : example of component performing some mathinatical operations +# +# Copyright (C) 2005 CEA/DEN, EDF R&D +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SuperVisionTest + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + SyrComponent_Impl.hxx + +# Libraries targets +lib_LTLIBRARIES = libSyrComponentEngine.la +dist_libSyrComponentEngine_la_SOURCES = \ + SyrComponent_Impl.cxx + +# Executables targets +bin_PROGRAMS = SyrComponent_CheckOfUndefined +dist_SyrComponent_CheckOfUndefined_SOURCES = \ + SyrComponent_CheckOfUndefined.cxx + +${bin_PROGRAMS}: ${lib_LTLIBRARIES} + +libSyrComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../AddComponent \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix +libSyrComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + -lSalomeResourcesManager \ + -lSALOMEBasics \ + -lSalomeIDLKernel + +SyrComponent_CheckOfUndefined_CPPFLAGS = \ + $(libSyrComponentEngine_la_CPPFLAGS) + +SyrComponent_CheckOfUndefined_LDFLAGS = \ + ./libSyrComponentEngine.la \ + $(libSyrComponentEngine_la_LDFLAGS) + +EXPORT_SHAREDPYSCRIPTS =\ + COMPONENT_shared_modules.py diff --git a/src/SyrComponent/Makefile.in b/src/SyrComponent/Makefile.in deleted file mode 100755 index 8535f1a..0000000 --- a/src/SyrComponent/Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ -# SuperVisionTest SyrComponent : example of component performing some mathinatical operations -# -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : , CEA -# Module : SuperVisionTest - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_SHAREDPYSCRIPTS= COMPONENT_shared_modules.py - -EXPORT_HEADERS = \ - SyrComponent_Impl.hxx - -# Libraries targets -LIB = libSyrComponentEngine.la -LIB_SRC = \ - SyrComponent_Impl.cxx - -LIB_SERVER_IDL = AddComponent.idl \ - SALOME_Component.idl \ - SyrComponent.idl - -# Executables targets -BIN = SyrComponent_CheckOfUndefined -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -@CONCLUDE@ - diff --git a/src/SyrControlComponent/Makefile.in b/src/SyrControlComponent/Makefile.am similarity index 77% rename from src/SyrControlComponent/Makefile.in rename to src/SyrControlComponent/Makefile.am index b5b6f32..94505ff 100644 --- a/src/SyrControlComponent/Makefile.in +++ b/src/SyrControlComponent/Makefile.am @@ -20,28 +20,10 @@ # # File : Makefile.in # Author : Jean Rahuel +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ - -EXPORT_PYSCRIPTS = SyrControlComponent.py - -# Libraries targets - -LIB = -LIB_SRC = -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -LDFLAGS+= - - -@CONCLUDE@ +dist_salomescript_DATA = \ + SyrControlComponent.py diff --git a/src/TestFunctions/Makefile.in b/src/TestFunctions/Makefile.am similarity index 51% rename from src/TestFunctions/Makefile.in rename to src/TestFunctions/Makefile.am index c9fcf3a..6ebd5c5 100644 --- a/src/TestFunctions/Makefile.in +++ b/src/TestFunctions/Makefile.am @@ -23,42 +23,57 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest -# $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets -LIB = libDynInvoke.la -LIB_SRC = DynInvoke.cxx +lib_LTLIBRARIES = libDynInvoke.la +dist_libDynInvoke_la_SOURCES = \ + DynInvoke.cxx -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl - -# Executables targets -BIN = TestFunctions \ +bin_PROGRAMS = \ + TestFunctions \ TestFunctionsMemory \ TestFunctionsMemory1 \ TestFunctionsMemory2 \ TestFunctionsMemory3 \ TestFunctionsMemory4 -BIN_SRC = -BIN_CLIENT_IDL = SALOME_Component.idl \ - SALOME_ContainerManager.idl \ - AddComponent.idl -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil +libDynInvoke_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../AddComponent \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libDynInvoke_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager \ + -lSALOMEBasics \ + -lSalomeIDLKernel -LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil +TestFunctions_SOURCES = TestFunctions.cxx +TestFunctionsMemory_SOURCES = TestFunctionsMemory.cxx +TestFunctionsMemory1_SOURCES = TestFunctionsMemory1.cxx +TestFunctionsMemory2_SOURCES = TestFunctionsMemory2.cxx +TestFunctionsMemory3_SOURCES = TestFunctionsMemory3.cxx +TestFunctionsMemory4_SOURCES = TestFunctionsMemory4.cxx -@CONCLUDE@ +AM_CPPFLAGS = \ + $(libDynInvoke_la_CPPFLAGS) +LDADD = \ + ./libDynInvoke.la \ + $(libDynInvoke_la_LDFLAGS) diff --git a/src/TypesCheck/Makefile.am b/src/TypesCheck/Makefile.am new file mode 100755 index 0000000..2061f20 --- /dev/null +++ b/src/TypesCheck/Makefile.am @@ -0,0 +1,72 @@ +# SuperVisionTest AddComponent : example of component that adds two numbers +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : , CEA +# Module : SuperVisionTest +# Modified by : Alexander BORODIN (OCN) - autotools usage + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + TypesCheck_Impl.hxx + +# Libraries targets +lib_LTLIBRARIES = libTypesCheckEngine.la +dist_libTypesCheckEngine_la_SOURCES = \ + TypesCheck_Impl.cxx + +bin_PROGRAMS = TypesCheck_CheckOfUndefined +dist_TypesCheck_CheckOfUndefined_SOURCES = \ + TypesCheck_CheckOfUndefined.cxx + +${bin_PROGRAMS}: ${lib_LTLIBRARIES} + +libTypesCheckEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../AddComponent \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix +libTypesCheckEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification \ + -lSALOMELocalTrace \ + -lSalomeResourcesManager \ + -lSALOMEBasics \ + -lSalomeIDLKernel + +TypesCheck_CheckOfUndefined_CPPFLAGS = \ + $(libTypesCheckEngine_la_CPPFLAGS) + +TypesCheck_CheckOfUndefined_LDFLAGS = \ + ./libTypesCheckEngine.la \ + $(libTypesCheckEngine_la_LDFLAGS) diff --git a/src/UndefinedSymbolComponent/Makefile.in b/src/UndefinedSymbolComponent/Makefile.am similarity index 64% rename from src/UndefinedSymbolComponent/Makefile.in rename to src/UndefinedSymbolComponent/Makefile.am index a292afc..52b7558 100755 --- a/src/UndefinedSymbolComponent/Makefile.in +++ b/src/UndefinedSymbolComponent/Makefile.am @@ -23,37 +23,34 @@ # # File : Makefile.in # Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SuperVisionTest # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ UndefinedSymbolComponent.hxx # Libraries targets -LIB = libUndefinedSymbolComponentEngine.la -LIB_SRC = \ +lib_LTLIBRARIES = libUndefinedSymbolComponentEngine.la +dist_libUndefinedSymbolComponentEngine_la_SOURCES = \ UndefinedSymbolComponent.cxx -LIB_SERVER_IDL = SALOME_Component.idl \ - UndefinedSymbolComponent.idl - -# Executables targets -BIN = -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification - -LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace - -@CONCLUDE@ - +libUndefinedSymbolComponentEngine_la_CPPFLAGS = \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libUndefinedSymbolComponentEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLCOMPONENT.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeNS \ + -lOpUtil \ + -lRegistry \ + -lSalomeNotification -- 2.39.2