diff --git a/new_project.sh b/new_project.sh index e450e1ed7c74250b6f7292d37e98dfd4e9ecc2b8..ceeb81a3538ca58503e3123ce084b0b800cd5f95 100755 --- a/new_project.sh +++ b/new_project.sh @@ -19,7 +19,7 @@ do n) NAME=$OPTARG ;; - d) + d) DEP=$OPTARG ;; s) @@ -55,6 +55,7 @@ fi if [ $NAME ] then + NAME=$(echo $NAME | tr '[:upper:]' '[:lower:]') echo "Using library name $NAME ..." else echo "No library name provided, aborting ..." @@ -196,22 +197,18 @@ then do echo "FIND_PACKAGE($x REQUIRED)" >> CMakeLists.tmp done - echo "\n" >> CMakeLists.tmp echo "# add the necessary include directories" >> CMakeLists.tmp echo "INCLUDE_DIRECTORIES(.)" >> CMakeLists.tmp for x in $arr do echo "INCLUDE_DIRECTORIES("'${'"${x}_INCLUDE_DIR"'}'")" >> CMakeLists.tmp done - echo "\n" >> CMakeLists.tmp echo "# application source files" >> CMakeLists.tmp echo "SET(sources ${NAME}.cpp)" >> CMakeLists.tmp echo "# application header files" >> CMakeLists.tmp echo "SET(headers ${NAME}.h)" >> CMakeLists.tmp - echo "\n" >> CMakeLists.tmp echo "# create the executable file" >> CMakeLists.tmp echo "ADD_EXECUTABLE(${NAME} "'${'"sources"'}'")" >> CMakeLists.tmp - echo "\n" >> CMakeLists.tmp echo "# link necessary libraries" >> CMakeLists.tmp for x in $arr do @@ -224,23 +221,19 @@ else echo "SET(sources ${NAME}.cpp)" >> CMakeLists.tmp echo "# application header files" >> CMakeLists.tmp echo "SET(headers ${NAME}.h)" >> CMakeLists.tmp - echo "\n" >> CMakeLists.tmp echo "# locate the necessary dependencies" >> CMakeLists.tmp for x in $arr do echo "FIND_PACKAGE($x REQUIRED)" >> CMakeLists.tmp done - echo "\n" >> CMakeLists.tmp echo "# add the necessary include directories" >> CMakeLists.tmp echo "INCLUDE_DIRECTORIES(.)" >> CMakeLists.tmp for x in $arr do echo "INCLUDE_DIRECTORIES("'${'"${x}_INCLUDE_DIR"'}'")" >> CMakeLists.tmp done - echo "\n" >> CMakeLists.tmp echo "# create the shared library" >> CMakeLists.tmp echo "ADD_LIBRARY(${NAME} SHARED "'${'"sources"'}'")" >> CMakeLists.tmp - echo "\n" >> CMakeLists.tmp echo "# link necessary libraries" >> CMakeLists.tmp for x in $arr do @@ -249,9 +242,9 @@ else echo "INSTALL(TARGETS $NAME" >> CMakeLists.tmp echo " RUNTIME DESTINATION bin" >> CMakeLists.tmp echo " LIBRARY DESTINATION lib/iridrivers" >> CMakeLists.tmp - echo " ARCHIVE DESTINATION lib/iridrivers)\n" >> CMakeLists.tmp - echo "INSTALL(FILES "'${'"headers"'}' "DESTINATION include/iridrivers)\n" >> CMakeLists.tmp - echo "INSTALL(FILES ../Find$NAME.cmake DESTINATION "'${'"CMAKE_ROOT"'}'"/Modules/)\n" >> CMakeLists.tmp + echo " ARCHIVE DESTINATION lib/iridrivers)" >> CMakeLists.tmp + echo "INSTALL(FILES "'${'"headers"'}' "DESTINATION include/iridrivers)" >> CMakeLists.tmp + echo "INSTALL(FILES ../Find$NAME.cmake DESTINATION "'${'"CMAKE_ROOT"'}'"/Modules/)" >> CMakeLists.tmp echo "ADD_SUBDIRECTORY(examples)" >> CMakeLists.tmp mv CMakeLists.tmp ./trunk/src/CMakeLists.txt @@ -270,7 +263,7 @@ else rm tmp.cmake LIBRARY_NAME=$(echo $NAME | tr '[:lower:]' '[:upper:]') - Library_name=$(echo $NAME | sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g') + Library_name=$(echo $NAME | sed 's/\([a-zA-Z]\)\([a-zA-Z0-9]*\)/\u\1\2/g') sed 's/Library_name/'$Library_name'/g' <driver_header_template.h >tmp.h sed 's/LIBRARY_NAME/'$LIBRARY_NAME'/g' <tmp.h >./trunk/src/$NAME.h rm tmp.h diff --git a/template.tar.gz b/template.tar.gz index 7263df04cbd4f5f11b47e2be1b6905f911da8db3..f1ad7d0bf7012d32d1c527a67767709b319c1c56 100755 Binary files a/template.tar.gz and b/template.tar.gz differ