Kaydet (Commit) 1ec8d2c2 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Kill BrOffice, fdo#36262

üst 15e7b52a
mkdir: %_DEST%\bin%_EXT%\osl mkdir: %_DEST%\bin%_EXT%\osl
mkdir: %_DEST%\bin%_EXT%\broffice
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
...@@ -36,11 +35,7 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf ...@@ -36,11 +35,7 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store ..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
..\source\mac\broffice\osxdndinstall.png %_DEST%\bin%_EXT%\broffice\osxdndinstall.png
..\source\mac\broffice\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\broffice\osxdndinstall_nologo.png
..\source\mac\broffice\DS_Store %_DEST%\bin%_EXT%\broffice\DS_Store
..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
..\source\java\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif
..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed ..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed
......
...@@ -275,24 +275,10 @@ ALLLANGUAGESPLACEHOLDER ...@@ -275,24 +275,10 @@ ALLLANGUAGESPLACEHOLDER
Function SetupBranding Function SetupBranding
File "/oname=$PLUGINSDIR\modern-header.bmp" BANNERBMPPLACEHOLDER File "/oname=$PLUGINSDIR\modern-header.bmp" BANNERBMPPLACEHOLDER
File "/oname=$PLUGINSDIR\modern-header-br.bmp" BANNERBMPPLACEHOLDER_BR
File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
; use broffice specific branding if we are in Brazil !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
; messageBox MB_OK "Language: $LANGUAGE"
StrCmp $LANGUAGE "1046" BrOfficeSplash DefaultSplash
DefaultSplash:
; messageBox MB_OK "LibreOffice"
SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
GoTo atEnd
BrOfficeSplash:
; messageBox MB_OK "BrOffice"
SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header-br.bmp"
!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard-br.bmp"
GoTo atEnd
atEnd:
FunctionEnd FunctionEnd
; Reserve files ; Reserve files
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment