From: Eduardo Davila Date: Mon, 22 Jun 2009 07:45:09 +0000 (+0000) Subject: no message X-Git-Tag: EED.02Oct2009~19 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ec8cc0691e3b2b5439e6a320ad26648600412efc;p=bbtk.git no message --- diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/classdiagrams.html b/doc/bouml/bbtk_Class_Diagram_HTML/classdiagrams.html new file mode 100644 index 0000000..38243bb --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/classdiagrams.html @@ -0,0 +1,22 @@ + + + + + + +Class Diagram Index + + + + + +
Class Diagram Index
+

+ + + + + +
bbtk-Class-Diagram
+ + diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/classes_list.html b/doc/bouml/bbtk_Class_Diagram_HTML/classes_list.html new file mode 100644 index 0000000..f124784 --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/classes_list.html @@ -0,0 +1,24 @@ + + + + + + +Classes + + + + + +
Classes
+

+ + + + + + + +
+ + diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/fig128002.png b/doc/bouml/bbtk_Class_Diagram_HTML/fig128002.png new file mode 100644 index 0000000..6c74587 Binary files /dev/null and b/doc/bouml/bbtk_Class_Diagram_HTML/fig128002.png differ diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/index-withframe.html b/doc/bouml/bbtk_Class_Diagram_HTML/index-withframe.html new file mode 100644 index 0000000..1104076 --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/index-withframe.html @@ -0,0 +1,19 @@ + + + + + + +/Users/davila/Creatis/bbtk/doc/bouml/bbtk_Class_Diagram_HTML/index-withframe + + + + + + + + + + +<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A> + diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/index.html b/doc/bouml/bbtk_Class_Diagram_HTML/index.html new file mode 100644 index 0000000..c89f179 --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/index.html @@ -0,0 +1,23 @@ + + + + + + +bbtk-Class-Diagram +Documentation + + + + + +
bbtk-Class-Diagram
Documentation
+

+ + + + +

+

bbtk-Class-Diagram



+ + diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/index_66.html b/doc/bouml/bbtk_Class_Diagram_HTML/index_66.html new file mode 100644 index 0000000..e174b81 --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/index_66.html @@ -0,0 +1,23 @@ + + + + + + +B + + + + + +
B
+

+ + + + + + +
NameKindDescription
bbtk-Class-Diagramclass diagram
+ + diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/navig.html b/doc/bouml/bbtk_Class_Diagram_HTML/navig.html new file mode 100644 index 0000000..77b53c9 --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/navig.html @@ -0,0 +1,17 @@ + + + + + + +/Users/davila/Creatis/bbtk/doc/bouml/bbtk_Class_Diagram_HTML/navig + + + +


+

-Top- -Class Diagrams-

+

+

+

B

+ + diff --git a/doc/bouml/bbtk_Class_Diagram_HTML/style.css b/doc/bouml/bbtk_Class_Diagram_HTML/style.css new file mode 100644 index 0000000..3a10a81 --- /dev/null +++ b/doc/bouml/bbtk_Class_Diagram_HTML/style.css @@ -0,0 +1,30 @@ +div.title { font-size: 150%; background: #87ceff; text-align: center; font-weight: bold; } + +div.sub { margin-left : 20px; } +div.element { background: #d3d3d3; } + +h1.package { background: #ffe4c4; } +h1.view { background: #98fb98; } + +h2.package { background: #ffe4c4; } +h2.view { background: #98fb98; } +h2.class { background: #87ceff; } +h2.usecase { background: #87ceff; } +h2.state { background: #87ceff; } +h2.activity { background: #87ceff; } + +h3.package { background: #ffe4c4; } +h3.view { background: #98fb98; } +h3.class { background: #87ceff; } +h3.usecase { background: #87ceff; } +h3.state { background: #87ceff; } +h3.stateregion { background: #87ceff; } +h3.activity { background: #87ceff; } + +h4.package { background: #ffe4c4; } +h4.view { background: #98fb98; } +h4.class { background: #87ceff; } +h4.usecase { background: #87ceff; } +h4.state { background: #87ceff; } +h4.stateregion { background: #87ceff; } +h4.activity { background: #87ceff; } diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/classes_list.html b/doc/bouml/bbtk_bbExecute_Sequence_HTML/classes_list.html new file mode 100644 index 0000000..f124784 --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/classes_list.html @@ -0,0 +1,24 @@ + + + + + + +Classes + + + + + +
Classes
+

+ + + + + + + +
+ + diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/fig129154.png b/doc/bouml/bbtk_bbExecute_Sequence_HTML/fig129154.png new file mode 100644 index 0000000..ab13bec Binary files /dev/null and b/doc/bouml/bbtk_bbExecute_Sequence_HTML/fig129154.png differ diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/index-withframe.html b/doc/bouml/bbtk_bbExecute_Sequence_HTML/index-withframe.html new file mode 100644 index 0000000..41e6d79 --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/index-withframe.html @@ -0,0 +1,19 @@ + + + + + + +/Users/davila/Creatis/bbtk/doc/bouml/bbtk_bbExecute_Sequence_HTML/index-withframe + + + + + + + + + + +<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A> + diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/index.html b/doc/bouml/bbtk_bbExecute_Sequence_HTML/index.html new file mode 100644 index 0000000..7472106 --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/index.html @@ -0,0 +1,23 @@ + + + + + + +bbExecute Sequence diagram +Documentation + + + + + +
bbExecute Sequence diagram
Documentation
+

+ + + + +

+

bbExecute Sequence diagram



+ + diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/index_66.html b/doc/bouml/bbtk_bbExecute_Sequence_HTML/index_66.html new file mode 100644 index 0000000..d92adfe --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/index_66.html @@ -0,0 +1,23 @@ + + + + + + +B + + + + + +
B
+

+ + + + + + +
NameKindDescription
bbExecute Sequence diagramsequence diagram
+ + diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/navig.html b/doc/bouml/bbtk_bbExecute_Sequence_HTML/navig.html new file mode 100644 index 0000000..babfd95 --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/navig.html @@ -0,0 +1,17 @@ + + + + + + +/Users/davila/Creatis/bbtk/doc/bouml/bbtk_bbExecute_Sequence_HTML/navig + + + +


+

-Top- -Sequence Diagrams-

+

+

+

B

+ + diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/sequencediagrams.html b/doc/bouml/bbtk_bbExecute_Sequence_HTML/sequencediagrams.html new file mode 100644 index 0000000..a9d49eb --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/sequencediagrams.html @@ -0,0 +1,22 @@ + + + + + + +Sequence Diagram Index + + + + + +
Sequence Diagram Index
+

+ + + + + +
bbExecute Sequence diagram
+ + diff --git a/doc/bouml/bbtk_bbExecute_Sequence_HTML/style.css b/doc/bouml/bbtk_bbExecute_Sequence_HTML/style.css new file mode 100644 index 0000000..3a10a81 --- /dev/null +++ b/doc/bouml/bbtk_bbExecute_Sequence_HTML/style.css @@ -0,0 +1,30 @@ +div.title { font-size: 150%; background: #87ceff; text-align: center; font-weight: bold; } + +div.sub { margin-left : 20px; } +div.element { background: #d3d3d3; } + +h1.package { background: #ffe4c4; } +h1.view { background: #98fb98; } + +h2.package { background: #ffe4c4; } +h2.view { background: #98fb98; } +h2.class { background: #87ceff; } +h2.usecase { background: #87ceff; } +h2.state { background: #87ceff; } +h2.activity { background: #87ceff; } + +h3.package { background: #ffe4c4; } +h3.view { background: #98fb98; } +h3.class { background: #87ceff; } +h3.usecase { background: #87ceff; } +h3.state { background: #87ceff; } +h3.stateregion { background: #87ceff; } +h3.activity { background: #87ceff; } + +h4.package { background: #ffe4c4; } +h4.view { background: #98fb98; } +h4.class { background: #87ceff; } +h4.usecase { background: #87ceff; } +h4.state { background: #87ceff; } +h4.stateregion { background: #87ceff; } +h4.activity { background: #87ceff; } diff --git a/doc/bouml/bbtkk/2.session b/doc/bouml/bbtkk/2.session index b93f08c..01cf30e 100644 --- a/doc/bouml/bbtkk/2.session +++ b/doc/bouml/bbtkk/2.session @@ -1,12 +1,12 @@ -window_sizes 1397 856 356 1035 799 0 +window_sizes 1024 1258 364 654 1201 0 diagrams - active classdiagram_ref 128002 // bbtk-Class-Diagram + classdiagram_ref 128002 // bbtk-Class-Diagram 1031 779 100 4 432 0 - sequencediagram_ref 129154 // bbExecute Sequence diagram - 1030 779 100 4 17 0 + active sequencediagram_ref 129154 // bbExecute Sequence diagram + 650 1181 100 4 38 0 end show_stereotypes -selected classdiagram_ref 128002 // bbtk-Class-Diagram +selected sequencediagram_ref 129154 // bbExecute Sequence diagram open class_ref 129026 // floating_point deploymentview_ref 128002 // src diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index 2a74b53..1cbcc98 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -27,7 +27,8 @@ ELSE(WIN32) # SET (EXECUTABLE_OUTPUT_REL_PATH bin) # SET (LIBRARY_OUTPUT_REL_PATH bin) SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin) - SET(BBTK_PACKAGE_LIB_PATH ${BBTK_INSTALL_PREFIX}/lib) +#EED SET(BBTK_PACKAGE_LIB_PATH ${BBTK_INSTALL_PREFIX}/lib) + SET(BBTK_PACKAGE_LIB_PATH lib) SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc") diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index f736364..95553de 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -165,7 +165,9 @@ INSTALL( ) INSTALL( TARGETS bb${BBTK_PACKAGE_NAME} - DESTINATION ${BBTK_PACKAGE_LIB_PATH}) + DESTINATION ${BBTK_PACKAGE_LIB_PATH} + ) + # Preparing macro invocation : CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} ) diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt index 9ccd620..986a396 100644 --- a/kernel/install/cpack/CMakeLists.txt +++ b/kernel/install/cpack/CMakeLists.txt @@ -23,7 +23,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION}) # There is a bug in NSI that does not handle full unix paths properly. Make # sure there is at least one set of four (4) backlasshes. -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") #SET(CPACK_SOURCE_PACKAGE_FILE_NAME "bbtk-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") IF(WIN32 AND NOT UNIX) #EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp")