From 2593029cb1c4a272c6502cc9abc82f980d479739 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 19 Mar 2008 12:26:06 +0000 Subject: [PATCH] BUGs CPACK + BUGs CreatePackage CreateBlackBox windows --- CMakeLists.txt | 8 ++- kernel/appli/bbCreateBlackBox/CMakeLists.txt | 1 + .../bbCreateBlackBox/bbCreateBlackBox.bat.in | 12 ++-- .../xml-templates/std-template.xml | 4 +- kernel/cmake/BBTKConfigurePackage_data.cmake | 30 +++++--- kernel/install/CMakeLists.txt | 58 +++++++++++++++ kernel/src/bbtkRTTI.cxx | 2 +- kernel/src/bbtkWxConsole.cxx | 11 ++- packages/std/bbs/appli/exampleAscii.bbs | 12 ++++ packages/std/src/bbstdASCII.cxx | 71 +++++++++++++++++++ packages/std/src/bbstdASCII.h | 42 +++++++++++ packages/std/src/bbstdExecSystemCommand.cxx | 1 - .../toolsbbtk/bbs/appli/CreateBlackBox.bbs | 51 ++++++++----- .../toolsbbtk/bbs/appli/CreatePackage.bbs | 69 ++++++++++++------ packages/wx/src/bbwxCommandButton.cxx | 8 +-- 15 files changed, 315 insertions(+), 65 deletions(-) create mode 100644 packages/std/bbs/appli/exampleAscii.bbs create mode 100644 packages/std/src/bbstdASCII.cxx create mode 100644 packages/std/src/bbstdASCII.h diff --git a/CMakeLists.txt b/CMakeLists.txt index bcf35b4..a20712b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,10 @@ SUBDIRS(packages) #----------------------------------------------------------------------------- +#---Documentation------------- +#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack +#http://www.cmake.org/Wiki/CMake:CPackConfiguration +#http://www.cmake.org/Wiki/CMake:Install_Commands @@ -45,5 +49,7 @@ ELSE(WIN32 AND NOT UNIX) SET(CPACK_STRIP_FILES "bin/bbi") SET(CPACK_SOURCE_STRIP_FILES "") ENDIF(WIN32 AND NOT UNIX) -SET(CPACK_PACKAGE_EXECUTABLES "bbi" "bbs interpreter") +SET(CPACK_PACKAGE_EXECUTABLES "bbi" "bbs interpreter" ) + + INCLUDE(CPack) diff --git a/kernel/appli/bbCreateBlackBox/CMakeLists.txt b/kernel/appli/bbCreateBlackBox/CMakeLists.txt index 7bcf18d..f18afa0 100644 --- a/kernel/appli/bbCreateBlackBox/CMakeLists.txt +++ b/kernel/appli/bbCreateBlackBox/CMakeLists.txt @@ -6,6 +6,7 @@ SET(bbCreateBlackBox_DATA_REL_PATH_FROM_DATA kernel/bbCreateBlackBox) # Configure / Install the template xml files used by bbCreateBlackBox # Copy it into build tree + FILE(GLOB_RECURSE LST_FILE_VOID_CREATE_PACKAGE RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/xml-templates *.xml ) FOREACH( iLST ${LST_FILE_VOID_CREATE_PACKAGE}) STRING(SUBSTRING ${iLST} 0 3 subStrTmp ) diff --git a/kernel/appli/bbCreateBlackBox/bbCreateBlackBox.bat.in b/kernel/appli/bbCreateBlackBox/bbCreateBlackBox.bat.in index b30c85f..8214efc 100644 --- a/kernel/appli/bbCreateBlackBox/bbCreateBlackBox.bat.in +++ b/kernel/appli/bbCreateBlackBox/bbCreateBlackBox.bat.in @@ -36,11 +36,11 @@ echo "** Creating new black box '%BLACKBOX%' xml/c++ in folder '%OUTPUT%'" echo Creating XML file.. echo copy %INPUT%\%type%-template.xml %OUTPUT%\%FILENAME%.xml copy %INPUT%\%type%-template.xml %OUTPUT%\%FILENAME%.xml_tmp -%BINPATH%\bbSed %OUTPUT%\%FILENAME%.xml_tmp __BLACKBOXNAME__ %BLACKBOX% > %OUTPUT%\%FILENAME%_1.xml -%BINPATH%\bbSed %OUTPUT%\%FILENAME%_1.xml __AUTHOR__ %AUTHOR% > %OUTPUT%\%FILENAME%_2.xml -%BINPATH%\bbSed %OUTPUT%\%FILENAME%_2.xml __DESCRIPTION__ %DESCRIPTION% > %OUTPUT%\%FILENAME%.xml_tmp +"%BINPATH%\bbSed" %OUTPUT%\%FILENAME%.xml_tmp __BLACKBOXNAME__ %BLACKBOX% > %OUTPUT%\%FILENAME%_1.xml +"%BINPATH%\bbSed" %OUTPUT%\%FILENAME%_1.xml __AUTHOR__ %AUTHOR% > %OUTPUT%\%FILENAME%_2.xml +"%BINPATH%\bbSed" %OUTPUT%\%FILENAME%_2.xml __DESCRIPTION__ %DESCRIPTION% > %OUTPUT%\%FILENAME%.xml_tmp del %OUTPUT%\%FILENAME%_1.xml -del %OUTPUT%\%FILENAME%_2.xml +del %OUTPUT%\%FILENAME%_2.xml IF %FORMAT%==XML GOTO module_XML @@ -55,8 +55,8 @@ goto END :module_C++ IF EXIST %OUTPUT%\%FILENAME%.cxx GOTO ERROR02 - echo %BINPATH%\bbfy %OUTPUT%\%FILENAME%.xml_tmp %PACK% %OUTPUT% - %BINPATH%\bbfy %OUTPUT%\%FILENAME%.xml_tmp %PACK% %OUTPUT%\ + echo "%BINPATH%\bbfy" %OUTPUT%\%FILENAME%.xml_tmp %PACK% %OUTPUT% + "%BINPATH%\bbfy" %OUTPUT%\%FILENAME%.xml_tmp %PACK% %OUTPUT%\ del %OUTPUT%\%FILENAME%.xml_tmp goto END diff --git a/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml b/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml index 54aa427..b02c550 100644 --- a/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml +++ b/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml @@ -14,9 +14,7 @@ #include directives to be put in the .h generated There must be one tag per file to include Here we include the standard header iostream.h --> -
-    iostream.h
-  
+
iostream