Merge pull request #12 from Guillaumebeuzeboc/dev/package

Guillaumebeuzeboc · web-flow · commit 7abbc40c8750 · 2019-03-14T21:03:45.000+01:00
Dev/package
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1 @@
+src/haricot/cmake/TopLevelCMake.txt
diff --git a/README.md b/README.md
@@ -1,24 +1,28 @@
-# Cmake_multi_repo_template
+# Haricot
 Test of a mutli repo Cmake based template
 Packages can contains C++ and Python code
 Tested only on Linux with cmake 3.13.2 and 3.5.1
 
 ## Usage
 
-- `./configure`
+- `./haricot`
 - `cd build/src/mypkg; cpack`
 - `cd build; ninja install`
 ## Features
 
 Top level CMakeLists.txt architecture
-The CmakeLists.txt in packages (Subdirectories) are standards (except that they can use extra features)
+The CMakeLists.txt in packages (Subdirectories) are standards (except that they can use extra features)
 
 - Build all the packages (subdiretories)
 - Export pkg.cmake in order to includes them in another project/package
 - Assign a version number
 - Install targets/headers in the install directory at the root of the project
 - Generate .deb for each packages
 
+## Create a new workspace
+
+You can create a ws that would use haricot. To do that you would just have to create a symbolic link to the TopLevelCMake.txt the setup_local.zsh and to the haricot cmd (use the repo as an example).
+You can even combien workspace.
 
 ## Add a package (subdirectory)
 
diff --git a/haricot b/haricot
@@ -0,0 +1 @@
+src/haricot/haricot
diff --git a/setup.zsh b/setup.zsh
diff --git a/setup.zsh b/setup.zsh
@@ -0,0 +1 @@
+src/haricot/setup_local.zsh
diff --git a/setup_package.zsh b/setup_package.zsh
diff --git a/src/a_lib/CMakeLists.txt b/src/a_lib/CMakeLists.txt
@@ -7,7 +7,7 @@ INIT_PKG()
 SETUP_PYTHON_PKG()
 
 include_directories(include ${Boost_INCLUDE_DIR} )
-add_library(a_lib
+add_library(a_lib SHARED
     src/lib.cpp)
 
 target_include_directories(a_lib PUBLIC
diff --git a/src/a_lib/src/lib.cpp b/src/a_lib/src/lib.cpp
@@ -10,6 +10,7 @@ void liba_function()
       std::string s("2001-10-9"); //2001-October-09
       date d(from_simple_string(s));
       std::cout << to_simple_string(d) << std::endl;
+      std::cout << "this is a_lib" << std::endl;
     }
     catch(std::exception& e) {
       std::cout << "  Exception: " <<  e.what() << std::endl;
diff --git a/src/haricot/CMakeLists.txt b/src/haricot/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(haricot)
+
+INIT_PKG()
+
+SETUP_PKG(haricot)
+
+install(DIRECTORY cmake/ DESTINATION share/haricot/cmake COMPONENT HARICOT)
+install(FILES haricot setup_install.zsh setup_local.zsh DESTINATION share/haricot COMPONENT HARICOT)
+install(FILES setup.zsh DESTINATION . COMPONENT HARICOT)
+BUILDDEB()
diff --git a/src/haricot/cmake/ConfigVersion.cmake b/src/haricot/cmake/ConfigVersion.cmake
diff --git a/src/haricot/cmake/TopLevelCMake.txt b/src/haricot/cmake/TopLevelCMake.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.5)
+project(workspace)
+
+set(cmd "dirname -z $(realpath CMakeLists.txt)")
+execute_process(COMMAND bash -c ${cmd}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE ORIGIN)
+
+include(${ORIGIN}/customMacro.cmake)
+include(${ORIGIN}/python.cmake)
+set(ROOT_DIR "${CMAKE_SOURCE_DIR}")
+set(CMAKE_INSTALL_PREFIX "${ROOT_DIR}/install")
+file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+
+PREPARE_PYTHON()
+
+SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/src)
+SORT_SUBDIRS()
+FOREACH(subdir ${SUBDIRS})
+  message("== Configuration of ${subdir} started")
+  ADD_SUBDIRECTORY(src/${subdir})
+  message("== Configuration of ${subdir} finished!")
+ENDFOREACH()
+
diff --git a/src/haricot/cmake/__init__.py.in b/src/haricot/cmake/__init__.py.in
diff --git a/src/haricot/cmake/customMacro.cmake b/src/haricot/cmake/customMacro.cmake
@@ -53,7 +53,8 @@ macro(BUILDDEB)
     if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
     include(InstallRequiredSystemLibraries)
     set(CPACK_SET_DESTDIR true)
-    set(CPACK_INSTALL_PREFIX "/opt/guillaume")
+    set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+    set(CPACK_INSTALL_PREFIX "/opt/haricot-pkgs")
     set(CPACK_GENERATOR "DEB")
     set(CPACK_PACKAGE_DESCRIPTION "${DESCRIPTION}")
     set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${SUMMARY}")
