From 506799cac4eda35b2a0ee2c90d3159d337664890 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Wed, 5 Jan 2011 01:10:26 +0100 Subject: [PATCH 1/3] CMake - finalized install target --- CMakeLists.txt | 7 +++++++ doc/CMakeLists.txt | 7 ------- i18n/CMakeLists.txt | 4 ++++ scripts/CMakeLists.txt | 2 ++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f02ed972..3977774c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,4 +57,11 @@ configure_file ( add_subdirectory (src) add_subdirectory (doc) +add_subdirectory (i18n) +add_subdirectory (scripts) add_subdirectory (test EXCLUDE_FROM_ALL) + +set (doc_FILES NEWS ChangeLog README README.build INSTALL AUTHORS COPYING) +foreach (doc_FILE ${doc_FILES}) + install (FILES ${doc_FILE} DESTINATION share/doc/task) +endforeach (doc_FILE) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f00589c9c..b529ddf96 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,10 +1,3 @@ -#set (man5_FILES taskrc.5 task-color.5 task-faq.5 task-sync.5 task-tutorial.5) -#set (man5_DIR share/man/man5) - -#foreach (man_FILE ${man5_FILES}) -# install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/${man_FILE} DESTINATION ${man5_DIR}) -#endforeach (man_FILE) - install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION share/man/man1 FILES_MATCHING PATTERN "*.1") install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION share/man/man5 diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt index e69de29bb..8507f7b8e 100644 --- a/i18n/CMakeLists.txt +++ b/i18n/CMakeLists.txt @@ -0,0 +1,4 @@ +install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/task/i18n + FILES_MATCHING REGEX "strings.*" + REGEX "tips.*" + PATTERN "CMakeFiles" EXCLUDE) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index e69de29bb..33e520b07 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -0,0 +1,2 @@ +install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/task/scripts + FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE) From 7f0c3bf94b6e0e218374be257dbcc8a32dbc7dbd Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Wed, 5 Jan 2011 01:26:32 +0100 Subject: [PATCH 2/3] Prepared gitignore for upcoming CPack --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 14adc48e8..bd5fbcd07 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ CMakeCache.txt CMakeFiles cmake_install.cmake install_manifest.txt +_CPack_Packages +CPackConfig.cmake +CPackSourceConfig.cmake From 75a326692924acb235f1c20339b9bad6743a9fa3 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Wed, 5 Jan 2011 09:58:07 +0100 Subject: [PATCH 3/3] Merged README.build to INSTALL --- CMakeLists.txt | 2 +- INSTALL | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README.build | 48 ------------------------------------------------ 3 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 README.build diff --git a/CMakeLists.txt b/CMakeLists.txt index 3977774c5..0eb2903a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ add_subdirectory (i18n) add_subdirectory (scripts) add_subdirectory (test EXCLUDE_FROM_ALL) -set (doc_FILES NEWS ChangeLog README README.build INSTALL AUTHORS COPYING) +set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING) foreach (doc_FILE ${doc_FILES}) install (FILES ${doc_FILE} DESTINATION share/doc/task) endforeach (doc_FILE) diff --git a/INSTALL b/INSTALL index 5e3e2feef..c4dcd7e00 100644 --- a/INSTALL +++ b/INSTALL @@ -65,3 +65,50 @@ step 7 above, they must first be regenerated by following steps [1], [2] and --- +Taskwarrior Build Notes +---------------- + +Taskwarrior 1.9 has dependencies that are detected by the configure program in +almost all cases, but there are situations and operating systems that mean you +will need to offer configure a little help. + +If taskwarrior will not build on your system, first take a look at the Operating +System notes below. If this doesn't help, then go to the Troubleshooting +section, which includes instructions on how to contact us for help. + + + +Operating System Notes +---------------------- + +Haiku Alpha/R1 + Taskwarrior must be built with gcc version 4.x, so make sure you run: + + $ setgcc gcc4 + + To switch from gcc 2.95 to gcc 4.x. + + + +Troubleshooting +--------------- + +In most cases, it is sufficient to run the configure program like this: + + $ ./configure + +Configure will run and locate all the necessary pieces for the build, and create +a Makefile. There may be errors and warnings when running configure, or there +may be compiler errors and warnings when running 'make'. Sometimes you will run +configure with no reported problems, and the build will fail later. This is +almost always because configure is mistaken about some assumption. + +If a build does not succeed, please send the contents of the 'config.log' file +to support@taskwarrior.org, or post a message in the support forums at +taskwarrior.org along with the information. + +If configure runs, but taskwarrior does not build, when ideally you would send +both the contents of config.log, and a transcript from the build, which is not +written to a file and must be captured from the terminal. + +--- diff --git a/README.build b/README.build deleted file mode 100644 index 7b3179719..000000000 --- a/README.build +++ /dev/null @@ -1,48 +0,0 @@ - -Taskwarrior Build Notes ----------------- - -Taskwarrior 1.9 has dependencies that are detected by the configure program in -almost all cases, but there are situations and operating systems that mean you -will need to offer configure a little help. - -If taskwarrior will not build on your system, first take a look at the Operating -System notes below. If this doesn't help, then go to the Troubleshooting -section, which includes instructions on how to contact us for help. - - - -Operating System Notes ----------------------- - -Haiku Alpha/R1 - Taskwarrior must be built with gcc version 4.x, so make sure you run: - - $ setgcc gcc4 - - To switch from gcc 2.95 to gcc 4.x. - - - -Troubleshooting ---------------- - -In most cases, it is sufficient to run the configure program like this: - - $ ./configure - -Configure will run and locate all the necessary pieces for the build, and create -a Makefile. There may be errors and warnings when running configure, or there -may be compiler errors and warnings when running 'make'. Sometimes you will run -configure with no reported problems, and the build will fail later. This is -almost always because configure is mistaken about some assumption. - -If a build does not succeed, please send the contents of the 'config.log' file -to support@taskwarrior.org, or post a message in the support forums at -taskwarrior.org along with the information. - -If configure runs, but taskwarrior does not build, when ideally you would send -both the contents of config.log, and a transcript from the build, which is not -written to a file and must be captured from the terminal. - ----