Hi,
this mail is to summarize all the work we have now in macosx% cwses.
I resynced them all to SRC680_m198 so it is much easier to work with
them.
CWS macosxdmgapplink
====================
- the background image of the DMG installer is changed to reflect the
second change and the version number 2.2
- "Applications" in the DMG installer is now link to /Applications
Changed files:
instsetoo_native/res/DS_Store
instsetoo_native/res/osxdndinstall.png
instsetoo_native/util/makefile.mk
Status: OK, you can authenticate when you want to copy the
application to /Applications. Works as expected. Nominated.
Note: RE has to resync the one liner change in instsetoo_native/util/
makefile.mk to m199 which contains cloph05 change. Should be easy,
but we have to check if the change gets into the master correctly.
CWS macosx22fixes
=================
- change various version numbers from 2.1 to 2.2
- add link to X11 FAQ on the website when there is no X11 on the system
- extend no X11 dialog with link to our page http://
porting.openoffice.org/mac/faq/installing/X11.html
Changed files:
desktop/macosx/source/Info.plist
desktop/macosx/source/InfoPlist.strings
desktop/macosx/source/PostInstall.applescript
desktop/macosx/source/main.applescript
Misleading description of the CWS - "QA testtool"? Asked Eric about it.
Status: OK, will nominate it when the description is changed and I'm
QA of it. This cws should completely remove X11 questions. If it is
integrated and users will ask about X11, you know what to think about
them ;-)
CWS macosxversioning01
======================
Moves some files from module desktop to module instsetoo_native. Thus
the changes from Eric's macosx22fixes has to be moved there as well.
Generates files from templates, e.g. in Info.plist, the change is:
- <string>OpenOffice.org 2.2</string>
+ <string>OpenOffice.org XXXOOO_VER_MAJORMINORXXX</string>
and the macro is substitued with the real version. (I'd prefer using
something like %PRODUCTVERSION to match the rest of the files in
module instsetoo_native here).
Moved files:
desktop/macosx/source/Info.plist -> instsetoo_native/macosx/
application/Info.plist
desktop/macosx/source/InfoPlist.strings -> instsetoo_native/macosx/
application/InfoPlist.strings
desktop/macosx/source/PostInstall.applescript -> instsetoo_native/
macosx/application/PostInstall.applescript
desktop/macosx/source/main.applescript -> instsetoo_native/macosx/
application/main.applescript
Changed files:
scp2/source/ooo/profileitem_ooo.scp
+rework in instsetoo_native
scp2's changes also moves user configuration directory
- Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%20%PRODUCTVERSION";
+ Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%
USERDIRPRODUCTVERSION";
I think this is a bit dangerous - we will diverge from other
platforms a bit with it...
main.applescript doesn't contain the part that Eric added in
macosx22fixes - More and Quit button for NO_X11 dialog:
-- if nothing really was found, display an error message.
if (whichserver is equal to "NOXSERVER") then
- display dialog getMessage("ERROR_NEED_X11") buttons
{"Quit", "More Info"} default button "More Info" cancel button "Quit"
with icon stop
- -- if more info is chosen, then open a help web page
- do shell script "open http://porting.openoffice.org/
mac/faq/installing/X11.html"
- -- cannot continue, so quit the script
+ display dialog getMessage("ERROR_NEED_X11")
return "error"
end if
...
if (aKey is equal to "ERROR_NEED_X11") then
- return "OpenOffice.org for Mac OS X cannot be
started, because the X11 software is not installed. Please install
Apple X11 first from the Mac OS X install DVD. More information:
http://porting.openoffice.org/mac/faq/installing/X11.html";
+ return "OpenOffice.org cannot be started,
because X11 is not installed. Please install Apple X11 first."
end if
instsetoo_native/macosx/make_versioned.sh should have GNU LGPL header.
It also contains migrateUserPrefs, which *moves* (!?) user's files
around on the disk. I vote for removing this from here for now. The
user can have more instances of OOo and moving (re-moving)
preferences for his old version is nonsense.
make_versioned.sh emits warnings:
make_versioned.sh "application/main.applescript" "../unxmacxi.pro/
misc/versioned/application/main.applescript"
make_versioned.sh: Using versions 2 - 2.2
2.2.0 - 2.2.0 for application/main.applescript, storing to ../
unxmacxi.pro/misc/versioned/application
sed: 1: "s/XXXOOO_VER_MAJORMINOR ...": unescaped newline inside
substitute pattern
This part is a bit long to my eyes:
+if [ ! -d "$TARGET_PATH" ]; then
+ mkdir -p "$TARGET_PATH"
+fi
It is equivalent to simple mkdir -p:
mkdir -p "$TARGET_PATH"
In prj/build.lst, you have added:
-oon instsetoo_native\util ...
+con instsetoo_native\macosx ...
Why con? The same applies to con_macosx_bundle. The rest is using oon
Status: has to be polished a bit.
Summary (proposed plan): for now, we will include macosxdmgapplink
and macosx22fixes and we should continue to make macosxversioning01
ready for inclusion for 2.2 as well (without user prefs migration)
after both of them are integrated.
What do you think?
--
Pavel Janík
[EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
