X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbCreatePackage%2FbbCreatePackage.sh.in;h=b18fc91c4c3e4fd47d01debdb50d4ef3ca3dd355;hb=67837fa48c205487fbb9e5d6134d028c142867bc;hp=6a026459f592b7dc2bc58868cf00f02fd6b9f828;hpb=d095f5f0d8e8c9d0624670634c98ff31b455fb00;p=bbtk.git

diff --git a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
index 6a02645..b18fc91 100755
--- a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
+++ b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
@@ -17,15 +17,17 @@ 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 "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
 
@@ -37,13 +39,27 @@ if [ ! -d $OUTPUT ]
     exit
 fi
 
-cp -R ${INPUT} "$OUTPUT/$PACK"
-cd $OUTPUT/$PACK
+cp -R ${INPUT} "$OUTPUT/$PACK_DIRECTORY"
 
-${BINPATH}/bbSed CMakeLists.txt  WITHOUT_NAME "${PACK}" > CMakeLists2.txt
-${BINPATH}/bbSed CMakeLists2.txt  WITHOUT_AUTHOR "${AUTHOR}" > CMakeLists3.txt
-${BINPATH}/bbSed CMakeLists3.txt  WITHOUT_DESCRIPTION "${DESCRIPTION}" > CMakeLists.txt
+cd "$OUTPUT/$PACK_DIRECTORY"
 
-rm -f CMakeLists2.txt CMakeLists3.txt
-echo "Done !" 
-echo "Edit the file '$OUTPUT/${PACK}/CMakeLists.txt' to customize your package"
+#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 ""