more.

CMakeLists.txt

@@ -7,14 +7,6 @@ set(catkin_EXTRAS_DIR ${catkin_EXTRAS_DIR_VALUE} CACHE FILEPATH "catkin extras")
 
 include(${catkin_EXTRAS_DIR}/all.cmake)
 
-find_package(PythonInterp)
-execute_process(COMMAND ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/python_version.py
-  OUTPUT_VARIABLE PYTHON_VERSION_XDOTY
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY})
-
-
 install_cmake_infrastructure(catkin
   VERSION 0.0.7
   )

cmake/all.cmake

@@ -3,6 +3,7 @@ include(${catkin_EXTRAS_DIR}/assert.cmake)
 assert(catkin_EXTRAS_DIR)
 
 foreach(f
+    python
     empy
     stamp
     set_once

cmake/catkin-config.cmake.in

@@ -4,13 +4,12 @@
 set(catkin_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@)
 set(catkin_EXTRAS_DIR @CMAKE_INSTALL_PREFIX@/share/cmake/catkin)
 include(${catkin_EXTRAS_DIR}/all.cmake)
-
+set(CATKIN YES CACHE INTERNAL "YES")
 
 if (NOT catkin_FOUND)
   #set(CATKIN_PACKAGE_PREFIX "")
   #set(CATKIN_LINUX_DISTRIBUTIONS "lucid maverick natty oneiric")
   set(catkin_FOUND)
 
-  set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}:${CMAKE_BINARY_DIR}/cmake)
-
+  # set(CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/CMAKE_PREFIX_PATH:${CMAKE_PREFIX_PATH}")
 endif()

cmake/catkin_workspace.cmake

@@ -8,16 +8,17 @@ function(catkin_workspace)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-  em_expand(
-    ${catkin_EXTRAS_DIR}/topologically_traverse.py.in
-    ${CMAKE_CURRENT_BINARY_DIR}/topologically_traverse.py
-    ${catkin_EXTRAS_DIR}/topologically_traverse.cmake.em
-    ${CMAKE_CURRENT_BINARY_DIR}/topologically_traverse.cmake)
-
   foreach(shfile setup.sh setup.zsh setup.bash env.sh)
     configure_file(${catkin_EXTRAS_DIR}/${shfile}.in ${CMAKE_BINARY_DIR}/${shfile} 
       @ONLY)
   endforeach()
 
+  em_expand(
+    ${catkin_EXTRAS_DIR}/topologically_traverse.py.in
+    ${CMAKE_CURRENT_BINARY_DIR}/topologically_traverse.py
+    ${catkin_EXTRAS_DIR}/topologically_traverse.cmake.em
+    ${CMAKE_CURRENT_BINARY_DIR}/topologically_traverse.cmake
+    )
+
 endfunction()
 

cmake/enable_python.cmake

@@ -1,6 +1,12 @@
 function(enable_python pkg_name)
   set(PACKAGE_NAME ${pkg_name})
   configure_file(${catkin_EXTRAS_DIR}/__init__.py.in
-                 ${CMAKE_BINARY_DIR}/gen/py/${pkg_name}/__init__.py
-                 @ONLY)
+    ${CMAKE_BINARY_DIR}/gen/py/${pkg_name}/__init__.py
+    @ONLY)
+  if(EXISTS ${${pkg_name}_SOURCE_DIR}/setup.py)
+    assert(INSTALLED_PYTHONPATH)
+    set(CMD "/usr/bin/env PYTHONPATH=${INSTALLED_PYTHONPATH} ${PYTHON_EXECUTABLE} setup.py install --install-layout=deb --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${${pkg_name}_SOURCE_DIR}")
+    install(CODE "message(COMMAND = ${CMD})")
+    install(CODE "execute_process(COMMAND ${CMD})")
+  endif()
 endfunction()

cmake/install_cmake_infrastructure.cmake

@@ -27,7 +27,8 @@ function(install_cmake_infrastructure PACKAGE_NAME)
   set(PKG_MSG_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/msg)
   set(PKG_CMAKE_DIR ${CMAKE_BINARY_DIR}/cmake)
   set(PKG_CMAKE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-  set(PKG_BIN_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/scripts ${CMAKE_CURRENT_BINARY_DIR}/bin)
+  set(PKG_BIN_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/scripts 
+    ${CMAKE_CURRENT_BINARY_DIR}/bin)
   set(PKG_LOCATION "Source")
 
   foreach(extra ${PACKAGE_CFG_EXTRAS})
@@ -42,13 +43,22 @@ function(install_cmake_infrastructure PACKAGE_NAME)
   # Versions find_packageable from the buildspace
   #
   string(TOLOWER ${PACKAGE_NAME} package_lower)
+  set(_cfgdir ${CMAKE_BINARY_DIR}/CMAKE_PREFIX_PATH/share/cmake/${package_lower})
+  set(_cfgout ${_cfgdir}/${package_lower}-config.cmake)
+  log(2 "Writing config to ${_cfgout}")
+
+  # THIS IS IMPORTANT. CMAKE_PREFIX_PATH appears to be twitchy: just
+  # spent hours figuring out that having /opt/ros/fuerte first is
+  # necessary for this finding to work.  Very strange.  xxx_DIR
+  # circumvents this twitchiness.
+  set(${PACKAGE_NAME}_DIR ${_cfgdir} CACHE FILEPATH "${PACKAGE_NAME} cmake config file dir")
   configure_file(${catkin_EXTRAS_DIR}/pkg-config.cmake.in
-    ${CMAKE_BINARY_DIR}/cmake/${package_lower}-config.cmake
+    ${_cfgout}
     @ONLY
     )
 
   configure_file(${catkin_EXTRAS_DIR}/pkg-config-version.cmake.in
-    ${CMAKE_BINARY_DIR}/cmake/${package_lower}-config-version.cmake
+    ${_cfgdir}/${package_lower}-config-version.cmake
     @ONLY
     )
 

cmake/pkg-config.cmake.in

@@ -1,4 +1,5 @@
-if (NOT @PACKAGE_INCLUDE_DIRS@ STREQUAL "")
+log(2 "!!! ${CMAKE_CURRENT_LIST_FILE}")
+if (NOT "@PACKAGE_INCLUDE_DIRS@" STREQUAL "")
   set(@PACKAGE_NAME@_INCLUDE_DIRS @PKG_INCLUDE_PREFIX@/@PACKAGE_INCLUDE_DIRS@)
 endif()
 
@@ -31,5 +32,3 @@ foreach(extra @PACKAGE_CFG_EXTRAS@)
 endforeach()
 
 set(@PACKAGE_NAME@_MSG_INCLUDE_DIRS @PKG_MSG_DIRS@)
-
-set(@PACKAGE_NAME@_FOUND TRUE)

cmake/python.cmake

@@ -0,0 +1,10 @@
+find_package(PythonInterp)
+execute_process(COMMAND ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/python_version.py
+  OUTPUT_VARIABLE PYTHON_VERSION_XDOTY
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY})
+set(INSTALLED_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_XDOTY}/dist-packages
+  CACHE INTERNAL "This needs to be in pythonpath when setup.py install is called.  And it needs to match.  But setuptools won't tell us where it will install things.")
+
+

doc/source/index.rst

@@ -51,6 +51,9 @@ Design sketch
   poorest taste.  Exception: sphinx-generated Makefiles used to
   generate documentation.
 
+* ``stack.yaml`` contains everything necessary to to make debian
+  source packages.
+
 
 Build Parameters
 ----------------