*** empty log message ***

diff --git a/LICENSE.txt b/LICENSE.txt
index c397da42a32d93f4b9a3ed690ca287a28d0a8179..365263d878a41a94d65dd85cb02baacae4278781 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1 +1,514 @@
-TO DO : Write...
\ No newline at end of file
+CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
+
+
+    Notice
+
+This Agreement is a Free Software license agreement that is the result
+of discussions between its authors in order to ensure compliance with
+the two main principles guiding its drafting:
+
+    * firstly, compliance with the principles governing the distribution
+      of Free Software: access to source code, broad rights granted to
+      users,
+    * secondly, the election of a governing law, French law, with which
+      it is conformant, both as regards the law of torts and
+      intellectual property law, and the protection that it offers to
+      both authors and holders of the economic rights over software.
+
+The authors of the CeCILL-B (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
+license are: 
+
+Commissariat à l'Energie Atomique - CEA, a public scientific, technical
+and industrial research establishment, having its principal place of
+business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
+
+Centre National de la Recherche Scientifique - CNRS, a public scientific
+and technological establishment, having its principal place of business
+at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
+
+Institut National de Recherche en Informatique et en Automatique -
+INRIA, a public scientific and technological establishment, having its
+principal place of business at Domaine de Voluceau, Rocquencourt, BP
+105, 78153 Le Chesnay cedex, France.
+
+
+    Preamble
+
+This Agreement is an open source software license intended to give users
+significant freedom to modify and redistribute the software licensed
+hereunder.
+
+The exercising of this freedom is conditional upon a strong obligation
+of giving credits for everybody that distributes a software
+incorporating a software ruled by the current license so as all
+contributions to be properly identified and acknowledged.
+
+In consideration of access to the source code and the rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors only have limited liability.
+
+In this respect, the risks associated with loading, using, modifying
+and/or developing or reproducing the software by the user are brought to
+the user's attention, given its Free Software status, which may make it
+complicated to use, with the result that its use is reserved for
+developers and experienced professionals having in-depth computer
+knowledge. Users are therefore encouraged to load and test the
+suitability of the software as regards their requirements in conditions
+enabling the security of their systems and/or data to be ensured and,
+more generally, to use and operate it in the same conditions of
+security. This Agreement may be freely reproduced and published,
+provided it is not altered, and that no provisions are either added or
+removed herefrom.
+
+This Agreement may apply to any or all software for which the holder of
+the economic rights decides to submit the use thereof to its provisions.
+
+
+    Article 1 - DEFINITIONS
+
+For the purpose of this Agreement, when the following expressions
+commence with a capital letter, they shall have the following meaning:
+
+Agreement: means this license agreement, and its possible subsequent
+versions and annexes.
+
+Software: means the software in its Object Code and/or Source Code form
+and, where applicable, its documentation, "as is" when the Licensee
+accepts the Agreement.
+
+Initial Software: means the Software in its Source Code and possibly its
+Object Code form and, where applicable, its documentation, "as is" when
+it is first distributed under the terms and conditions of the Agreement.
+
+Modified Software: means the Software modified by at least one
+Contribution.
+
+Source Code: means all the Software's instructions and program lines to
+which access is required so as to modify the Software.
+
+Object Code: means the binary files originating from the compilation of
+the Source Code.
+
+Holder: means the holder(s) of the economic rights over the Initial
+Software.
+
+Licensee: means the Software user(s) having accepted the Agreement.
+
+Contributor: means a Licensee having made at least one Contribution.
+
+Licensor: means the Holder, or any other individual or legal entity, who
+distributes the Software under the Agreement.
+
+Contribution: means any or all modifications, corrections, translations,
+adaptations and/or new functions integrated into the Software by any or
+all Contributors, as well as any or all Internal Modules.
+
+Module: means a set of sources files including their documentation that
+enables supplementary functions or services in addition to those offered
+by the Software.
+
+External Module: means any or all Modules, not derived from the
+Software, so that this Module and the Software run in separate address
+spaces, with one calling the other when they are run.
+
+Internal Module: means any or all Module, connected to the Software so
+that they both execute in the same address space.
+
+Parties: mean both the Licensee and the Licensor.
+
+These expressions may be used both in singular and plural form.
+
+
+    Article 2 - PURPOSE
+
+The purpose of the Agreement is the grant by the Licensor to the
+Licensee of a non-exclusive, transferable and worldwide license for the
+Software as set forth in Article 5 hereinafter for the whole term of the
+protection granted by the rights over said Software.
+
+
+    Article 3 - ACCEPTANCE
+
+3.1 The Licensee shall be deemed as having accepted the terms and
+conditions of this Agreement upon the occurrence of the first of the
+following events:
+
+    * (i) loading the Software by any or all means, notably, by
+      downloading from a remote server, or by loading from a physical
+      medium;
+    * (ii) the first time the Licensee exercises any of the rights
+      granted hereunder.
+
+3.2 One copy of the Agreement, containing a notice relating to the
+characteristics of the Software, to the limited warranty, and to the
+fact that its use is restricted to experienced users has been provided
+to the Licensee prior to its acceptance as set forth in Article 3.1
+hereinabove, and the Licensee hereby acknowledges that it has read and
+understood it.
+
+
+    Article 4 - EFFECTIVE DATE AND TERM
+
+
+      4.1 EFFECTIVE DATE
+
+The Agreement shall become effective on the date when it is accepted by
+the Licensee as set forth in Article 3.1.
+
+
+      4.2 TERM
+
+The Agreement shall remain in force for the entire legal term of
+protection of the economic rights over the Software.
+
+
+    Article 5 - SCOPE OF RIGHTS GRANTED
+
+The Licensor hereby grants to the Licensee, who accepts, the following
+rights over the Software for any or all use, and for the term of the
+Agreement, on the basis of the terms and conditions set forth hereinafter.
+
+Besides, if the Licensor owns or comes to own one or more patents
+protecting all or part of the functions of the Software or of its
+components, the Licensor undertakes not to enforce the rights granted by
+these patents against successive Licensees using, exploiting or
+modifying the Software. If these patents are transferred, the Licensor
+undertakes to have the transferees subscribe to the obligations set
+forth in this paragraph.
+
+
+      5.1 RIGHT OF USE
+
+The Licensee is authorized to use the Software, without any limitation
+as to its fields of application, with it being hereinafter specified
+that this comprises:
+
+   1. permanent or temporary reproduction of all or part of the Software
+      by any or all means and in any or all form.
+
+   2. loading, displaying, running, or storing the Software on any or
+      all medium.
+
+   3. entitlement to observe, study or test its operation so as to
+      determine the ideas and principles behind any or all constituent
+      elements of said Software. This shall apply when the Licensee
+      carries out any or all loading, displaying, running, transmission
+      or storage operation as regards the Software, that it is entitled
+      to carry out hereunder.
+
+
+      5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS
+
+The right to make Contributions includes the right to translate, adapt,
+arrange, or make any or all modifications to the Software, and the right
+to reproduce the resulting software.
+
+The Licensee is authorized to make any or all Contributions to the
+Software provided that it includes an explicit notice that it is the
+author of said Contribution and indicates the date of the creation thereof.
+
+
+      5.3 RIGHT OF DISTRIBUTION
+
+In particular, the right of distribution includes the right to publish,
+transmit and communicate the Software to the general public on any or
+all medium, and by any or all means, and the right to market, either in
+consideration of a fee, or free of charge, one or more copies of the
+Software by any means.
+
+The Licensee is further authorized to distribute copies of the modified
+or unmodified Software to third parties according to the terms and
+conditions set forth hereinafter.
+
+
+        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
+
+The Licensee is authorized to distribute true copies of the Software in
+Source Code or Object Code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
+
+   1. a copy of the Agreement,
+
+   2. a notice relating to the limitation of both the Licensor's
+      warranty and liability as set forth in Articles 8 and 9,
+
+and that, in the event that only the Object Code of the Software is
+redistributed, the Licensee allows effective access to the full Source
+Code of the Software at a minimum during the entire period of its
+distribution of the Software, it being understood that the additional
+cost of acquiring the Source Code shall not exceed the cost of
+transferring the data.
+
+
+        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
+
+If the Licensee makes any Contribution to the Software, the resulting
+Modified Software may be distributed under a license agreement other
+than this Agreement subject to compliance with the provisions of Article
+5.3.4.
+
+
+        5.3.3 DISTRIBUTION OF EXTERNAL MODULES
+
+When the Licensee has developed an External Module, the terms and
+conditions of this Agreement do not apply to said External Module, that
+may be distributed under a separate license agreement.
+
+
+        5.3.4 CREDITS
+
+Any Licensee who may distribute a Modified Software hereby expressly
+agrees to:
+
+   1. indicate in the related documentation that it is based on the
+      Software licensed hereunder, and reproduce the intellectual
+      property notice for the Software,
+
+   2. ensure that written indications of the Software intended use,
+      intellectual property notice and license hereunder are included in
+      easily accessible format from the Modified Software interface,
+
+   3. mention, on a freely accessible website describing the Modified
+      Software, at least throughout the distribution term thereof, that
+      it is based on the Software licensed hereunder, and reproduce the
+      Software intellectual property notice,
+
+   4. where it is distributed to a third party that may distribute a
+      Modified Software without having to make its source code
+      available, make its best efforts to ensure that said third party
+      agrees to comply with the obligations set forth in this Article .
+
+If the Software, whether or not modified, is distributed with an
+External Module designed for use in connection with the Software, the
+Licensee shall submit said External Module to the foregoing obligations.
+
+
+        5.3.5 COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES
+
+Where a Modified Software contains a Contribution subject to the CeCILL
+license, the provisions set forth in Article 5.3.4 shall be optional.
+
+A Modified Software may be distributed under the CeCILL-C license. In
+such a case the provisions set forth in Article 5.3.4 shall be optional.
+
+
+    Article 6 - INTELLECTUAL PROPERTY
+
+
+      6.1 OVER THE INITIAL SOFTWARE
+
+The Holder owns the economic rights over the Initial Software. Any or
+all use of the Initial Software is subject to compliance with the terms
+and conditions under which the Holder has elected to distribute its work
+and no one shall be entitled to modify the terms and conditions for the
+distribution of said Initial Software.
+
+The Holder undertakes that the Initial Software will remain ruled at
+least by this Agreement, for the duration set forth in Article 4.2.
+
+
+      6.2 OVER THE CONTRIBUTIONS
+
+The Licensee who develops a Contribution is the owner of the
+intellectual property rights over this Contribution as defined by
+applicable law.
+
+
+      6.3 OVER THE EXTERNAL MODULES
+
+The Licensee who develops an External Module is the owner of the
+intellectual property rights over this External Module as defined by
+applicable law and is free to choose the type of agreement that shall
+govern its distribution.
+
+
+      6.4 JOINT PROVISIONS
+
+The Licensee expressly undertakes:
+
+   1. not to remove, or modify, in any manner, the intellectual property
+      notices attached to the Software;
+
+   2. to reproduce said notices, in an identical manner, in the copies
+      of the Software modified or not.
+
+The Licensee undertakes not to directly or indirectly infringe the
+intellectual property rights of the Holder and/or Contributors on the
+Software and to take, where applicable, vis-à-vis its staff, any and all
+measures required to ensure respect of said intellectual property rights
+of the Holder and/or Contributors.
+
+
+    Article 7 - RELATED SERVICES
+
+7.1 Under no circumstances shall the Agreement oblige the Licensor to
+provide technical assistance or maintenance services for the Software.
+
+However, the Licensor is entitled to offer this type of services. The
+terms and conditions of such technical assistance, and/or such
+maintenance, shall be set forth in a separate instrument. Only the
+Licensor offering said maintenance and/or technical assistance services
+shall incur liability therefor.
+
+7.2 Similarly, any Licensor is entitled to offer to its licensees, under
+its sole responsibility, a warranty, that shall only be binding upon
+itself, for the redistribution of the Software and/or the Modified
+Software, under terms and conditions that it is free to decide. Said
+warranty, and the financial terms and conditions of its application,
+shall be subject of a separate instrument executed between the Licensor
+and the Licensee.
+
+
+    Article 8 - LIABILITY
+
+8.1 Subject to the provisions of Article 8.2, the Licensee shall be
+entitled to claim compensation for any direct loss it may have suffered
+from the Software as a result of a fault on the part of the relevant
+Licensor, subject to providing evidence thereof.
+
+8.2 The Licensor's liability is limited to the commitments made under
+this Agreement and shall not be incurred as a result of in particular:
+(i) loss due the Licensee's total or partial failure to fulfill its
+obligations, (ii) direct or consequential loss that is suffered by the
+Licensee due to the use or performance of the Software, and (iii) more
+generally, any consequential loss. In particular the Parties expressly
+agree that any or all pecuniary or business loss (i.e. loss of data,
+loss of profits, operating loss, loss of customers or orders,
+opportunity cost, any disturbance to business activities) or any or all
+legal proceedings instituted against the Licensee by a third party,
+shall constitute consequential loss and shall not provide entitlement to
+any or all compensation from the Licensor.
+
+
+    Article 9 - WARRANTY
+
+9.1 The Licensee acknowledges that the scientific and technical
+state-of-the-art when the Software was distributed did not enable all
+possible uses to be tested and verified, nor for the presence of
+possible defects to be detected. In this respect, the Licensee's
+attention has been drawn to the risks associated with loading, using,
+modifying and/or developing and reproducing the Software which are
+reserved for experienced users.
+
+The Licensee shall be responsible for verifying, by any or all means,
+the suitability of the product for its requirements, its good working
+order, and for ensuring that it shall not cause damage to either persons
+or properties.
+
+9.2 The Licensor hereby represents, in good faith, that it is entitled
+to grant all the rights over the Software (including in particular the
+rights set forth in Article 5).
+
+9.3 The Licensee acknowledges that the Software is supplied "as is" by
+the Licensor without any other express or tacit warranty, other than
+that provided for in Article 9.2 and, in particular, without any warranty 
+as to its commercial value, its secured, safe, innovative or relevant 
+nature.
+
+Specifically, the Licensor does not warrant that the Software is free
+from any error, that it will operate without interruption, that it will
+be compatible with the Licensee's own equipment and software
+configuration, nor that it will meet the Licensee's requirements.
+
+9.4 The Licensor does not either expressly or tacitly warrant that the
+Software does not infringe any third party intellectual property right
+relating to a patent, software or any other property right. Therefore,
+the Licensor disclaims any and all liability towards the Licensee
+arising out of any or all proceedings for infringement that may be
+instituted in respect of the use, modification and redistribution of the
+Software. Nevertheless, should such proceedings be instituted against
+the Licensee, the Licensor shall provide it with technical and legal
+assistance for its defense. Such technical and legal assistance shall be
+decided on a case-by-case basis between the relevant Licensor and the
+Licensee pursuant to a memorandum of understanding. The Licensor
+disclaims any and all liability as regards the Licensee's use of the
+name of the Software. No warranty is given as regards the existence of
+prior rights over the name of the Software or as regards the existence
+of a trademark.
+
+
+    Article 10 - TERMINATION
+
+10.1 In the event of a breach by the Licensee of its obligations
+hereunder, the Licensor may automatically terminate this Agreement
+thirty (30) days after notice has been sent to the Licensee and has
+remained ineffective.
+
+10.2 A Licensee whose Agreement is terminated shall no longer be
+authorized to use, modify or distribute the Software. However, any
+licenses that it may have granted prior to termination of the Agreement
+shall remain valid subject to their having been granted in compliance
+with the terms and conditions hereof.
+
+
+    Article 11 - MISCELLANEOUS
+
+
+      11.1 EXCUSABLE EVENTS
+
+Neither Party shall be liable for any or all delay, or failure to
+perform the Agreement, that may be attributable to an event of force
+majeure, an act of God or an outside cause, such as defective
+functioning or interruptions of the electricity or telecommunications
+networks, network paralysis following a virus attack, intervention by
+government authorities, natural disasters, water damage, earthquakes,
+fire, explosions, strikes and labor unrest, war, etc.
+
+11.2 Any failure by either Party, on one or more occasions, to invoke
+one or more of the provisions hereof, shall under no circumstances be
+interpreted as being a waiver by the interested Party of its right to
+invoke said provision(s) subsequently.
+
+11.3 The Agreement cancels and replaces any or all previous agreements,
+whether written or oral, between the Parties and having the same
+purpose, and constitutes the entirety of the agreement between said
+Parties concerning said purpose. No supplement or modification to the
+terms and conditions hereof shall be effective as between the Parties
+unless it is made in writing and signed by their duly authorized
+representatives.
+
+11.4 In the event that one or more of the provisions hereof were to
+conflict with a current or future applicable act or legislative text,
+said act or legislative text shall prevail, and the Parties shall make
+the necessary amendments so as to comply with said act or legislative
+text. All other provisions shall remain effective. Similarly, invalidity
+of a provision of the Agreement, for any reason whatsoever, shall not
+cause the Agreement as a whole to be invalid.
+
+
+      11.5 LANGUAGE
+
+The Agreement is drafted in both French and English and both versions
+are deemed authentic.
+
+
+    Article 12 - NEW VERSIONS OF THE AGREEMENT
+
+12.1 Any person is authorized to duplicate and distribute copies of this
+Agreement.
+
+12.2 So as to ensure coherence, the wording of this Agreement is
+protected and may only be modified by the authors of the License, who
+reserve the right to periodically publish updates or new versions of the
+Agreement, each with a separate number. These subsequent versions may
+address new issues encountered by Free Software.
+
+12.3 Any Software distributed under a given version of the Agreement may
+only be subsequently distributed under the same version of the Agreement
+or a subsequent version.
+
+
+    Article 13 - GOVERNING LAW AND JURISDICTION
+
+13.1 The Agreement is governed by French law. The Parties agree to
+endeavor to seek an amicable solution to any disagreements or disputes
+that may arise during the performance of the Agreement.
+
+13.2 Failing an amicable solution within two (2) months as from their
+occurrence, and unless emergency proceedings are necessary, the
+disagreements or disputes shall be referred to the Paris Courts having
+jurisdiction, by the more diligent Party.
+
+
+Version 1.0 dated 2006-09-05.

diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt
index 8d93857ed4a92c35cd47db3d650497c682fea5d1..a1bbbf8cc760d7bf7754177178a16ba879c56d18 100644 (file)
--- a/kernel/appli/CMakeLists.txt
+++ b/kernel/appli/CMakeLists.txt
@@ -36,4 +36,6 @@ SUBDIRS(bbc)
 
 SUBDIRS(bbRegenerateBoxesLists)
 
-SUBDIRS(bbRegeneratePackageDoc)
\ No newline at end of file
+SUBDIRS(bbRegeneratePackageDoc)
+
+SUBDIRS(bbPostInstallPackage)

diff --git a/kernel/appli/bbPostInstallPackage/CMakeLists.txt b/kernel/appli/bbPostInstallPackage/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9a54dfb
--- /dev/null
+++ b/kernel/appli/bbPostInstallPackage/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Installs bbPostInstallPackage.bat/.sh  
+
+
+# Configure / Install the script 
+
+IF(WIN32)
+  # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
+    ${BBTK_BINARY_DIR}/Debug/bbPostInstallPackage.bat
+    @ONLY IMMEDIATE
+    )
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
+    ${BBTK_BINARY_DIR}/Release/bbPostInstallPackage.bat
+    @ONLY IMMEDIATE
+    )
+  # install tree
+  INSTALL(
+    PROGRAMS ${BBTK_BINARY_DIR}/Debug/bbPostInstallPackage.bat
+    DESTINATION bin
+    )
+ELSE(WIN32)
+  # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.sh.in
+    ${BBTK_BINARY_DIR}/bin/bbPostInstallPackage
+    @ONLY IMMEDIATE
+    )
+  # Install tree
+  INSTALL(
+    FILES ${BBTK_BINARY_DIR}/bin/bbPostInstallPackage
+    DESTINATION bin
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+    )
+ENDIF(WIN32)
+
+
+
+

