diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-26 13:31:51 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-26 13:31:51 +0300 |
| commit | 1ec8d2c26f05fd1e84603cf0188a42e17c4195c1 (patch) | |
| tree | 3750208d70482cf65e8a4ef1bbee8b7ec79e983b /setup_native | |
| parent | 15e7b52ae7e78a07625a5398b113089d7e6c76da (diff) | |
Kill BrOffice, fdo#36262
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/prj/d.lst | 5 | ||||
| -rw-r--r-- | setup_native/source/win32/nsis/downloadtemplate.nsi | 20 |
2 files changed, 3 insertions, 22 deletions
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 6aa6460d1823..d0443cf8657e 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -1,5 +1,4 @@ mkdir: %_DEST%\bin%_EXT%\osl -mkdir: %_DEST%\bin%_EXT%\broffice ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar @@ -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\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store ..\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\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat ..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi index 6484ef901e50..90fcdfea5633 100644 --- a/setup_native/source/win32/nsis/downloadtemplate.nsi +++ b/setup_native/source/win32/nsis/downloadtemplate.nsi @@ -275,24 +275,10 @@ ALLLANGUAGESPLACEHOLDER Function SetupBranding 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-br.bmp" WELCOMEBMPPLACEHOLDER_BR - - ; use broffice specific branding if we are in Brazil -; 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: + + SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp" + !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp" FunctionEnd ; Reserve files |