X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbCreatePackage%2FbbCreatePackage.sh.in;h=b18fc91c4c3e4fd47d01debdb50d4ef3ca3dd355;hb=6ae2f1552359300e6a9b08c6d9836239037310e2;hp=8556533ad237c07e8f1f44d93a1ee80d316925bf;hpb=3689d0c5e95d32e7d27d7321ab8afe7ce5264436;p=bbtk.git

diff --git a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
index 8556533..b18fc91 100755
--- a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
+++ b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
@@ -8,21 +8,30 @@ if [ $# -lt 2 ]
 fi
 
 # bbCreatePackage path
-TMP=$(which bbCreatePackage|rev)
-BBCP=$(echo ${TMP#*/}|rev)
-INPUT=${BBCP}/@bbCreatePackage_DATA_REL_PATH@/void-bbtk-package.tgz
+TMP=$(which $0|rev)
+BINPATH=$(echo ${TMP#*/}|rev)
+# Input data path
+INPUT=${BINPATH}/@bbCreatePackage_DATA_REL_PATH_FROM_BIN@/void-Package
+
 OUTPUT=$1
 PACK=$2
 AUTHOR=$3
 DESCRIPTION=$4
+PACK_DIRECTORY=bbtk_${PACK}_PKG
+
+#echo "output= " $OUTPUT
+#echo "bin   = " $BINPATH
+#echo "input = " $INPUT
+#echo "pack  = " $PACK
+#echo "pack_directory  = " $PACK_DIRECTORY
 
-if [ -d $OUTPUT/${PACK} ] 
+if [ -d $OUTPUT/${PACK_DIRECTORY} ] 
     then 
-    echo "ERROR : Directory '$OUTPUT/${PACK}' already exists !"  
+    echo "ERROR : Directory '$OUTPUT/${PACK_DIRECTORY}' already exists !"  
     exit
 fi
 
-echo "**ls  Creating new black box package '$PACK' in folder '$OUTPUT'"
+echo "** Creating new black box package '$PACK' in folder '$OUTPUT'"
 
 if [ ! -d $OUTPUT ] 
     then 
@@ -30,14 +39,27 @@ if [ ! -d $OUTPUT ]
     exit
 fi
 
-echo "-> Uncompressing package files"
-cd $OUTPUT
-tar zxvf ${INPUT}
-mv void ${PACK}/
-cd ${PACK}
-sed s,WITHOUT_NAME,${PACK}, CMakeLists.txt > CMakeLists2.txt
-sed s,WITHOUT_AUTHOR,"${AUTHOR}", CMakeLists2.txt > CMakeLists3.txt
-sed s,WITHOUT_DESCRIPTION,"${DESCRIPTION}", CMakeLists3.txt > CMakeLists.txt
-rm -f CMakeLists2.txt CMakeLists3.txt
-echo "Done !" 
-echo "Edit the file '$OUTPUT/${PACK}/CMakeLists.txt' to customize your package"
+cp -R ${INPUT} "$OUTPUT/$PACK_DIRECTORY"
+
+cd "$OUTPUT/$PACK_DIRECTORY"
+
+#JPR 6/4/2011 
+#sed s,WITHOUT_NAME,"${PACK}", < CMakeLists.txt  |  \
+#sed s,WITHOUT_AUTHOR,"${AUTHOR}", | \
+#sed s,WITHOUT_DESCRIPTION,"${DESCRIPTION}", > CMakeLists.txt
+
+# To avoid empty CMakeLists.txt (?!?)  JPR
+sed s,WITHOUT_NAME,"${PACK}", < CMakeLists.txt > tmp1CMakeLists.txt
+sed s,WITHOUT_AUTHOR,"${AUTHOR}", < tmp1CMakeLists.txt > tmp2CMakeLists.txt
+sed s,WITHOUT_DESCRIPTION,"${DESCRIPTION}", < tmp2CMakeLists.txt > CMakeLists.txt
+rm -f tmp1CMakeLists.txt tmp2CMakeLists.txt
+
+
+echo ""
+echo "Package created !"
+echo ""
+echo "==>"
+echo "==> Edit the file [$OUTPUT/${PACK_DIRECTORY}/CMakeLists.txt] to customize your package"
+echo "==>"
+echo ""
+echo ""