From 42ece7602ea66377ef2727ab45286c5cb7e9ed52 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Sun, 24 Jun 2012 12:14:55 +0200 Subject: [PATCH] Rename library from libftdi to libftdi1 --- .gitignore | 2 +- CMakeLists.txt | 14 +++++++------- LICENSE | 4 ++-- bindings/CMakeLists.txt | 2 +- bindings/ftdi.i | 2 +- examples/CMakeLists.txt | 22 +++++++++++----------- ftdi_eeprom/CMakeLists.txt | 2 +- ftdipp/CMakeLists.txt | 30 +++++++++++++++--------------- libftdi1-config.in | 2 +- libftdi1.spec.in | 10 +++++----- src/CMakeLists.txt | 22 +++++++++++----------- test/CMakeLists.txt | 8 ++++---- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index 7a4ec72..2559aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,7 @@ examples/simple # libftdi specific libftdi1-config -libftdi.spec +libftdi1.spec # CMake CMakeCache.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 562686d..14911ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ # Project -project(libftdi) +project(libftdi1) set(MAJOR_VERSION 1) set(MINOR_VERSION 0) -set(PACKAGE libftdi) +set(PACKAGE libftdi1) set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) set(VERSION ${VERSION_STRING}) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") @@ -37,7 +37,7 @@ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") set(CPACK_COMPONENT_SHAREDLIBS_DESCRIPTION "Shared library for general use.") set(CPACK_COMPONENT_STATICLIBS_DESCRIPTION -"Static library, good if you want to embed libftdi in your application.") +"Static library, good if you want to embed libftdi1 in your application.") set(CPACK_COMPONENT_HEADERS_DESCRIPTION "C/C++ header files.") @@ -65,7 +65,7 @@ endif(NOT APPLE) # Package information set(CPACK_PACKAGE_VERSION ${VERSION_STRING}) set(CPACK_PACKAGE_CONTACT "Intra2net AG ") -set(CPACK_PACKAGE_DESCRIPTION "libftdi library.") +set(CPACK_PACKAGE_DESCRIPTION "libftdi1 library.") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION} ) # Package settings @@ -81,9 +81,9 @@ if(${WIN32}) set(CPACK_CMAKE_GENERATOR "MinGW Makefiles") set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_VENDOR "") - set(CPACK_PACKAGE_INSTALL_DIRECTORY "libftdi") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "libftdi1") set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") - set(CPACK_NSIS_DISPLAY_NAME "libftdi") + set(CPACK_NSIS_DISPLAY_NAME "libftdi1") set(CPACK_NSIS_MODIFY_PATH "ON") endif(${WIN32}) @@ -138,7 +138,7 @@ if(DOCUMENTATION AND DOXYGEN_FOUND) OUTPUT ${CMAKE_BINARY_DIR}/doc COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc/{html,man} COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc - DEPENDS ftdi ftdipp + DEPENDS ftdi1 ftdipp1 ) # Run doxygen diff --git a/LICENSE b/LICENSE index dd66312..f1831c0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -The C library "libftdi" is distributed under the +The C library "libftdi1" is distributed under the GNU Library General Public License version 2. A copy of the GNU Library General Public License (LGPL) is included @@ -6,7 +6,7 @@ in this distribution, in the file COPYING.LIB. ---------------------------------------------------------------------- -The C++ wrapper "ftdipp" is distributed under the GNU General +The C++ wrapper "ftdipp1" is distributed under the GNU General Public License version 2 (with a special exception described below). A copy of the GNU General Public License (GPL) is included diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index b17d8a8..3f25225 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -11,7 +11,7 @@ if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND) LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src) SWIG_ADD_MODULE(ftdi python ftdi.i) - SWIG_LINK_LIBRARIES(ftdi ftdi ${PYTHON_LIBRARIES}) + SWIG_LINK_LIBRARIES(ftdi ftdi1 ${PYTHON_LIBRARIES}) execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print '%d.%d' % ( sys.version_info[0], sys.version_info[1] )" OUTPUT_VARIABLE PYTHON_VERSION diff --git a/bindings/ftdi.i b/bindings/ftdi.i index 42c2646..faf2022 100644 --- a/bindings/ftdi.i +++ b/bindings/ftdi.i @@ -1,6 +1,6 @@ /* File: ftdi.i */ -%module(docstring="Python interface to libftdi") ftdi +%module(docstring="Python interface to libftdi1") ftdi %include %include diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 11e5aab..6793d89 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -21,16 +21,16 @@ if (EXAMPLES) add_executable(eeprom eeprom.c) # Linkage - target_link_libraries(simple ftdi) - target_link_libraries(bitbang ftdi) - target_link_libraries(bitbang2 ftdi) - target_link_libraries(bitbang_cbus ftdi) - target_link_libraries(bitbang_ft2232 ftdi) - target_link_libraries(find_all ftdi) - target_link_libraries(serial_test ftdi) - target_link_libraries(baud_test ftdi) - target_link_libraries(stream_test ftdi) - target_link_libraries(eeprom ftdi) + target_link_libraries(simple ftdi1) + target_link_libraries(bitbang ftdi1) + target_link_libraries(bitbang2 ftdi1) + target_link_libraries(bitbang_cbus ftdi1) + target_link_libraries(bitbang_ft2232 ftdi1) + target_link_libraries(find_all ftdi1) + target_link_libraries(serial_test ftdi1) + target_link_libraries(baud_test ftdi1) + target_link_libraries(stream_test ftdi1) + target_link_libraries(eeprom ftdi1) # libftdi++ examples if(FTDI_BUILD_CPP) @@ -43,7 +43,7 @@ if (EXAMPLES) add_executable(find_all_pp find_all_pp.cpp) # Linkage - target_link_libraries(find_all_pp ftdipp) + target_link_libraries(find_all_pp ftdipp1) endif(Boost_FOUND) endif(FTDI_BUILD_CPP) diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt index 38d7a96..f2552ee 100644 --- a/ftdi_eeprom/CMakeLists.txt +++ b/ftdi_eeprom/CMakeLists.txt @@ -27,7 +27,7 @@ if (FTDI_EEPROM) ) add_executable(ftdi_eeprom main.c) - target_link_libraries(ftdi_eeprom ftdi) + target_link_libraries(ftdi_eeprom ftdi1) target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES}) else(Confuse_FOUND) diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt index 23000c9..48e5a76 100644 --- a/ftdipp/CMakeLists.txt +++ b/ftdipp/CMakeLists.txt @@ -1,7 +1,7 @@ # Check set(FTDI_BUILD_CPP False PARENT_SCOPE) -option(FTDIPP "Build C++ binding library libftdi++" ON) +option(FTDIPP "Build C++ binding library libftdi1++" ON) if (FTDIPP) @@ -19,32 +19,32 @@ if (FTDIPP) set(cpp_headers ftdi.hpp) set(FTDI_BUILD_CPP True PARENT_SCOPE) - message(STATUS "Building libftdi++") + message(STATUS "Building libftdi1++") # Shared library - add_library(ftdipp SHARED ${cpp_sources}) + add_library(ftdipp1 SHARED ${cpp_sources}) math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases - set_target_properties(ftdipp PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) + set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) # Static library - add_library(ftdipp-static STATIC ${cpp_sources}) - set_target_properties(ftdipp-static PROPERTIES OUTPUT_NAME "ftdipp") + add_library(ftdipp1-static STATIC ${cpp_sources}) + set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") # Prevent clobbering each other during the build - set_target_properties(ftdipp PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(ftdipp-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) # Dependencies - target_link_libraries(ftdipp ftdi ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES}) + target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES}) # Install if(${UNIX}) - install( TARGETS ftdipp + install( TARGETS ftdipp1 LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT sharedlibs ) - install( TARGETS ftdipp-static + install( TARGETS ftdipp1-static ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT staticlibs ) @@ -55,11 +55,11 @@ if (FTDIPP) endif(${UNIX}) if(${WIN32}) - install( TARGETS ftdipp + install( TARGETS ftdipp1 DESTINATION bin COMPONENT sharedlibs ) - install( TARGETS ftdipp-static + install( TARGETS ftdipp1-static DESTINATION bin COMPONENT staticlibs ) @@ -70,11 +70,11 @@ if (FTDIPP) endif(${WIN32}) else(Boost_FOUND) - message(STATUS "Boost not found, won't build libftdi++") + message(STATUS "Boost not found, won't build libftdi1++") endif(Boost_FOUND) else(FTDIPP) - message(STATUS "Not building libftdi++") + message(STATUS "Not building libftdi1++") endif(FTDIPP) diff --git a/libftdi1-config.in b/libftdi1-config.in index 03a0291..a3e2058 100644 --- a/libftdi1-config.in +++ b/libftdi1-config.in @@ -75,5 +75,5 @@ if test "$echo_cflags" = "yes"; then echo $includes fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lftdi @LIBS@ + echo -L@libdir@ -lftdi1 @LIBS@ fi diff --git a/libftdi1.spec.in b/libftdi1.spec.in index 05fb975..c78105b 100644 --- a/libftdi1.spec.in +++ b/libftdi1.spec.in @@ -13,15 +13,15 @@ Prefix: /usr URL: http://www.intra2net.com/en/developer/libftdi %package devel -Summary: Header files and static libraries for libftdi +Summary: Header files and static libraries for libftdi1 Group: Development/Libraries -Requires: libftdi = %{version}, libusb-devel +Requires: libftdi1 = %{version}, libusb1-devel %description Library to program and control the FTDI USB controller %description devel -Header files and static libraries for libftdi +Header files and static libraries for libftdi1 %prep %setup -q @@ -55,7 +55,7 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING.LIB COPYING.GPL LICENSE -%{_libdir}/libftdi*.so* +%{_libdir}/libftdi1*.so* %files devel %defattr(-,root,root) @@ -63,5 +63,5 @@ rm -fr $RPM_BUILD_ROOT %{_bindir}/libftdi1-config %{prefix}/include/*.h %{prefix}/include/*.hpp -%{_libdir}/libftdi*.*a +%{_libdir}/libftdi1*.*a %{_libdir}/pkgconfig/*.pc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7ce9eda..0b8c009 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,31 +21,31 @@ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h set(c_sources ftdi.c ftdi_stream.c) set(c_headers ftdi.h) -add_library(ftdi SHARED ${c_sources}) +add_library(ftdi1 SHARED ${c_sources}) math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases -set_target_properties(ftdi PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) +set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) # Static library -add_library(ftdi-static STATIC ${c_sources}) -set_target_properties(ftdi-static PROPERTIES OUTPUT_NAME "ftdi") +add_library(ftdi1-static STATIC ${c_sources}) +set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") # Prevent clobbering each other during the build -set_target_properties(ftdi PROPERTIES CLEAN_DIRECT_OUTPUT 1) -set_target_properties(ftdi-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(ftdi1 PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) # Dependencies -target_link_libraries(ftdi ${LIBUSB_LIBRARIES}) +target_link_libraries(ftdi1 ${LIBUSB_LIBRARIES}) # Install if(${UNIX}) - install( TARGETS ftdi + install( TARGETS ftdi1 LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT sharedlibs ) - install( TARGETS ftdi-static + install( TARGETS ftdi1-static ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT staticlibs ) @@ -59,12 +59,12 @@ endif(${UNIX}) if(${WIN32}) - install( TARGETS ftdi + install( TARGETS ftdi1 DESTINATION bin COMPONENT sharedlibs ) - install( TARGETS ftdi-static + install( TARGETS ftdi1-static DESTINATION bin COMPONENT staticlibs ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8737f66..53e3f7b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -15,13 +15,13 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND) baudrate.cpp ) - add_executable(test_libftdi ${cpp_tests}) - target_link_libraries(test_libftdi ftdi ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) + add_executable(test_libftdi1 ${cpp_tests}) + target_link_libraries(test_libftdi1 ftdi1 ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) - add_test(test_libftdi test_libftdi) + add_test(test_libftdi1 test_libftdi1) # Add custom target so we run easily run "make check" - add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS test_libftdi) + add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS test_libftdi1) else(Boost_UNIT_TEST_FRAMEWORK_FOUND) -- 1.7.1