X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbCreatePackage%2FbbCreatePackage.sh.in;h=c584e38dc15051497ce9cecad3b7e7c004627c81;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;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..c584e38 100755
--- a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
+++ b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la SantÈ)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #!/bin/bash
 # creates the file architecture for a new user package
 
@@ -8,21 +33,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
 
-if [ -d $OUTPUT/${PACK} ] 
+#echo "output= " $OUTPUT
+#echo "bin   = " $BINPATH
+#echo "input = " $INPUT
+#echo "pack  = " $PACK
+#echo "pack_directory  = " $PACK_DIRECTORY
+
+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 +64,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 ""