>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
Angus> Lars Gullik Bjønnes wrote:
>> It is not the user that names the package (in PACKAGE) that is us.
>> This is what we have decided as the package name.
>> And set in configure.ac
Angus> Jean-Marc would like the thing to be called "LyX" on Mac OS X
Angus> and on Windows and "lyx" on POSIX machines. Actually, that's
Angus> only part of the story. He'd like it to be called PACKAGE-1.3.6
Angus> if the user requests --version-suffix.
I am not sure what I'd like. I already backed out my proposal of
things like LyX-1.3.6 in my second set of patches, only "lyx" is
changed to "LyX".
The there are two patches:
- the first one only uses LyX for the name of the user directory on
OSX (and the same should be done in windows IMO). This is of course
cosmetic
- the second tries to modify directly PACKAGE to this end. I wrote
when sending the patch that this is much more intrusive. Actually I
tend to think we should not do that in 1.3.x.
Here are updated versions of the patches with windows support added.
Thoughts?
JMarc
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.149.2.48
diff -u -p -r1.149.2.48 ChangeLog
--- src/support/ChangeLog 5 Jul 2005 07:45:44 -0000 1.149.2.48
+++ src/support/ChangeLog 12 Jul 2005 09:45:04 -0000
@@ -1,3 +1,8 @@
+2005-07-12 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * package.C (get_default_user_support_dir): for windows and osx
+ packaging, use "LyX" instead of "lyx" as subdirectory name.
+
2005-07-05 Angus Leeming <[EMAIL PROTECTED]>
* filetools.C (latex_path): don't pass the \string"-protected
Index: src/support/package.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Attic/package.C,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 package.C
--- src/support/package.C 22 Apr 2005 20:32:57 -0000 1.1.2.5
+++ src/support/package.C 12 Jul 2005 09:45:04 -0000
@@ -589,7 +589,8 @@ string const get_default_user_support_di
#if defined (USE_WINDOWS_PACKAGING)
(void)home_dir; // Silence warning about unused variable.
- return AddPath(win32_folder_path(CSIDL_APPDATA), PACKAGE);
+ string const user_dir = (string(PACKAGE) == "lyx") ? "LyX" : PACKAGE;
+ return AddPath(win32_folder_path(CSIDL_APPDATA), user_dir);
#elif defined (USE_MACOSX_PACKAGING)
(void)home_dir; // Silence warning about unused variable.
@@ -608,7 +609,8 @@ string const get_default_user_support_di
if (status_code != 0)
return string();
- return AddPath(reinterpret_cast<char const *>(store), PACKAGE);
+ string const user_dir = (string(PACKAGE) == "lyx") ? "LyX" : PACKAGE;
+ return AddPath(reinterpret_cast<char const *>(store), user_dir);
#else // USE_POSIX_PACKAGING
return AddPath(home_dir, string(".") + PACKAGE);
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.86.2.44
diff -u -p -r1.86.2.44 ChangeLog
--- config/ChangeLog 10 May 2005 15:00:01 -0000 1.86.2.44
+++ config/ChangeLog 12 Jul 2005 09:44:45 -0000
@@ -1,3 +1,8 @@
+2005-07-12 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * lyxinclude.m4 (LYX_USE_PACKAGING): use LyX instead of lyx as
+ package name for Windows and OSX packaging
+
2005-05-09 Angus Leeming <[EMAIL PROTECTED]>
* Makefile.am: remove pspell.m4 and add spell.m4.
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.81.2.7
diff -u -p -r1.81.2.7 lyxinclude.m4
--- config/lyxinclude.m4 4 Feb 2005 09:14:24 -0000 1.81.2.7
+++ config/lyxinclude.m4 12 Jul 2005 09:44:46 -0000
@@ -673,13 +673,15 @@ AC_ARG_WITH(packaging,
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])
- default_prefix="/Applications/LyX.app"
+ test $PACKAGE = "lyx" && PACKAGE=LyX
+ default_prefix="/Applications/LyX.app"
bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources'
mandir='${prefix}/Contents/Resources/man' ;;
windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
- default_prefix="C:/Program Files/LyX"
+ test $PACKAGE = "lyx" && PACKAGE=LyX
+ default_prefix="C:/Program Files/LyX"
bindir='${prefix}/bin'
libdir='${prefix}/Resources'
datadir='${prefix}/Resources'
