summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)AuthorFilesLines
2013-08-06Add AppUserModelID for all supported formatsJesús Corrius1-0/+11
Now only the ODF formats have AppUserModelID, but we need AppUserModelID for all supported formats so the Windows 7 recent documents works as expected. This patch only adds a few registry keys during the installation process on Windows. Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5 Reviewed-on: https://gerrit.libreoffice.org/5275 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-07-26Miscellaneous belts and braces around MsiShortcutProperty tableFridrich Štrba7-8/+8
These two strings are non-nullable so fail if they are null Change-Id: I7ea1a8faff96aca54f6bad5e811841f58aadd382 (cherry picked from commit 60c19683b5897beefa0e799b7efdc3e2b4da528e) Shorten the idetifiers a bit not to be more the 32 chars Change-Id: I5ee50ae740aa113670dad97067e78e063cca1a61 (cherry picked from commit 4155bc56ad2910d8acc5d6468eb1ee2a3cffcd20) Reviewed-on: https://gerrit.libreoffice.org/5121 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-25Add some consistency to the world as we know itFridrich Štrba7-8/+8
Change-Id: Ib1720a1797facf783eee9524afef7fadcd986c6f (cherry picked from commit 42b8705e7cca785efc7ffa234ddb49cca8168a0a) A Torsdag without typo would not be a Torsdag Change-Id: I305d8fb874f42c18de03255bc64160639defcb50 (cherry picked from commit 129a0d8c6f5da9cd536971507d0a7df056acccc6) Reviewed-on: https://gerrit.libreoffice.org/5097 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-07-25fdo#35785: Add MsiShortcutProperty table to the installerFridrich Štrba7-0/+48
This sets the different IDs for shortcuts and should help the jump-lists WIP: data for the new MsiShortcutProperty installer table Change-Id: If421383abe95738b8247aebc5cf43b1eaa346c39 (cherry picked from commit 20696b2a5741fcda3b9cff5fb41da4d2688312c4) OK, so this was not just a bogus stray mess :) Change-Id: I39287c4bf882438c409157ab5e4fa586f5289c5c (cherry picked from commit 6c098943d600db20640264d52792c09ae336fdfb) Some more fixups towards the MsiShortcutProperty table Change-Id: I961a2c05c175512ee1fb4b0f11d0da1d5eae1c71 (cherry picked from commit 7137605eefb6b4efe80c89c4468e33591b1e474f) Some more typos in perl code Change-Id: I2123a6f4cbac0c4870495a70f5f283b75d3a5191 (cherry picked from commit 748be656846d5d698a47f63735f2ef58763a1ef6) And a bit more of fixes Change-Id: Ib247391d83773cddc18e37d5e979552a13dd19eb (cherry picked from commit b36d311899fde2f80e22bcc034ab8c9bdd795b76) Another typo Change-Id: I57a9592359a171eb3a6f230f5de2dc44a44b7181 (cherry picked from commit 045a7c675d04c258fdf97c6178ca9ad106d47deb) Hopefully the last installement of my perl saga Change-Id: I2d437062e3ce468591621e7323cacb13789edf06 (cherry picked from commit 6205c58e262e9b82e815855199de462775fcd35b) And my hope was not true Change-Id: I41877db65b66fa3732040fc21f98a5f2be2fdcb7 (cherry picked from commit d72151ff930ff1961f2ab7b1e895958cdaabe91b) Reviewed-on: https://gerrit.libreoffice.org/5081 Reviewed-by: Jesús Corrius <jcorrius@gmail.com> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-07-24fdo#64916 put libsqlite3.so into instset on linux againDavid Tardon1-0/+7
Change-Id: Ib53b71d23575350d875abdfb2477bba7369c040f (cherry picked from commit 6ae0422de5b42fcf81e9d76f5a7b6ed16946fd21) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/5060 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-22fdo#35785 LibreOffice's support of recent documents in Windows 7 brokenJesús Corrius6-22/+22
Change-Id: I916ba1335b0a0420f568ab9340632f273e3c9516 Reviewed-on: https://gerrit.libreoffice.org/4997 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 19f3d9310caef84fe2815eb89af448a81937bddd) Shell32.dll is already loaded Since the vcllo.dll links already the shell32.dll because of its symbol SHAddToRecentDocs, no need to increase reference of that library. Just get the module handle. Moreover, a mere presence of the symbol SHGetPropertyStoreForWindow in shell32.dll indicates that we are running at least on Windows 7 or Windows Server 2008 R2. There is thus no need to check for the library version. Change-Id: I9ddfb8407fd805faf588779ac5fa8c10a0ae8898 Reviewed-on: https://gerrit.libreoffice.org/5016 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 50d330c3d238b7b6182787959b30a6d665eab078) Reviewed-on: https://gerrit.libreoffice.org/5024 Reviewed-by: Jesús Corrius <jcorrius@gmail.com> Reviewed-by: Tor Lillqvist <tml@iki.fi> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-12fdo#66072 do not end auto_*_ALL by a commaDavid Tardon7-9/+7
Reviewed-on: https://gerrit.libreoffice.org/4829 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit bd3aa6983796f9dedf85c446a0ce5e5505583809) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: scp2/source/base/module_base.scp scp2/source/calc/module_calc.scp scp2/source/gnome/module_gnome.scp scp2/source/graphicfilter/module_graphicfilter.scp scp2/source/impress/module_impress.scp scp2/source/kde/module_kde.scp scp2/source/math/module_math.scp scp2/source/onlineupdate/module_onlineupdate.scp scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/ure.scp scp2/source/tde/module_tde.scp scp2/source/writer/module_writer.scp solenv/gbuild/AutoInstall.mk Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939 Reviewed-on: https://gerrit.libreoffice.org/4831 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-09fdo#66703: Missing libjava_uno.jnilib symlinkStephan Bergmann1-3/+5
Regression introduced with c9c963d3e6991d0dd73a95fc9734e38683d5be9c "autoinstall ure private libraries." Change-Id: I8ea597e8d5108e925e982d7b37fa9e1d3af8d1aa (cherry picked from commit e83ce4d1495db41cb68142da771c10e61cda0fd9)
2013-06-12fdo#65485 also put the files into langpack moduleDavid Tardon1-0/+1
Change-Id: I0d331fc9a5591de60bba1959999ff29b2d43b058 (cherry picked from commit 2032586fee5be10038e52123c0332b21d0de1aa4) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-06-12fdo#65485 install .ui translations for writer againDavid Tardon1-0/+1
Change-Id: I8e8ad67058286aec94164a44dbd461078a792359 (cherry picked from commit 638ecac30d04a0f13e55f2566a9e318b9dbf02f0) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-06-07fdo#65168: Fix regressions introduced with de-extension-ing report builderStephan Bergmann1-1/+11
...in 90a326c7028d5af132c62edfaef77c53627e4c0e "fdo#61950 move report builder from bundled extensions to plain code": * For one, ReportWizard.startReportWizard (wizards/com/sun/star/wizards/report/ReportWizard.java) would still try to load reportbuilderwizard.jar from the unpacked extension (and, failing that, fell back to the old default engine, so this didn't cause any failure per se). Instead, reference reportbuilderwizard.jar (which was also missing from scp2) from report.jar's manifest Class-Path (which will always be OK, even if reportbuilderwizard.jar is not installed) and check for the relevant class via Class::forName directly. * For another, the en-US/wizard/report/default.otr template had gone missing. The way to find it inside the unpacked extension in the past was to include a Paths.xcu update that extends the Template path. Instead, install that template directly into share/template now, and drop the (unused already) Paths.xcu update. Change-Id: I09eca2b69aa55d5b15fb5ecfec6881f8a6f6e5e5 (cherry picked from commit e57eeb6d5f547a4a49df796641141c733f6c5204)
2013-06-04MPLv2 subset improvements.Michael Meeks3-2/+8
2013-06-03re-base on ALv2 code. Includes:Michael Meeks108-2455/+1532
Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1397337 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 Patches contributed by Andre Fischer Fixed getcsym.awk to handle #-comments that contain special regexp chars. http://svn.apache.org/viewvc?view=revision&revision=1230971 118778: Added ADDITIONAL_REPOSITORIES environment variable and its automatic setup in configure. http://svn.apache.org/viewvc?view=revision&revision=1232004 118160: Added external CoinMP library. http://svn.apache.org/viewvc?view=revision&revision=1233909 Patches contributed by Herbert Duerr #i119168# use generic LICENSE file for langpacks and sdks http://svn.apache.org/viewvc?view=revision&revision=1310178 macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars http://svn.apache.org/viewvc?view=revision&revision=1183367 allow gbuild with empty sysroot on linux http://svn.apache.org/viewvc?view=revision&revision=1179186 Patches contributed by Ingo Schmidt native373: #164472# improvements for msi database http://svn.apache.org/viewvc?view=revision&revision=1167540 http://svn.apache.org/viewvc?view=revision&revision=1167539 Patches contributed by Jurgen Schmidt adapt setup package scripts to handle special DS_Store file for developer snapshot builds http://svn.apache.org/viewvc?view=revision&revision=1232430 imported patch extensions_i117681.patch http://svn.apache.org/viewvc?view=revision&revision=1172102 Patches contributed by Michael Stahl gbuild: RepositoryFixes.mk should be optional http://svn.apache.org/viewvc?view=revision&revision=1166123 xslt filter: remove the FLA horror wordml import filter: replace FLA usage with plain XSLT http://svn.apache.org/viewvc?view=revision&revision=1363727 Patch contributed by Oliver-Rainer Wittmann i#88652: applied patch, remove unicows deps http://svn.apache.org/viewvc?view=revision&revision=1177585 Remove lots of OS2 conditionals, re-extract Rhino Java, unwind cppunit pieces, cleanup Mac image bits, remove coin-mp and re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand MPLv2 subset checking. Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-05-28make 64-bit shell extensions work, put 64-bit VC runtime in the same dirAndras Timar3-23/+49
Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is installed to the "system32" folder. Windows installer automatically replaces it to SysWOW64. The problem is that this way 64-bit dlls end up in the wrong directory. They conflict with the 32-bit dlls, and will not be installed. Therefore 64-bit shell extensions will not work, unless the 64-bit VC runtime is installed from other source. It is not possible to install both 32-bit and 64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012. For the 64-bit shell extensions, we can install the runtime dlls next to the files. Change-Id: I157048a521662bbac568d1660e46576935f0ea9f
2013-05-21do not second-guess help langs for installationDavid Tardon2-10/+3
Change-Id: I48484ca81008fe650aa9fa0eb561e3b2ff33399c
2013-05-18fix InstallModule_gnome.mk again, readd file_gnomeRene Engelhard1-0/+4
Change-Id: I2181322078055dd211e74cf5138ca4be691ef2d7
2013-05-18fix scp2/InstallModule_gnome.mk: s/file/module/Rene Engelhard1-1/+4
Change-Id: I626525a2d063bdefd74d06a5e02cc8ca1dc8ac03
2013-05-18s/lib/Lib/Rene Engelhard1-1/+1
Change-Id: Ic407ce886b1a857cb480f09ec4ef13ba3809338a
2013-05-18Revert "remove auto_Gnome_lib_ALL from module_gnome.scp"Rene Engelhard1-1/+1
.. now that it isn't empty anymore to actually install the GNOME stuff. This reverts commit bbd0c8eb921114d3a313284ccdc05d5de1fd995b. Change-Id: Ifa824f14c17fc5456e2aaebf2034282c40cd9c2d
2013-05-17bin obsolete suse and madriva desktop integration packagesPetr Mladek1-1/+1
The freedesktop solution has been supported by the Linux desktops for many years. It should be enough these days. At least the SUSE desktop integration has not been needed since about 2009. Change-Id: Ib5048bd062802f6e70403e81433ea68ca9dff177
2013-05-17We are here already in non MACOSX branchFridrich Štrba1-6/+0
Change-Id: I4196577d1caa24d52f5e734cb0817f2e943f12ed
2013-05-17fdo#60924: autoinstall gnome librariesMarcos Paulo de Souza4-90/+0
Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a Reviewed-on: https://gerrit.libreoffice.org/3813 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-17Let's assume nobody needs the sbase, scalc etc scripts on OS XTor Lillqvist6-0/+12
It's always possible to run the soffice executable from the same location with a --base, --calc etc command-line option instead. (That is not the normal way for Mac users to open an empty document for the specific aspect of LibreOffice (Calc, Writer, etc) either. Instead, the usual way (says cloph) is to keep a corresponding template document in the Dock and click that.) Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184 Reviewed-on: https://gerrit.libreoffice.org/3930 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-17No need for the soffice.bin identical copy of soffice on OS XTor Lillqvist1-0/+2
Change-Id: I1e133fb53e58da4ad5e3eb02163eb6082d895b15 Reviewed-on: https://gerrit.libreoffice.org/3931 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-16Entries for symlinks in the Python framework seem unnecessary nowTor Lillqvist1-217/+0
Change-Id: I63e0ceb42db5c561cafaae160259ee7f2658552c
2013-05-16Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks2-44/+18
Change-Id: Ie154eadd9960b159f5a250cde93c4bd7a8a948cf
2013-05-16Add the Versions/3.3/include/python3.3m directoryTor Lillqvist1-0/+12
Change-Id: If50acc088402487d8185198ee3841e3d82cd904c
2013-05-15gallery: allow disabling the from-source build in configureStephan Bergmann2-0/+5
Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629
2013-05-15install graphicfilter.xcd againDavid Tardon1-0/+4
Change-Id: I1091b4ff6b700513c7ef5ac41d94972dbb33dcb2
2013-05-15put auto-installed libs into the right moduleDavid Tardon2-1/+1
The definition of Auto_File_Libs_ALL was not known in module_hidden_ooo.scp, so it was left unexpanded and the unattached files were assigned to the gid_Module_Root. Change-Id: Ie7064da6e02394261a47e88526c073941625dc8c
2013-05-15scp2: only package the sdk if it is enabled.Michael Meeks1-2/+4
Change-Id: Id5798c97d3dcfd997ce56f7a7ea72660c9b86c63
2013-05-15gallery: fix a number of naming thinkos.Michael Meeks1-1/+1
Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085
2013-05-15migrate galleries to new, cleaner build infrastructure.Michael Meeks1-64/+9
Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d
2013-05-15remove pre-compiled textshapes and transportation galleries.Michael Meeks1-0/+6
Further gnumake fixups, package the files in the Gallery rules. Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
2013-05-15migrate transportation gallery.Michael Meeks1-7/+1
Change-Id: Idec88df28724bcf4b3145bb169fa0fe08a8e282a
2013-05-15gallery: convert text-shapes to new build logic.Michael Meeks2-15/+14
Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b
2013-05-15galleries: implement first self-built sound galleryMichael Meeks1-1/+8
Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15
2013-05-14always create dirs for autotext filesDavid Tardon2-1/+13
... thus avoiding an annoing warning when a user tries to use autotext. I think we can drop DEFAULT_TO_ENGLISH_FOR_PACKING now. Change-Id: I230341c8bf1c925c51a4059b93153d5cd83d5310
2013-05-13add Icelandic Hunspell dictionary and thesaurusBjörgvin Ragnarsson4-0/+31
Change-Id: Ibf2cb81f57d123825990c7bde90586b894b9cdcc Change-Id: I7ea382194476eeef7f83caa66c9115ed1da433b2 Reviewed-on: https://gerrit.libreoffice.org/3860 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-05-10Resolves: #i121407# Gallery reorganizations...Armin Le Grand2-0/+80
and additions of new themes (cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c) Conflicts: extras/prj/build.lst extras/source/gallery/bullets/makefile.mk extras/source/gallery/gallery_system/sg2.sdg extras/source/gallery/gallery_system/sg2.sdv extras/source/gallery/gallery_system/sg2.thm extras/util/target.pmk scp2/source/ooo/directory_ooo.scp scp2/source/ooo/file_extra_ooo.scp svx/inc/galtheme.hrc svx/source/gallery2/gallery1.cxx svx/source/gallery2/galobj.cxx svx/source/gallery2/galtheme.src vcl/inc/vcl/alpha.hxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/bitmapex.hxx vcl/source/gdi/alpha.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap3.cxx vcl/source/gdi/bitmapex.cxx (cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f) Conflicts: vcl/source/gdi/bitmap3.cxx Change-Id: If4b2397b889f914487f2135679250c175181e1df
2013-05-09fdo#60924: autoinstall graphicfilter librariesMarcos Paulo de Souza3-16/+1
Change-Id: I406ecef9bc1865d0cd17e3428bffaaaa137d972f Reviewed-on: https://gerrit.libreoffice.org/3829 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-05-09empty auto_Foo_Lib_ALL does not work; remove itMatúš Kukan1-1/+1
Change-Id: Ie66af9ad3959042dcc4b0850c387f40344dc4b30
2013-05-09fdo#60924 autoinstall - gbuild/scp2: add graphicfilter moduleMarcos Paulo de Souza4-1/+18
Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270 Reviewed-on: https://gerrit.libreoffice.org/3827 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-05-08remove auto_Gnome_lib_ALL from module_gnome.scpRene Engelhard1-1/+1
.. as it is empty anyway and otherwise the next item (evoab) doesn't get properly added to the gnome module Change-Id: Ib00093882ff7390f3c709f5e8d7bdc371b145331
2013-05-08fix the internal structure of MacOS X dmgDavid Tardon1-0/+10
Because of commit e70ea92b3632c376975dd85dbcb26e7ca6b95498 "scp: remove unused macros", which removed the top-level Applications symlink, the dmg contained an extra dir, e.g., LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86/LibreOfficeDev.app instead of just LibreOfficeDev.app . This symlink used by the installer to determine the dir to use as top-level for the installation (solenv/bin/modules/installer/simplepackage.pm:274). Also revert "Eek, it is hard to get the right path to the .app that is being built", which was only needed because of the other problem. This reverts commit 1c25b01fce27c85affee920441b9b09a7bfe0501. Change-Id: Ib5792c7710decd021a62cd33fd841ebe26613fbc
2013-05-08patchfiles are obsolete and not used for filelists anywayDavid Tardon1-3/+0
Change-Id: I148dab301bd2f2b31871b732c7392bf6b5d92392
2013-05-08PyWebWizard: Removed the Jar_web, relaced by the python version.Javier Fernandez1-1/+0
Change-Id: Ia76a2d4ce93bf338c6ca22fd2cd991b42c195ae4
2013-05-08PyWebWizard: Pack and register the Web wizard.Javier Fernandez1-0/+7
Change-Id: I8e43d228e842f24b054afc6bf59040667a6703d5
2013-05-08Force create the symlinks-only dirsStephan Bergmann1-0/+8
Change-Id: I4610a2ff5bebd50dd2ee0020b575490c6c490968
2013-05-07fdo#60924 autoinstall - gbuild/scp2: add gnome moduleMarcos Paulo de Souza4-1/+18
Conflicts: Repository.mk scp2/Module_scp2.mk solenv/gbuild/Helper.mk Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51