anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make osx builds relocatable

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@8260 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-12-16 14:51:59 +00:00
parent f3fbd4d161
commit abfaec6c0c
5 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-12 Ronald Florence <ron@18james.com>
* reLyX/reLyX.in: search for library in
"$dir/../Resources/LyX/reLyX" for LyX/Mac
2003-12-10 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* CREDITS: add Felix Kurth

4
lib/reLyX/reLyX.in
View File

@ -44,7 +44,9 @@ push @maybe_dir, "$dir/$srcdir";
if (exists $ENV{LYX_DIR_13x}) { push @maybe_dir, "$ENV{LYX_DIR_13x}/reLyX"};
# case 4: e.g., reLyX in /opt/bin, $mainscript in /opt/share/lyx/reLyX
push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4
# case 5: configure figured out where $mainscript is
# case 5: LyX/Mac -- reLyX is in a MacOS X application bundle
push @maybe_dir, "$dir/../Resources/LyX/reLyX"; # case 5
# case 6: configure figured out where $mainscript is
push @maybe_dir, "$lyxdir/reLyX";
# Decide which one is the real directory, based on the existence of

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-12 Ronald Florence <ron@18james.com>
* lyx_main.C: determine system directory and set PATH for
relocatable LyX/Mac bundle.
2003-12-04 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* BufferView_pimpl.C (viewDispatch): new method, called by the qt

28
src/lyx_main.C
View File

@ -246,10 +246,11 @@ void LyX::init(bool gui)
// 1) -sysdir command line parameter
// 2) LYX_DIR_13x environment variable
// 3) Maybe <path of binary>/TOP_SRCDIR/lib
// 4) <path of binary>/../share/<name of binary>/
// 4a) repeat 4 after following the Symlink if <path of
// 4) <path of binary>/../Resources/<name of binary>/ [for LyX/Mac]
// 5) <path of binary>/../share/<name of binary>/
// 5a) repeat 4 after following the Symlink if <path of
// binary> is a symbolic link.
// 5) hardcoded lyx_dir
// 6) hardcoded lyx_dir
// The directory is checked for the presence of the file
// "chkconfig.ltx", and if that is present, the directory
// is accepted as the system directory.
@ -268,6 +269,10 @@ void LyX::init(bool gui)
searchpath += lyxdir + ';';
}
// Path of binary/../Resources/
searchpath += NormalizePath(AddPath(binpath, "../Resources/") +
OnlyFilename(binname)) + ';';
string fullbinpath = binpath;
FileInfo file(fullbinname, true);
if (file.isLink()) {
@ -382,6 +387,23 @@ void LyX::init(bool gui)
lyxerr[Debug::INIT] << "System directory: '"
<< system_lyxdir << '\'' << endl;
//
// Set PATH for LyX/Mac
// LyX/Mac is a relocatable application bundle; here we add to
// the PATH so it can find binaries like reLyX inside its own
// application bundle, and also append PATH elements that it
// needs to run latex, previewers, etc.
//
if (system_lyxdir == NormalizePath(AddPath(binpath, "../Resources/") +
OnlyFilename(binname))) {
string oldpath = GetEnv("PATH");
string newpath = "PATH=" + oldpath + ":" + binpath + ":";
newpath += "/sw/bin:/usr/local/bin:/usr/local/teTeX/bin/powerpc-apple-darwin-current";
PutEnv(newpath);
lyxerr[Debug::INIT] << "Running from LyX/Mac bundle. Setting PATH to: " << GetEnv("PATH") << endl;
}
//
// Determine user lyx-dir
//

4
status.13x
View File

@ -22,7 +22,7 @@ What's new
** Updates
- it is now possible to open documents which use a textclasse for
- it is now possible to open documents which use a textclass for
which no LaTeX support is installed. The documents can be normally
edited, but they can of course not be previewed or printed. Note
that the format of the file .lyx/textclasses.lst has changed as a
@ -33,6 +33,8 @@ What's new
- add support for opening files with LyX in finder [Qt/Mac only]
- make MacOSX build relocatable
- add support for \boldsymbol in math editor
- add support for g-brief2 textclass