diff --git a/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.bat.in b/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.bat.in
new file mode 100755 (executable)
index 0000000..9fc8371
--- /dev/null
+++ b/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.bat.in
@@ -0,0 +1,56 @@
+@echo off
+
+echo creates the file architecture for a new user package
+
+
+if %0%1==%0 goto ERROR01
+
+
+rem bbCreatePackage path
+set BINPATH=%~dp0
+rem Input data path
+set INPUT="%BINPATH%\@bbCreatePackage_DATA_REL_PATH_FROM_BIN@\void-Package"
+
+set OUTPUT=%1
+set PACK=%2
+set AUTHOR=%3
+set DESCRIPTION=%4
+
+echo output=  %OUTPUT%
+echo bin   =  %BINPATH%
+echo input =  %INPUT%
+echo pack  =  %PACK%
+echo author  =  %AUTHOR%
+echo description  =  %DESCRIPTION%
+
+IF EXIST %OUTPUT%\%PACK% GOTO ERROR02
+
+echo "** Creating new black box package '%PACK%' in folder '%OUTPUT%'"
+
+mkdir %OUTPUT%\%PACK%
+xcopy %INPUT% %OUTPUT%\%PACK% /S
+"%BINPATH%\bbSed" %OUTPUT%\%PACK%\CMakeLists.txt  WITHOUT_NAME "%PACK%" > %OUTPUT%\%PACK%\CMakeLists2.txt
+"%BINPATH%\bbSed" %OUTPUT%\%PACK%\CMakeLists2.txt  WITHOUT_AUTHOR %AUTHOR% > %OUTPUT%\%PACK%\CMakeLists3.txt
+"%BINPATH%\bbSed" %OUTPUT%\%PACK%\CMakeLists3.txt  WITHOUT_DESCRIPTION %DESCRIPTION% > %OUTPUT%\%PACK%\CMakeLists.txt
+del "%OUTPUT%\%PACK%\CMakeLists2.txt" 
+del "%OUTPUT%\%PACK%\CMakeLists3.txt"
+echo "Done !" 
+echo "Edit the file '%OUTPUT%\%PACK%\CMakeLists.txt' to customize your package"
+
+
+
+goto END
+
+
+:ERROR01
+echo bbCreatePackage.bat "<package-path> <package-name> [author] [description] "
+goto END
+
+:ERROR02
+echo "ERROR : Directory '%OUTPUT%/%PACK%' already exists !"  
+goto end
+
+
+
+:END
+

