Output directory is now called bbtk_PACKAGENAME_PKG

diff --git a/kernel/appli/bbCreatePackage/bbCreatePackage.bat.in b/kernel/appli/bbCreatePackage/bbCreatePackage.bat.in
index 9fc83717c76a9723047e2d3457a66c09854fe700..5817406c1f486f64eebe4fc529e70758b13c3787 100755 (executable)
--- a/kernel/appli/bbCreatePackage/bbCreatePackage.bat.in
+++ b/kernel/appli/bbCreatePackage/bbCreatePackage.bat.in
@@ -15,6 +15,7 @@ set OUTPUT=%1
 set PACK=%2
 set AUTHOR=%3
 set DESCRIPTION=%4
+set PACK_DIRECTORY=bbtk_%PACK%_PKG
 
 echo output=  %OUTPUT%
 echo bin   =  %BINPATH%
@@ -22,20 +23,21 @@ echo input =  %INPUT%
 echo pack  =  %PACK%
 echo author  =  %AUTHOR%
 echo description  =  %DESCRIPTION%
+echo pack_directory = %PACK_DIRECTORY%
 
-IF EXIST %OUTPUT%\%PACK% GOTO ERROR02
+IF EXIST %OUTPUT%\%PACK_DIRECTORY% 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"
+mkdir %OUTPUT%\%PACK_DIRECTORY%
+xcopy %INPUT% %OUTPUT%\%PACK_DIRECTORY% /S
+"%BINPATH%\bbSed" %OUTPUT%\%PACK_DIRECTORY%\CMakeLists.txt   WITHOUT_NAME "%PACK%"             > %OUTPUT%\%PACK_DIRECTORY%\CMakeLists2.txt
+"%BINPATH%\bbSed" %OUTPUT%\%PACK_DIRECTORY%\CMakeLists2.txt  WITHOUT_AUTHOR %AUTHOR%           > %OUTPUT%\%PACK_DIRECTORY%\CMakeLists3.txt
+"%BINPATH%\bbSed" %OUTPUT%\%PACK_DIRECTORY%\CMakeLists3.txt  WITHOUT_DESCRIPTION %DESCRIPTION% > %OUTPUT%\%PACK_DIRECTORY%\CMakeLists.txt
+del "%OUTPUT%\%PACK_DIRECTORY%\CMakeLists2.txt" 
+del "%OUTPUT%\%PACK_DIRECTORY%\CMakeLists3.txt"
 echo "Done !" 
-echo "Edit the file '%OUTPUT%\%PACK%\CMakeLists.txt' to customize your package"
+echo "Edit the file '%OUTPUT%\%PACK_DIRECTORY%\CMakeLists.txt' to customize your package"
 
 
 
@@ -47,7 +49,7 @@ echo bbCreatePackage.bat "<package-path> <package-name> [author] [description] "
 goto END
 
 :ERROR02
-echo "ERROR : Directory '%OUTPUT%/%PACK%' already exists !"  
+echo "ERROR : Directory '%OUTPUT%/%PACK_DIRECTORY%' already exists !"  
 goto end
 
 

diff --git a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
index 4c93b5121f811ea90d78390fe189d4b0407bed2d..2e690115abbaa2aebcea671816934aa1c32e8fe1 100755 (executable)
--- a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
+++ b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
@@ -17,7 +17,7 @@ OUTPUT=$1
 PACK=$2
 AUTHOR=$3
 DESCRIPTION=$4
-PACK_DIRECTORY=${PACK}_PKG
+PACK_DIRECTORY=bbtk_${PACK}_PKG
 
 echo "output= " $OUTPUT
 echo "bin   = " $BINPATH