@@ -71,7 +72,7 @@ macro(BUILDDEB)
     set(CPACK_OUTPUT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CPackConfig.cmake" )
 
     set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-    set(CPACK_DEBIAN_PACKAGE_SECTION "beuz")
+    set(CPACK_DEBIAN_PACKAGE_SECTION "haricot-pkgs")
     set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
     set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
     include(CPack)
@@ -109,14 +110,14 @@ macro(SETUP_PKG PKG_NAME)
     set(${PKG_NAME}_VERSION "${PKG_VERSION}" PARENT_SCOPE)
 
     set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
-    configure_file(${ORIGIN}/cmake/pkg-config.cmake
+    configure_file(${ORIGIN}/pkg-config.cmake
         "${PROJECT_BINARY_DIR}/${PKG_NAME}Config.cmake" @ONLY)
 
     set(CONF_INCLUDE_DIRS "${MAKE_INSTALL_PREFIX}/${PROJECT_NAME}")
-    configure_file(${ORIGIN}/cmake/pkg-config.cmake
+    configure_file(${ORIGIN}/pkg-config.cmake
         "${PROJECT_BINARY_DIR}/${PKG_NAME}Config.cmake" @ONLY)
 
-    configure_file(${ORIGIN}/cmake/ConfigVersion.cmake
+    configure_file(${ORIGIN}/ConfigVersion.cmake
         "${PROJECT_BINARY_DIR}/${PKG_NAME}ConfigVersion.cmake" @ONLY)
 
     install(FILES
diff --git a/src/haricot/cmake/pkg-config.cmake b/src/haricot/cmake/pkg-config.cmake
diff --git a/src/haricot/cmake/python.cmake b/src/haricot/cmake/python.cmake
@@ -12,7 +12,7 @@ macro(SETUP_PYTHON_PKG)
      file(MAKE_DIRECTORY ${CMAKE_PYTHON_BUILD}/${PROJECT_NAME})
      set(INIT_PKG_BUILD ${CMAKE_PYTHON_BUILD}/${PROJECT_NAME}/__init__.py)
      set(PYTHON_SOURCE_PATH "${PROJECT_SOURCE_DIR}/src")
-     configure_file(${ORIGIN}/cmake/__init__.py.in ${INIT_PKG_BUILD})
+     configure_file(${ORIGIN}/__init__.py.in ${INIT_PKG_BUILD})
 
      set(PATH_TO_${PROJECT_NAME}_PY_FILES "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}")
      install(DIRECTORY ${PATH_TO_${PROJECT_NAME}_PY_FILES} DESTINATION lib/python3/dist-packages COMPONENT ${${PROJECT_NAME}_UPPER})
diff --git a/src/haricot/debian.cmake b/src/haricot/debian.cmake
@@ -0,0 +1,7 @@
+set(MAJOR_VERSION "0")
+set(MINOR_VERSION "0")
+set(PATCH_VERSION "1")
+set(DESCRIPTION "haricot")
+set(SUMMARY "haricot deb pkg")
+set(VENDOR "beuzeboc")
+set(MAINTAINER "guillaume.beuzeboc@gmail.com")
diff --git a/src/haricot/haricot b/src/haricot/haricot
diff --git a/src/haricot/setup.zsh b/src/haricot/setup.zsh
@@ -0,0 +1,3 @@
+CMAKE_PREFIX_PATH=/opt/haricot-pkgs:${CMAKE_PREFIX_PATH}
+PYTHONPATH=/opt/haricot-pkgs/lib/python3/dist-packages:${PYTHONPATH}
+
diff --git a/src/haricot/setup_install.zsh b/src/haricot/setup_install.zsh
@@ -1,3 +1,3 @@
 MY_SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 CMAKE_PREFIX_PATH=${MY_SCRIPTPATH}/install:${CMAKE_PREFIX_PATH}
-PYTHONPATH=/home/beuzeboc/code/tmp/cmake_multi_repo_template/install/lib/python3/dist-packages:${PYTHONPATH}
+PYTHONPATH=${MY_SCRIPTPATH}/install/lib/python3/dist-packages:${PYTHONPATH}
diff --git a/src/haricot/setup_local.zsh b/src/haricot/setup_local.zsh
@@ -0,0 +1,3 @@
+MY_SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+CMAKE_PREFIX_PATH=${MY_SCRIPTPATH}/build/src:${CMAKE_PREFIX_PATH}
+PYTHONPATH=${MY_SCRIPTPATH}/build/python/lib/python3.5/site-packages:${PYTHONPATH}
diff --git a/src/z_lib/src/lib.cpp b/src/z_lib/src/lib.cpp
@@ -11,6 +11,7 @@ void libz_function()
       std::string s("2001-10-9"); //2001-October-09
       date d(from_simple_string(s));
       std::cout << to_simple_string(d) << std::endl;
+      std::cout << "this is z_lib" << std::endl;
     }
     catch(std::exception& e) {
       std::cout << "  Exception: " <<  e.what() << std::endl;

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ void liba_function()`
`10`	`10`	`std::string s("2001-10-9"); //2001-October-09`
`11`	`11`	`date d(from_simple_string(s));`
`12`	`12`	`std::cout << to_simple_string(d) << std::endl;`
	`13`	`+ std::cout << "this is a_lib" << std::endl;`
`13`	`14`	`}`
`14`	`15`	`catch(std::exception& e) {`
`15`	`16`	`std::cout << " Exception: " << e.what() << std::endl;`