diff --git a/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in b/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in
new file mode 100755 (executable)
index 0000000..d34d158
--- /dev/null
+++ b/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in
@@ -0,0 +1,22 @@
+#!/bin/bash
+# post-install step for packages : regenerate the doc and boxeslists
+
+if [ $# -lt 1 ]
+    then
+    echo "usage : bbPostInstallPackage <package-name>"
+    exit
+fi
+
+# path
+TMP=$(which $0|rev)
+BINPATH=$(echo ${TMP#*/}|rev)
+
+PACK=$1
+
+cd ${BINPATH}
+export LD_LIBRARY_PATH="../lib:${LD_LIBRARY_PATH}"
+./bbRegeneratePackageDoc ${PACK}
+./bbRegenerateBoxesLists
+
+echo "Done !" 
+

diff --git a/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp b/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp
index 5f6612456e7aafcb1c52520b155a7faa39667068..6104957203182abfeeb8dbbae532b93842efc9e9 100644 (file)
--- a/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp
+++ b/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp
@@ -6,24 +6,32 @@
 int main(int argc, char **argv)
 {
 
-       bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
-    I->SetCommandLine(true);
-    I->SetThrow(false);
-    
-
-       std::string doc_path = bbtk::ConfigurationFile::GetInstance().Get_doc_path();
-       doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
-       doc_path += "bbdoc";
-       doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
-
-    I->InterpretLine( "exec freeze");
-    I->InterpretLine( "include *");
-       I->GetExecuter()->GetFactory()->CreateHtmlIndex(bbtk::Factory::Initials,doc_path + "index-alpha.html");
+  try
+    {
+      bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
+      I->SetCommandLine(true);
+      I->SetThrow(false);
+      
+      
+      std::string doc_path = bbtk::ConfigurationFile::GetInstance().Get_doc_path();
+      doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
+      doc_path += "bbdoc";
+      doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
+      
+      I->InterpretLine( "exec freeze");
+      I->InterpretLine( "include *");
+      I->GetExecuter()->GetFactory()->CreateHtmlIndex(bbtk::Factory::Initials,doc_path + "index-alpha.html");
        I->GetExecuter()->GetFactory()->CreateHtmlIndex(bbtk::Factory::Packages,doc_path + "index-package.html");
        I->GetExecuter()->GetFactory()->CreateHtmlIndex(bbtk::Factory::Categories,doc_path + "index-category.html");
        I->GetExecuter()->GetFactory()->CreateHtmlIndex(bbtk::Factory::Adaptors,doc_path + "index-adaptors.html");
-
-       return 0;
+       
+    }
+  catch (bbtk::Exception e)
+    {
+      std::cout << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
+      return 1;
+    }
+  return 0;
 }
 //==========================================================================
 

diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake
index b7eeddfbbdbca9003e23e62208e6f61c5cb6dfd9..103c434f8f19ebf0603bb271767821c9fd7674cc 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake
@@ -36,6 +36,22 @@ BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT(
   )
 #----------------------------------------------------------------------------
 
+  IF(NOT WIN32)
+    # runs bbRegeneratePackageDoc and bbRegenerateBoxesLists 
+    # as a post install step
+    # does not work on windaube
+    IF(NOT BBTK_CORE_PACKAGE)
+      INSTALL(CODE 
+       "EXECUTE_PROCESS(COMMAND echo -- Executing '${BBTK_BIN_PATH}/bbPostInstallPackage ${BBTK_PACKAGE_NAME}')"
+       )
+      INSTALL(CODE 
+       "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbPostInstallPackage ${BBTK_PACKAGE_NAME})"
+       )
+# COMMAND cd ${BBTK_BIN_PATH} COMMAND export LD_LIBRARY_PATH=\"../lib:$ENV{LD_LIBRARY_PATH}\" COMMAND bbRegeneratePackageDoc ${BBTK_PACKAGE_NAME} COMMAND bbRegenerateBoxesLists COMMAND echo \"done\")")
+    ENDIF(NOT BBTK_CORE_PACKAGE)
+  ENDIF(NOT WIN32)
+
+
 #----------------------------------------------------------------------------
 #---------------------------------------------------------------------------
 IF(BBTK_CORE_PACKAGE)

diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
index bd367ccc32244cd8c9a750dc2ed64aabe431c841..eaa3f6b69828c10fc66b780d58a9a3dcf3a888c4 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
@@ -15,11 +15,3 @@
 BBTK_DOC_INSTALL_IMAGES(bbdoc/${BBTK_PACKAGE_NAME})
 
 
-  IF(NOT WIN32)
-    # runs bbRegeneratePackageDoc and bbRegenerateBoxesLists 
-    # as a post install step
-    # does not work on windaube
-    IF(NOT BBTK_CORE_PACKAGE)
-      INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbRegeneratePackageDoc ${BBTK_PACKAGE_NAME} && ${BBTK_BIN_PATH}/bbRegenerateBoxesLists )")
-    ENDIF(NOT BBTK_CORE_PACKAGE)
-  ENDIF(NOT WIN32)

diff --git a/kernel/src/bbtkObject.cxx b/kernel/src/bbtkObject.cxx
index 63ae62b71c3571e344afd1d3cd32e995a8ff71d2..37231f31aeb38d25db45226179c949cee24227d6 100644 (file)
--- a/kernel/src/bbtkObject.cxx
+++ b/kernel/src/bbtkObject.cxx
@@ -163,9 +163,11 @@ namespace bbtk
   void Object::Deleter::operator() (Object* p)
   {
     std::string name = p->GetObjectName();
+#ifdef BBTK_COMPILE_DEBUG_MESSAGES
     void* adr = (void*)p;
     bbtkDebugMessage("object",1,"##> Object::Deleter : deleting \""
                     <<name<<"\" ["<<adr<<"]"<<std::endl);
+#endif
     Object::RemoveFromObjectList(mPointer);
     this->Delete(p);
     bbtkDebugMessage("object",2,"<## Object::Deleter : \""<<name<<"\" ["

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 29cd1dc4463af4836125e11c4a50efb44bc0d60c..2df7c250ca08e9cdde24b5153be982bda7965b90 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/10 19:19:42 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2008/10/10 12:25:09 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -234,8 +234,11 @@ namespace bbtk
        
       }
     
+#ifdef BBTK_COMPILE_DEBUG_MESSAGES
+
     bbtkDebugMessage("package",2,"<== Package::Release('"<<
                     packname<<"')"<<bbtkendl);
+
     if (!pack.expired())
       {
        long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
@@ -252,6 +255,7 @@ namespace bbtk
        bbtkDebugMessage("package",1," ... Package has been released"
                         <<std::endl);
       }
+#endif
   }
   //==========================================================================
 

diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h
index 447d9e20e89c056f359bc861f6c0cc98c93df99b..26baaba5379918b95e4ee45f5796d317b221b47f 100644 (file)
--- a/kernel/src/bbtkSystem.h
+++ b/kernel/src/bbtkSystem.h
@@ -3,17 +3,31 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkSystem.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/02 12:29:26 $
-  Version:   $Revision: 1.7 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/10 12:25:10 $
+  Version:   $Revision: 1.8 $
+                                                                               
+ Copyright (c) CREATIS-LRMN 
+   Centre de Recherche Et d'Application en Traitement de l'Image et du Signal
+ Authors : Laurent Guigues, Eduardo Davila, Jean-Pierre Roux
+ e-mail  : creatools@creatis.insa-lyon.fr
+
+  This software is governed by the CeCILL-B license under French law and 
+  abiding by the rules of distribution of free software. You can  use, 
+  modify and/ or redistribute the software under the terms of the CeCILL-B 
+  license as circulated by CEA, CNRS and INRIA at the following URL 
+  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+  or in the file LICENSE.txt.
+
+  As a counterpart to the access to the source code and  rights to copy,
+  modify and redistribute granted by the license, users are provided only
+  with a limited warranty  and the software's author,  the holder of the
+  economic rights,  and the successive licensors  have only  limited
+  liability. 
+
+  The fact that you are presently reading this means that you have had
+  knowledge of the CeCILL-B license and that you accept its terms.
+                                                                          
+
 =========================================================================*/
 
 /**

diff --git a/packages/demo/CMakeLists.txt b/packages/demo/CMakeLists.txt
index 245f2c469938a04a09c31b3a677ddf53d182888c..7dbe302fa3e7d74f41a0ca8cd53c223369f981a8 100644 (file)
--- a/packages/demo/CMakeLists.txt
+++ b/packages/demo/CMakeLists.txt
@@ -35,25 +35,29 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
- SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
- SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
- SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
- SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
- SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
+# LG : demo itself does not include/link against any of these libs
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================
 
 #===========================================================================
 # LIST HERE THE OTHER bbtk PACKAGES NEEDED
 # (WILL BE FOUND AND USED AUTOMATICALLY)
-SET(${BBTK_PACKAGE_NAME}_USE_PACKAGES 
-   std
-   wx
-   itk
-   vtk
-   itkvtk
-   wxvtk
+# LG : the demo code does not include/link against other bbtk packages
+# the dependency is just in bbs and will be resolved dynamically
+# (package installed or not at run time)
+#SET(${BBTK_PACKAGE_NAME}_USE_PACKAGES 
+#   std
+#   wx
+#   itk
+#   vtk
+#   itkvtk
+#   wxvtk
   # ...
-  )
+#  )
 #===========================================================================
 
 #===========================================================================