changeset 44:c76d8ce500cb

Update Readme, Fix in-place install, Fix source package generation
author Louis Opter <kalessin@kalessin.fr>
date Mon, 22 Mar 2010 16:50:28 +0100
parents f744b9c6aba2
children ac41a3160348
files CMakeLists.txt README
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Mon Mar 22 16:07:05 2010 +0100
+++ b/CMakeLists.txt	Mon Mar 22 16:50:28 2010 +0100
@@ -45,9 +45,11 @@
 # Install rules ################################################################
 
 INSTALL(DIRECTORY examples
-        DESTINATION share/doc/ziastreamit
+        DESTINATION share/doc/streamit
         COMPONENT Examples
         PATTERN "CMakeLists.txt" EXCLUDE
+        PATTERN "CMakeFiles" EXCLUDE
+        PATTERN "cmake_install.cmake" EXCLUDE
         REGEX ".*\\.sw.?$" EXCLUDE
        )
 
@@ -71,14 +73,15 @@
 
 # CPack stuff ##################################################################
 
-SET(PACKAGE_NAME "ziastreamit")
-SET(PACKAGE_FILE_NAME "${PACKAGE_NAME}-build-${STREAMIT_API_VERSION}")
-SET(PACKAGE_SOURCE_FILE_NAME "${PACKAGE_NAME}-${STREAMIT_API_VERSION}")
+SET(PACKAGE_NAME "StreamIt-${STREAMIT_API_VERSION}")
+SET(PACKAGE_FILE_NAME ${PACKAGE_NAME})
+SET(PACKAGE_SOURCE_FILE_NAME "Sources-${PACKAGE_NAME}")
 SET(CPACK_PACKAGE_EXECUTABLES "rot13" "rot13") # <executable> <icon name>
 SET(CPACK_PACKAGE_NAME ${PACKAGE_NAME})
 SET(CPACK_PACKAGE_FILE_NAME ${PACKAGE_NAME})
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${STREAMIT_API_SOURCE_DIR}/CMakeScripts/CPackDescription.txt")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_SOURCE_FILE_NAME})
+SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/" "/doc/" ".*\\\\.sw.?$" "\\\\.hgignore")
 SET(CPACK_COMPONENTS_ALL Examples Includes)
 SET(CPACK_RESOURCE_FILE_LICENSE "${STREAMIT_API_SOURCE_DIR}/CMakeScripts/CPackLicense.txt")
 SET(CPACK_RESOURCE_FILE_README "${CPACK_PACKAGE_DESCRIPTION_FILE}")
--- a/README	Mon Mar 22 16:07:05 2010 +0100
+++ b/README	Mon Mar 22 16:50:28 2010 +0100
@@ -27,10 +27,10 @@
 Install the api headers on your system:
 ---------------------------------------
 
-This is optional, but if you don't want to bother with include paths and
-environment variables this is for you.
+This is optional.
 
-Windows: Use the installer.
+Windows: Use the installer, then adjust your environ to add a variable which
+point to the include dir and use this variable in VS.
 
 If you are not on Windows do as in "Build examples" but after make do:
 
@@ -39,7 +39,7 @@
 Uninstall the api headers from your system:
 -------------------------------------------
 
-Windows: Use the control panel.
+Windows: Use the uninstaller.
 
 If you are not on Windows do as in "Build examples" but after make do: