From 5d2aea9d9e9c693dbf1d91cd6af00b1ad86cb65d Mon Sep 17 00:00:00 2001 From: Christian Kern Date: Mon, 6 Oct 2014 10:56:08 +0200 Subject: [PATCH] - Check for Doxyfile.in. If not present, do not add doxygen target (fixes internal issue #221) - Omit doxygen "Makefiles" from tarball (internal issue #221) - Add executable flag to shell scripts (fixes internal issue #224) --- CMakeLists.txt | 7 +++++-- scripts/create_tarball.sh | 4 ++++ scripts/insert_license.sh | 0 scripts/remove_license.sh | 0 scripts/run_cpplint.sh | 0 scripts/run_tests_cygwin.sh | 0 scripts/run_tests_linux.sh | 0 7 files changed, 9 insertions(+), 2 deletions(-) mode change 100644 => 100755 scripts/create_tarball.sh mode change 100644 => 100755 scripts/insert_license.sh mode change 100644 => 100755 scripts/remove_license.sh mode change 100644 => 100755 scripts/run_cpplint.sh mode change 100644 => 100755 scripts/run_tests_cygwin.sh mode change 100644 => 100755 scripts/run_tests_linux.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index e68d998..aec5757 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,8 +135,11 @@ SetInstallPaths() ## DOXYGEN # -include(CMakeCommon/CreateDoxygenDocumentationTarget.cmake) -CreateDoxygenDocumentationTarget() +if(EXISTS "${EMBB_SOURCE_DIR}/doc/reference/Doxyfile.in") + include(CMakeCommon/CreateDoxygenDocumentationTarget.cmake) + CreateDoxygenDocumentationTarget() +endif() + if (INSTALL_DOCS STREQUAL ON) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/ diff --git a/scripts/create_tarball.sh b/scripts/create_tarball.sh old mode 100644 new mode 100755 index ceef8e5..33e11e4 --- a/scripts/create_tarball.sh +++ b/scripts/create_tarball.sh @@ -140,6 +140,10 @@ rsync \ --exclude "doc/tutorial/content" \ --exclude "doc/tutorial/*.tex" \ --exclude "doc/tutorial/*.bib" \ + --exclude "doc/reference/*.xml" \ + --exclude "doc/reference/*.dox" \ + --exclude "doc/reference/*.in" \ + --exclude "doc/reference/*.css" \ --exclude "doc/examples/insert_snippets.py" \ --archive --recursive ${d} $MYTMPDIR/${n} diff --git a/scripts/insert_license.sh b/scripts/insert_license.sh old mode 100644 new mode 100755 diff --git a/scripts/remove_license.sh b/scripts/remove_license.sh old mode 100644 new mode 100755 diff --git a/scripts/run_cpplint.sh b/scripts/run_cpplint.sh old mode 100644 new mode 100755 diff --git a/scripts/run_tests_cygwin.sh b/scripts/run_tests_cygwin.sh old mode 100644 new mode 100755 diff --git a/scripts/run_tests_linux.sh b/scripts/run_tests_linux.sh old mode 100644 new mode 100755 -- libgit2 0.26.0