From: Jean-Marc Lasgouttes Date: Mon, 13 Feb 2006 21:54:04 +0000 (+0000) Subject: move and update preference file in LyX.app bundle; do not append version suffix to... X-Git-Tag: 1.6.10~13601 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=33381332fc2867dde5c742e7b2a560e6a2320776;p=features.git move and update preference file in LyX.app bundle; do not append version suffix to binaries for osx git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13231 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/config/ChangeLog b/config/ChangeLog index 82bde36552..51606ca5b3 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2006-02-13 Jean-Marc Lasgouttes + + * lyxinclude.m4 (LYX_USE_PACKAGING): do not set program_suffix for + macosx packaging. + 2006-02-07 Jean-Marc Lasgouttes * lyxinclude.m4 (LYX_VERSION_SUFFIX): do not alter PACKAGE here. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index ca5211ea47..63e54ee236 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -586,7 +586,6 @@ AC_MSG_RESULT($lyx_use_packaging) case $lyx_use_packaging in macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) PACKAGE=LyX${version_suffix} - program_suffix=$version_suffix default_prefix="/Applications/${PACKAGE}.app" bindir='${prefix}/Contents/MacOS' libdir='${prefix}/Contents/Resources' diff --git a/development/ChangeLog b/development/ChangeLog index 94edcd8be8..5e8846c1fb 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,15 +1,20 @@ +2006-02-13 Jean-Marc Lasgouttes + + * MacOSX/LyX.app/Contents/Resources/preferences: move here. the + LyX subdirectory has not been updated; update the prefs for 1.4.0. + 2006-02-02 Georg Baum * FORMAT: document branches 2006-02-01 Bennett Helm - * MacOSX/LyX.app/Contents/Resources/preferences: update again. + * MacOSX/LyX.app/Contents/Resources/LyX/preferences: update again. Something went wrong. 2006-1-12 Bennett Helm - * MacOSX/LyX.app/Contents/Resources/preferences: update formats + * MacOSX/LyX.app/Contents/Resources/LyX/preferences: update formats section to conform to lyx-1.4 conventions 2005-10-13 Jürgen Spitzmüller diff --git a/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences b/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences deleted file mode 100644 index 6b417da3d6..0000000000 --- a/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences +++ /dev/null @@ -1,96 +0,0 @@ -### This file is part of -### ======================================================== -### LyX, The Document Processor -### -### Copyright 1995 Matthias Ettrich -### Copyright 1995-2001 The LyX Team. -### -### ======================================================== - -# This file is written by LyX, if you want to make your own -# modifications you should do them from inside LyX and save - -\bind_file mac - -# -# MISC SECTION ###################################### -# - -\path_prefix "/usr/bin:/usr/local/bin:/usr/local/teTeX/bin/powerpc-apple-darwin-current:/usr/X11R6/bin:/sw/bin:/opt/local/teTeX/bin" -\serverpipe "~/Library/Application Support/LyX/.lyxpipe" -\preview on - -# -# SCREEN & FONTS SECTION ############################ -# - -\screen_font_roman "Times" -\screen_font_sans "Helvetica" -\screen_font_typewriter "Courier" - -# -# COLOR SECTION ################################### -# - - -# -# PRINTER SECTION ################################### -# - - -# -# EXPORT SECTION #################################### -# - - -# -# TEX SECTION ####################################### -# - - -# -# FILE SECTION ###################################### -# - - -# -# ASCII EXPORT SECTION ############################## -# - - -# -# SPELLCHECKER SECTION ############################## -# - -\spell_command "aspell" - -# -# LANGUAGE SUPPORT SECTION ########################## -# - - -# -# 2nd MISC SUPPORT SECTION ########################## -# - - -# -# FORMATS SECTION ########################## -# - -\format "dvi" "dvi" "DVI" "D" "open" "" -\format "html" "html" "HTML" "H" "open" "" -\format "latex" "tex" "LaTeX" "L" "open" "" -\format "pdf" "pdf" "PDF (ps2pdf)" "P" "open" "" -\format "ps" "ps" "Postscript" "t" "open" "" -\format "sxw" "sxw" "OpenOffice.Org Writer" "O" "open" "" -\format "text" "txt" "ASCII" "A" "open" "" -\format "textparagraph" "txt" "ASCII (paragraphs)" "" "open" "" -\format "word" "doc" "Word" "W" "open" "" -\format "rtf" "rtf" "RTF" "" "open" "" - - -# -# CONVERTERS SECTION ########################## -# - diff --git a/development/MacOSX/LyX.app/Contents/Resources/preferences b/development/MacOSX/LyX.app/Contents/Resources/preferences new file mode 100644 index 0000000000..d3de003364 --- /dev/null +++ b/development/MacOSX/LyX.app/Contents/Resources/preferences @@ -0,0 +1,102 @@ +### This file is part of +### ======================================================== +### LyX, The Document Processor +### +### Copyright 1995 Matthias Ettrich +### Copyright 1995-2001 The LyX Team. +### +### ======================================================== + +# This file is written by LyX, if you want to make your own +# modifications you should do them from inside LyX and save + +\bind_file "mac" + +# +# MISC SECTION ###################################### +# + +\path_prefix "/usr/bin:/usr/local/bin:/usr/local/teTeX/bin/powerpc-apple-darwin-current:/usr/X11R6/bin:/sw/bin:/opt/local/teTeX/bin" +\serverpipe "~/Library/Application Support/LyX-1.4/.lyxpipe" +\preview on + +# +# SCREEN & FONTS SECTION ############################ +# + +\screen_font_roman "Times" +\screen_font_sans "Helvetica" +\screen_font_typewriter "Courier" + +# +# COLOR SECTION ################################### +# + + +# +# PRINTER SECTION ################################### +# + + +# +# EXPORT SECTION #################################### +# + + +# +# TEX SECTION ####################################### +# + + +# +# FILE SECTION ###################################### +# + +\template_path "~/Library/Application Support/LyX-1.4/templates" + +# +# ASCII EXPORT SECTION ############################## +# + + +# +# SPELLCHECKER SECTION ############################## +# + +\spell_command "aspell" + +# +# LANGUAGE SUPPORT SECTION ########################## +# + + +# +# 2nd MISC SUPPORT SECTION ########################## +# + + +# +# FORMATS SECTION ########################## +# + +\format "dvi" "dvi" "DVI" "D" "open" "" +\format "html" "html" "HTML" "H" "open" "" +\format "latex" "tex" "LaTeX" "L" "open" "" +\format "pdf" "pdf" "PDF (ps2pdf)" "P" "open" "" +\format "ps" "ps" "Postscript" "t" "open" "" +\format "sxw" "sxw" "OpenOffice.Org Writer" "O" "open" "" +\format "text" "txt" "ASCII" "A" "open" "" +\format "textparagraph" "txt" "ASCII (paragraphs)" "" "open" "" +\format "word" "doc" "Word" "W" "open" "" +\format "rtf" "rtf" "RTF" "" "open" "" + +# +# CONVERTERS SECTION ########################## +# + +\converter "latex" "lyx" "$$s/../MacOS/tex2lyx -f $$i $$o" "" + +# +# COPIERS SECTION ########################## +# +