From 4ed0b6cd5387b61d0e8f1a6b631d71e983205098 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Mon, 23 May 2011 08:44:32 +0000 Subject: [PATCH] Creat source package with 'make package_source' from inside the build directory git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38823 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/LyxPackaging.cmake | 31 +++++++++++++++++++++++++++- development/cmake/TODO.txt | 6 ++++-- development/lyx.package.README | 6 +++--- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake index 50de73bdf2..849d8b8b44 100644 --- a/development/cmake/LyxPackaging.cmake +++ b/development/cmake/LyxPackaging.cmake @@ -67,7 +67,36 @@ set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${TOP_SRC_DIR};/") # http://www.mail-arc set(CPACK_STRIP_FILES 1) - +# Finaly give some hints about files not to be included in souse package +SET(CPACK_SOURCE_IGNORE_FILES +"/CVS/" +"/\\\\.svn/" +"/\\\\.bzr/" +"/\\\\.hg/" +"/\\\\.git/" +"\\\\.swp$" +"~$" +"\\\\.history$" +"\\\\.#" +"/#" +"/_CPack_Packages/" +"/CMakeCache.txt$" +"CPackSourceConfig\\\\.cmake" +"\\\\.tar\\\\.gz$" +"\\\\.tar\\\\.bz2$" +"\\\\.tar\\\\.Z$" +"\\\\.deb$" +"\\\\.rpm$" +"\\\\.rej$" +"\\\\.orig$" +"/CMakeFiles/" +"Makefile\\\\.in" +"/Makefile$" +"/autom4te\\\\.cache/" +"/\\\\.deps/" +"/build/" +"/lyx-2\\\\." +) if(LYX_CPACK) include(CPack) diff --git a/development/cmake/TODO.txt b/development/cmake/TODO.txt index 4a1f84e0bb..0797a13c12 100644 --- a/development/cmake/TODO.txt +++ b/development/cmake/TODO.txt @@ -11,6 +11,7 @@ Help: (before I actually run it). cmake --help is not useful. * how can I see what the command line was. With autoconf I'd just do "make V=1", what shall I do with cmake? + ANSWER: "make VERBOSE=1" Bug fixing @@ -38,8 +39,9 @@ Features with support for universal binaries (don't know if it currently is a problem to build them) * from the maintainer point of view these task are needed: - DONE: *.po remerge of strings in po/ (ie "make update-po") - - tarball creation, most notably i dont see any list of files which should go into tarball, we dont want everything to go there - (ie "make distcheck" to check tree is prepared for release, "make dist" for actual release) + - DONE: tarball creation, most notably i dont see any list of files which should go into tarball, we dont want everything to go there + (ie "make distcheck" to check tree is prepared for release, "make dist" for actual release) + ANSWER: "make package_source" these are nice to have and present in autotools, though not critical - DONE: target for regenaration of lfuns manual would be nice (ie make lfundoc) - DONE: target for doxygen generation (ie make doxydoc) diff --git a/development/lyx.package.README b/development/lyx.package.README index 4d12f39af7..88b0a7f52e 100755 --- a/development/lyx.package.README +++ b/development/lyx.package.README @@ -1,8 +1,8 @@ Here is what to do to make binary packages using CMake. -The string "_SRC_DIR_" represents the cmake-lyx-build-directory, e.g. /usr/src/lyx/lyx-devel/development/cmake. +The string "_SRC_DIR_" represents the cmake-lyx-build-directory, e.g. /usr/src/lyx/lyx-devel. The string "_BUILD_DIR_" represents the cmake-lyx-build-directory, e.g. /usr/BUILD/BuildLyx. -The string "_PKG_NAME_" represents the name of the package, like "lyx-2.0.1-Linux" on my Linux-system +The string "_PKG_NAME_" represents the name of the package, like "lyx-2.1.38687-Linux" on my Linux-system Using cmake-gui: cd _BUILD_DIR_; cmake-gui _SRC_DIR_ @@ -30,7 +30,7 @@ Some installation proceedings: STGZ: sudo _PKG_NAME_.sh --exclude-subdir TGZ: sudo tar -zxv --strip-components 1 --directory / -f _PKG_NAME_.tar.gz DEB: sudo dpkg -i _PKG_NAME_.deb - RPM: sudo rpm -U _PKG_NAME_.rpm + RPM: sudo rpm -U --force _PKG_NAME_.rpm See also: http://www.cmake.org/Wiki/CMake:CPackPackageGenerators -- 2.39.2