CWS-TOOLING: integrate CWS native262
2009-08-18 16:35:06 +0200 is r275118 : #i102939# differ between ok-label and install-label 2009-08-13 17:24:47 +0200 is r274960 : #i102939# mac languagepacks 2009-08-13 17:22:22 +0200 is r274959 : #i102939# mac languagepacks 2009-08-13 17:15:01 +0200 is r274958 : #i102939# mac languagepacks 2009-08-13 17:13:36 +0200 is r274957 : #i102939# mac languagepacks 2009-08-13 17:12:57 +0200 is r274956 : #i102939# mac languagepacks 2009-08-13 17:12:20 +0200 is r274955 : #i102939# mac languagepacks 2009-08-13 17:11:41 +0200 is r274954 : #i102939# mac languagepacks 2009-08-13 17:10:52 +0200 is r274953 : #i102939# mac languagepacks
This commit is contained in:
parent
68e8dec50f
commit
b84d6fb52b
9 changed files with 414 additions and 0 deletions
|
@ -2,6 +2,7 @@ pk setup_native : soltools xml2cmp sal officecfg unoil NULL
|
|||
pk setup_native usr1 - all sn_mkout NULL
|
||||
pk setup_native\scripts\source nmake - u sn_source NULL
|
||||
pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL
|
||||
pk setup_native\source\mac nmake - u sn_mac NULL
|
||||
pk setup_native\source\win32\customactions\tools nmake - w sn_tools NULL
|
||||
pk setup_native\source\win32\customactions\relnotes nmake - w sn_relnotes NULL
|
||||
pk setup_native\source\win32\customactions\rebase nmake - w sn_rebase NULL
|
||||
|
|
|
@ -19,6 +19,7 @@ mkdir: %_DEST%\bin%_EXT%\userscripts
|
|||
..\%__SRC%\bin\javaloader.sh %_DEST%\bin%_EXT%\javaloader.sh
|
||||
..\%__SRC%\bin\stclient_wrapper.sh %_DEST%\bin%_EXT%\stclient_wrapper
|
||||
..\%__SRC%\bin\stclient_wrapper.exe %_DEST%\bin%_EXT%\stclient_wrapper.exe
|
||||
..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin%_EXT%\*.ulf
|
||||
..\source\win32\msi-encodinglist.txt %_DEST%\bin%_EXT%\msi-encodinglist.txt
|
||||
..\source\win32\patchlist.txt %_DEST%\bin%_EXT%\patchlist.txt
|
||||
..\source\win32\desktophelper.txt %_DEST%\bin%_EXT%\desktophelper.txt
|
||||
|
@ -27,6 +28,8 @@ mkdir: %_DEST%\bin%_EXT%\userscripts
|
|||
..\source\win32\nsis\*.ico %_DEST%\bin%_EXT%\*.ico
|
||||
..\source\win32\nsis\*.bmp %_DEST%\bin%_EXT%\*.bmp
|
||||
..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat
|
||||
..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns
|
||||
..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack
|
||||
..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
|
||||
..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
|
||||
..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
|
||||
|
@ -35,6 +38,9 @@ mkdir: %_DEST%\bin%_EXT%\userscripts
|
|||
..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp
|
||||
..\scripts\admin.pl %_DEST%\bin%_EXT%\admin.pl
|
||||
..\scripts\*.txt %_DEST%\bin%_EXT%\*.txt
|
||||
..\scripts\mac_install.script %_DEST%\bin%_EXT%\mac_install.script
|
||||
..\scripts\osx_install_languagepack.applescript %_DEST%\bin%_EXT%\osx_install_languagepack.applescript
|
||||
..\scripts\osx_install_patch.applescript %_DEST%\bin%_EXT%\osx_install_patch.applescript
|
||||
|
||||
..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
|
||||
|
||||
|
|
10
setup_native/scripts/mac_install.script
Normal file
10
setup_native/scripts/mac_install.script
Normal file
|
@ -0,0 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
# shell script as a workaraound since it is hard to impossible to store compiled
|
||||
# applescript in CVS and running osacompile would require a GUI session while
|
||||
# building (or root privileges)
|
||||
# using osascript only works when the shell script is camouflaged as application
|
||||
|
||||
MY_DIR=$(dirname "$0")
|
||||
|
||||
osascript "$MY_DIR/osx_install.applescript"
|
115
setup_native/scripts/osx_install_languagepack.applescript
Normal file
115
setup_native/scripts/osx_install_languagepack.applescript
Normal file
|
@ -0,0 +1,115 @@
|
|||
(*
|
||||
This script is meant to
|
||||
1) Identify installed instances of the product
|
||||
2) check whether the user has write-access (and if not
|
||||
ask for authentification)
|
||||
3) install the shipped tarball
|
||||
*)
|
||||
|
||||
-- strings for localisations - to be meant to be replaced
|
||||
-- by a makefile or similar
|
||||
set OKLabel to "[OKLabel]"
|
||||
set InstallLabel to "[InstallLabel]"
|
||||
set AbortLabel to "[AbortLabel]"
|
||||
set intro to "[IntroText1]
|
||||
|
||||
[IntroText2]
|
||||
|
||||
[IntroText3]"
|
||||
set chooseMyOwn to "[ChooseMyOwnText]"
|
||||
set listPrompt to "[ListPromptText]"
|
||||
set chooseManual to "[ChooseManualText]"
|
||||
set listOKLabel to "[ListOKLabelText]"
|
||||
set listCancelLabel to "[ListCancelLabel]"
|
||||
set appInvalid to "[AppInvalidText1]
|
||||
|
||||
[AppInvalidText2]" -- string will begin with the chosen application's name
|
||||
set startInstall to "[StartInstallText1]
|
||||
|
||||
[StartInstallText2]"
|
||||
set IdentifyQ to "[IdentifyQText]
|
||||
|
||||
[IdentifyQText2]"
|
||||
set IdentifyYES to "[IdentifyYES]"
|
||||
set IdentifyNO to "[IdentifyNO]"
|
||||
set installFailed to "[InstallFailedText]"
|
||||
set installComplete to "[InstallCompleteText]
|
||||
|
||||
[InstallCompleteText2]"
|
||||
|
||||
set sourcedir to (do shell script "dirname " & quoted form of POSIX path of (path to of me))
|
||||
|
||||
display dialog intro buttons {AbortLabel, InstallLabel} default button 2
|
||||
|
||||
if (button returned of result) is AbortLabel then
|
||||
return 2
|
||||
end if
|
||||
|
||||
set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLPRODUCTNAME].app'\"") & "
|
||||
" & chooseMyOwn
|
||||
|
||||
-- the choice returned is of type "list"
|
||||
-- Show selection dialog only if more than one or no product was found
|
||||
if (get first paragraph of found_ooos) is "" then
|
||||
set the choice to (choose from list of paragraphs in found_ooos default items (get last paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
|
||||
if choice is false then
|
||||
-- do nothing, the user cancelled the installation
|
||||
return 2 --aborted by user
|
||||
else if (choice as string) is chooseMyOwn then
|
||||
-- yeah, one needs to use "choose file", otherwise
|
||||
-- the user would not be able to select the .app
|
||||
set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
|
||||
end if
|
||||
else if (get second paragraph of found_ooos) is chooseMyOwn then
|
||||
-- set choice to found installation
|
||||
set the choice to (get first paragraph of found_ooos)
|
||||
else
|
||||
set the choice to (choose from list of paragraphs in found_ooos default items (get first paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
|
||||
if choice is false then
|
||||
-- do nothing, the user cancelled the installation
|
||||
return 2 --aborted by user
|
||||
else if (choice as string) is chooseMyOwn then
|
||||
-- yeah, one needs to use "choose file", otherwise
|
||||
-- the user would not be able to select the .app
|
||||
set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
|
||||
end if
|
||||
end if
|
||||
|
||||
-- now only check whether the path is really from [PRODUCTNAME]
|
||||
try
|
||||
do shell script "grep '<string>[PRODUCTNAME] [PRODUCTVERSION]' " & quoted form of (choice as string) & "/Contents/Info.plist"
|
||||
on error
|
||||
display dialog (choice as string) & appInvalid buttons {InstallLabel} default button 1 with icon 0
|
||||
return 3 --wrong target-directory
|
||||
end try
|
||||
|
||||
(*
|
||||
display dialog startInstall buttons {AbortLabel, InstallLabel} default button 2
|
||||
|
||||
if (button returned of result) is AbortLabel then
|
||||
return 2
|
||||
end if
|
||||
*)
|
||||
|
||||
set tarCommand to "/usr/bin/tar -C " & quoted form of (choice as string) & " -xjf " & quoted form of sourcedir & "/tarball.tar.bz2"
|
||||
try
|
||||
do shell script tarCommand
|
||||
|
||||
on error errMSG number errNUM
|
||||
display dialog IdentifyQ buttons {IdentifyYES, IdentifyNO} with icon 2
|
||||
if (button returned of result) is IdentifyYES then
|
||||
try
|
||||
do shell script tarCommand with administrator privileges
|
||||
on error errMSG number errNUM
|
||||
display dialog installFailed buttons {OKLabel} default button 1 with icon 0
|
||||
-- -60005 username/password wrong
|
||||
-- -128 aborted by user
|
||||
-- 2 error from tar - tarball not found (easy to test)
|
||||
return errNUM
|
||||
end try
|
||||
else
|
||||
return 2 -- aborted by user
|
||||
end if
|
||||
end try
|
||||
|
||||
display dialog installComplete buttons {OKLabel} default button 1
|
113
setup_native/scripts/osx_install_patch.applescript
Normal file
113
setup_native/scripts/osx_install_patch.applescript
Normal file
|
@ -0,0 +1,113 @@
|
|||
(*
|
||||
This script is meant to
|
||||
1) Identify installed instances of the product
|
||||
2) check whether the user has write-access (and if not
|
||||
ask for authentification)
|
||||
3) install the shipped tarball
|
||||
*)
|
||||
|
||||
-- strings for localisations - to be meant to be replaced
|
||||
-- by a makefile or similar
|
||||
set OKLabel to "[OKLabel]"
|
||||
set InstallLabel to "[InstallLabel]"
|
||||
set AbortLabel to "[AbortLabel]"
|
||||
set intro to "[IntroText1]
|
||||
|
||||
[IntroText2]
|
||||
|
||||
[IntroText3]"
|
||||
set chooseMyOwn to "[ChooseMyOwnText]"
|
||||
set listPrompt to "[ListPromptText]"
|
||||
set chooseManual to "[ChooseManualText]"
|
||||
set listOKLabel to "[ListOKLabelText]"
|
||||
set listCancelLabel to "[ListCancelLabel]"
|
||||
set appInvalid to "[AppInvalidText1]
|
||||
|
||||
[AppInvalidText2]" -- string will begin with the chosen application's name
|
||||
set startInstall to "[StartInstallText1]
|
||||
|
||||
[StartInstallText2]"
|
||||
set IdentifyQ to "[IdentifyQText]
|
||||
|
||||
[IdentifyQText2]"
|
||||
set IdentifyYES to "[IdentifyYES]"
|
||||
set IdentifyNO to "[IdentifyNO]"
|
||||
set installFailed to "[InstallFailedText]"
|
||||
set installComplete to "[InstallCompleteTextPatch]"
|
||||
|
||||
set sourcedir to (do shell script "dirname " & quoted form of POSIX path of (path to of me))
|
||||
|
||||
display dialog intro buttons {AbortLabel, InstallLabel} default button 2
|
||||
|
||||
if (button returned of result) is AbortLabel then
|
||||
return 2
|
||||
end if
|
||||
|
||||
set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLPRODUCTNAME].app'\"") & "
|
||||
" & chooseMyOwn
|
||||
|
||||
-- the choice returned is of type "list"
|
||||
-- Show selection dialog only if more than one or no product was found
|
||||
if (get first paragraph of found_ooos) is "" then
|
||||
set the choice to (choose from list of paragraphs in found_ooos default items (get last paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
|
||||
if choice is false then
|
||||
-- do nothing, the user cancelled the installation
|
||||
return 2 --aborted by user
|
||||
else if (choice as string) is chooseMyOwn then
|
||||
-- yeah, one needs to use "choose file", otherwise
|
||||
-- the user would not be able to select the .app
|
||||
set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
|
||||
end if
|
||||
else if (get second paragraph of found_ooos) is chooseMyOwn then
|
||||
-- set choice to found installation
|
||||
set the choice to (get first paragraph of found_ooos)
|
||||
else
|
||||
set the choice to (choose from list of paragraphs in found_ooos default items (get first paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
|
||||
if choice is false then
|
||||
-- do nothing, the user cancelled the installation
|
||||
return 2 --aborted by user
|
||||
else if (choice as string) is chooseMyOwn then
|
||||
-- yeah, one needs to use "choose file", otherwise
|
||||
-- the user would not be able to select the .app
|
||||
set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
|
||||
end if
|
||||
end if
|
||||
|
||||
-- now only check whether the path is really from [PRODUCTNAME]
|
||||
try
|
||||
do shell script "grep '<string>[PRODUCTNAME] [PRODUCTVERSION]' " & quoted form of (choice as string) & "/Contents/Info.plist"
|
||||
on error
|
||||
display dialog (choice as string) & appInvalid buttons {InstallLabel} default button 1 with icon 0
|
||||
return 3 --wrong target-directory
|
||||
end try
|
||||
|
||||
(*
|
||||
display dialog startInstall buttons {AbortLabel, InstallLabel} default button 2
|
||||
|
||||
if (button returned of result) is AbortLabel then
|
||||
return 2
|
||||
end if
|
||||
*)
|
||||
|
||||
set tarCommand to "/usr/bin/tar -C " & quoted form of (choice as string) & " -xjf " & quoted form of sourcedir & "/tarball.tar.bz2"
|
||||
try
|
||||
do shell script tarCommand
|
||||
|
||||
on error errMSG number errNUM
|
||||
display dialog IdentifyQ buttons {IdentifyYES, IdentifyNO} with icon 2
|
||||
if (button returned of result) is IdentifyYES then
|
||||
try
|
||||
do shell script tarCommand with administrator privileges
|
||||
on error errMSG number errNUM
|
||||
display dialog installFailed buttons {OKLabel} default button 1 with icon 0
|
||||
-- -60005 username/password wrong
|
||||
-- -128 aborted by user
|
||||
-- 2 error from tar - tarball not found (easy to test)
|
||||
return errNUM
|
||||
end try
|
||||
else
|
||||
return 2 -- aborted by user
|
||||
end if
|
||||
end try
|
||||
|
||||
display dialog installComplete buttons {OKLabel} default button 1
|
36
setup_native/source/mac/Info.plist.langpack
Normal file
36
setup_native/source/mac/Info.plist.langpack
Normal file
|
@ -0,0 +1,36 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<!-- UTI declarations for OS X >= 10.4 -->
|
||||
<key>UTExportedTypeDeclarations</key>
|
||||
|
||||
<key>UTImportedTypeDeclarations</key>
|
||||
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>[FULLPRODUCTNAME]</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>[FULLPRODUCTNAME]</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>ooo3_installer.icns</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>9</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.openoffice.script</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>[FULLPRODUCTNAME]</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>OOo3</string>
|
||||
<key>LSRequiresCarbon</key>
|
||||
<string>1</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>VCL_NSApplication</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
68
setup_native/source/mac/macinstall.ulf
Normal file
68
setup_native/source/mac/macinstall.ulf
Normal file
|
@ -0,0 +1,68 @@
|
|||
[OKLabel]
|
||||
en-US = "Ok"
|
||||
|
||||
[InstallLabel]
|
||||
en-US = "Install"
|
||||
|
||||
[AbortLabel]
|
||||
en-US = "Abort"
|
||||
|
||||
[IntroText1]
|
||||
en-US = "Welcome to the [FULLPRODUCTNAME] Installation Wizard"
|
||||
|
||||
[IntroText2]
|
||||
en-US = "This installation will update your installed versions of [PRODUCTNAME]"
|
||||
|
||||
[IntroText3]
|
||||
en-US = "This might take a moment."
|
||||
|
||||
[ChooseMyOwnText]
|
||||
en-US = "Not listed (choose location in an extra step)"
|
||||
|
||||
[ListPromptText]
|
||||
en-US = "Choose [PRODUCTNAME] [PRODUCTVERSION] installation for which you want to install the [FULLPRODUCTNAME]"
|
||||
|
||||
[ChooseManualText]
|
||||
en-US = "Point the dialog to your [PRODUCTNAME] [PRODUCTVERSION] installation."
|
||||
|
||||
[ListOKLabelText]
|
||||
en-US = "Install"
|
||||
|
||||
[ListCancelLabel]
|
||||
en-US = "Abort"
|
||||
|
||||
[AppInvalidText1]
|
||||
en-US = "This is not a valid [PRODUCTNAME] [PRODUCTVERSION] installation."
|
||||
|
||||
[AppInvalidText2]
|
||||
en-US = "Run the installer again and choose a valid [PRODUCTNAME] [PRODUCTVERSION] installation"
|
||||
|
||||
[StartInstallText1]
|
||||
en-US = "Click Install to start the installation"
|
||||
|
||||
[StartInstallText2]
|
||||
en-US = "Installation might take a minute..."
|
||||
|
||||
[IdentifyQText]
|
||||
en-US = "Installation failed, most likely your account does not have the necessary privileges."
|
||||
|
||||
[IdentifyQText2]
|
||||
en-US = "Do you want to identify as administrator and try again?"
|
||||
|
||||
[IdentifyYES]
|
||||
en-US = "Yes, identify"
|
||||
|
||||
[IdentifyNO]
|
||||
en-US = "No, abort installation"
|
||||
|
||||
[InstallFailedText]
|
||||
en-US = "Installation failed."
|
||||
|
||||
[InstallCompleteText]
|
||||
en-US = "Installation of [PRODUCTNAME] language pack completed."
|
||||
|
||||
[InstallCompleteText2]
|
||||
en-US = "Call 'Tools-Options-Language Settings' to change the user interface language."
|
||||
|
||||
[InstallCompleteTextPatch]
|
||||
en-US = "Installation of [FULLPRODUCTNAME] completed"
|
65
setup_native/source/mac/makefile.mk
Normal file
65
setup_native/source/mac/makefile.mk
Normal file
|
@ -0,0 +1,65 @@
|
|||
#*************************************************************************
|
||||
#
|
||||
# OpenOffice.org - a multi-platform office productivity suite
|
||||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.5 $
|
||||
#
|
||||
# last change: $Author: rt $ $Date: 2005-09-07 18:20:20 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
#
|
||||
#
|
||||
# GNU Lesser General Public License Version 2.1
|
||||
# =============================================
|
||||
# Copyright 2005 by Sun Microsystems, Inc.
|
||||
# 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License version 2.1, as published by the Free Software Foundation.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
# MA 02111-1307 USA
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
PRJ=..$/..
|
||||
|
||||
PRJNAME=setup_native
|
||||
TARGET=mac_ulffiles
|
||||
|
||||
# --- Settings -----------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
ULFFILES = macinstall.ulf
|
||||
|
||||
ULFDESTFILES=$(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)_dest$/$i)
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.IF "$(OS)"=="MACOSX"
|
||||
ALLTAR : $(ULFDESTFILES)
|
||||
.ENDIF
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
||||
.IF "$(WITH_LANG)"!=""
|
||||
$(MISC)$/$(TARGET)_dest$/%.ulf : $(COMMONMISC)$/$(TARGET)$/%.ulf
|
||||
.ELSE # "$(WITH_LANG)"!=""
|
||||
$(MISC)$/$(TARGET)_dest$/%.ulf : %.ulf
|
||||
.ENDIF # "$(WITH_LANG)"!=""
|
||||
@-$(MKDIRHIER) $(MISC)$/$(TARGET)_dest
|
||||
$(COPY) $< $@
|
BIN
setup_native/source/mac/ooo3_installer.icns
Normal file
BIN
setup_native/source/mac/ooo3_installer.icns
Normal file
Binary file not shown.
Loading…
Reference in a new issue