Author: kornel
Date: Mon May 23 10:44:32 2011
New Revision: 38823
URL: http://www.lyx.org/trac/changeset/38823
Log:
Creat source package with 'make package_source' from inside the build directory
Modified:
lyx-devel/trunk/development/cmake/LyxPackaging.cmake
lyx-devel/trunk/development/cmake/TODO.txt
lyx-devel/trunk/development/lyx.package.README
Modified: lyx-devel/trunk/development/cmake/LyxPackaging.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/LyxPackaging.cmake Mon May 23
06:41:19 2011 (r38822)
+++ lyx-devel/trunk/development/cmake/LyxPackaging.cmake Mon May 23
10:44:32 2011 (r38823)
@@ -67,7 +67,36 @@
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)
Modified: lyx-devel/trunk/development/cmake/TODO.txt
==============================================================================
--- lyx-devel/trunk/development/cmake/TODO.txt Mon May 23 06:41:19 2011
(r38822)
+++ lyx-devel/trunk/development/cmake/TODO.txt Mon May 23 10:44:32 2011
(r38823)
@@ -11,6 +11,7 @@
(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 @@
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)
Modified: lyx-devel/trunk/development/lyx.package.README
==============================================================================
--- lyx-devel/trunk/development/lyx.package.README Mon May 23 06:41:19
2011 (r38822)
+++ lyx-devel/trunk/development/lyx.package.README Mon May 23 10:44:32
2011 (r38823)
@@ -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 @@
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