anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.) Run in place feature: If everything fails, try with source path

Browse Source 
2.) Read the PATCH_VERSION from configure.ac too
3.) Ident-text in script


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38804 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2011-05-21 13:48:45 +00:00
parent 883c7d7be9
commit 9190519e98
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -210,10 +210,10 @@ foreach(_c_l ${_config_lines} )
setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) setstripped(PACKAGE_BASE ${CMAKE_MATCH_1})
setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2})
setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3})
if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\).*$") if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$")
set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1}) set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
set(LYX_MINOR_VERSION ${CMAKE_MATCH_2}) set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
set(LYX_PATCH_VERSION 0) # TODO 2.1.0svn, LYX_PATCH_VERSION == 0 set(LYX_PATCH_VERSION ${CMAKE_MATCH_4}) # TODO 2.1.0svn, LYX_PATCH_VERSION == 0
set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")

3
development/cmake/doc/CMakeLists.txt
View File

@ -7,9 +7,6 @@
project(doc) project(doc)
#TODO: replace perl script with python, see scons:
# http://www.lyx.org/trac/browser/lyx-devel/trunk/development/scons/scons_utils.py
SET(_docs) SET(_docs)
file(GLOB_RECURSE _rel_lyx_docs RELATIVE "${TOP_SRC_DIR}/lib/doc" "${TOP_SRC_DIR}/lib/doc/*.lyx" "${TOP_SRC_DIR}/lib/doc/*.txt") file(GLOB_RECURSE _rel_lyx_docs RELATIVE "${TOP_SRC_DIR}/lib/doc" "${TOP_SRC_DIR}/lib/doc/*.lyx" "${TOP_SRC_DIR}/lib/doc/*.txt")

10
development/cmake/doc/ReplaceValues.py
View File

@ -1,4 +1,14 @@
#! /usr/bin/env python #! /usr/bin/env python
# file ReplaceValues.py
#
# This file is part of LyX, the document processor.
# Licence details can be found in the file COPYING.
#
# author: Kornel Benko, kornel@lyx.org
#
# Syntax: ReplaceValues.py [<var1>=<Subst1> [<var2>=<Subst> ...]] <Inputfile> [<Inputfile> ...]
import sys import sys
import re import re

13
src/support/Package.cpp
View File

@ -573,6 +573,19 @@ get_system_support_dir(FileName const & abs_binary,
if (!fileSearch(path.absFileName(), chkconfig_ltx).empty()) if (!fileSearch(path.absFileName(), chkconfig_ltx).empty())
return path; return path;
#if defined(LYX_ABS_TOP_SRCDIR)
{
string const dir = fix_dir_name(LYX_ABS_TOP_SRCDIR);
path = makeAbsPath(dir);
FileName path2(addPath(path.absFileName(), "lib"));
searched_dirs.push_back(path2);
FileName const abs_path = fileSearch(path2.absFileName(), chkconfig_ltx);
if (! abs_path.empty()) {
return path2;
}
}
#endif
// Everything has failed :-( // Everything has failed :-(
// So inform the user and exit. // So inform the user and exit.
string searched_dirs_str; string searched_dirs_str;