summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2012-11-07bump buildid to 302 and version suffix to -2Petr Mladek
The build is based in the upstream 3.6.3 and will be called SUSE 3.6-rc2 Change-Id: I04337c2d4001eec123cfb1fe1043b4955a5bba2d
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
2012-10-10bump product version to 3.6.3.1+, release number to 1Fridrich Štrba
Change-Id: Ie46423f68c2404ff3237ef0979c72413ab72bdfe
2012-10-08drop the word 'PTF' from .msp nameAndras Timar
Change-Id: Ia7cc4351644013e2b94c8e8408b89ed66b0e18ff
2012-10-02fdo#52268: splash: change color and position of messagesIvan Timofeev
Change-Id: If6c607fc9f0be1f7a71eda8d555399451938c5fc Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2012-09-28fdo#54276 speed up packaging on Windows significantlyAndras Timar
See the bug for more details. Change-Id: If77544f2fbec2793b6edb015d9447569c6a4e215 Signed-off-by: Fridrich Strba <fridrich.strba@suse.com>
2012-09-28[SUSE only] add EULA (dummy text for now)Andras Timar
Conflicts: instsetoo_native/util/openoffice.lst readlicense_oo/makefile.mk Change-Id: I3a4ed94dbd5cf1c31e082f25d2fa63e201333885
2012-09-28revert fc1e9f253dd07362065f2be9691be89fb9b3f84fAndras Timar
I don't know, if it made sense, but it definitely broke MSP patch creation in SUSE environment, so I reverted it. Change-Id: Ib6cea4a59993b4edadabfa1fdca42264a8eb2311
2012-09-28work around unexpected behaviour of msidb.exe from SDK 7.1Andras Timar
Change-Id: I48cfa19c40140dc81b105e27051f99e8f1a0c8ae
2012-09-28set MSP nameTor Lillqvist
Change-Id: Ib1120ea82a8e3e9d15d524ff413a1342dec3dad0
2012-09-27set version for the initial SUSE 3.6 buildAndras Timar
Change-Id: I5ce3e920885def19b93ae103b63b9c5dfef6d94e
2012-09-25bump product version to 3.6.2.2, release number to 2Fridrich Štrba
Change-Id: Ie362470f6dd615b73b46fafc7ca4c2b181b69673
2012-09-24fdo#54276 speed up packaging on Windows significantlyAndras Timar
See the bug for more details. Change-Id: If77544f2fbec2793b6edb015d9447569c6a4e215 Signed-off-by: Fridrich Strba <fridrich.strba@suse.com>
2012-09-20wntmsc.mk: disable warnings-as-errors for binfilterMichael Stahl
Change-Id: If5ac0aa620d514ca4affe2b20d647a9e9129032e (cherry picked from commit 158a7c73bb0a701b12fc3e2e96eff965c73435cc) Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-09-12bump product version to 3.6.2.1+, release number to 1Fridrich Štrba
Change-Id: I784eede0b5aa06c90bd0caa427f9c16aae07ba79 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-09-11bump product version to 3.6.3.0+, reset number to 0Petr Mladek
Change-Id: I6544aac1c4bbe6203f2364ce069ad0efa0c1cd14
2012-09-10gbuild: disable symbols on --enable-dbgutil --disable-symbolsMichael Stahl
Due to the setup of gb_DEBUGLEVEL in gbuild.mk, gb_SYMBOL was always enabled when --enable-dbgutil is set, with no way to override it. Fix that by turning configure's ENABLE_SYMBOLS into a tri-state, where the new "FALSE" value, set by an explicit --disable-symbols, overrides any implicit way of enabling symbols. But by default an --enable-dbgutil still enables gb_SYMBOL. Change-Id: I94c609863980ed1ab9c73d7a4861c394442b531d (cherry picked from commit d9cbc837f84c415f5949a6893764dae8268f0d85) Reviewed-on: https://gerrit.libreoffice.org/572 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2012-09-05fdo#53009: Compile extension help in gbuildStephan Bergmann
...as had been done in the old build system (solenv/inc/extension_helplink.mk). Especially for bundled extensions, this removes the need to compile the help data per user on first start. gb_Extension_add_helpfile(s) replaces gb_Extension_localize_help, and takes care of all the steps (localization, compilation, inclusion in .oxt), even for the en-US data (which was handled with additional gb_Extension_add_file calls before). (cherry picked from commit b23bb8e0de3dbdc2c66c3dedf70dfd318868f76c with additional fixes from follow-up commits 152ffaa15f963f92b1564946a648c53d6b5c808c "Call HelpIndexer/Linker with gb_Helper_set_ld_path" and a297372210396260da57f34da3790f76682603cc "Quote .ddf content (potentially containing stuff like '%2F')") Conflicts: solenv/gbuild/Extension.mk solenv/gbuild/ExtensionTarget.mk Change-Id: Ie4bab66d3cad2b713780a23bf2606ca56cfff37f Reviewed-on: https://gerrit.libreoffice.org/563 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-08-29fdo#53888: svx: do not link against dbtoolsMatúš Kukan
dbtools were added in 01089138cc76f5717244bd04f25a868602aeaab6 only to create dependency and fix the build. This creates circular dependency for libmerged, dbtools is not that common library. It's better to create real dependency in connectivity_inc package. To avoid another circular dependency gb_YaccTarget_get_header_target must not depend on external headers target. Change-Id: I431513d0b7a895b471eeec854b3b3f1fd69503af Reviewed-on: https://gerrit.libreoffice.org/470 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-08-29installer: remove empty directories again:Michael Stahl
An "archive" installer contains one empty share/extensions/dict-XY/ directory for every dictionary (except the 3 default ones), causing numerous assertions about missing META-INF/manifest.xml and an extension manager cluttered; this is due to overzealous removal of extension "prereg" code. (regression from 6dcb3d4ef46312729bb6f16c473b433474863f68, partially revert that) (cherry picked from commit 8098a03d025a0c8fee90322e3835079edb45ade3) Conflicts: solenv/bin/modules/installer/simplepackage.pm ...plus cherry-pick of follow-up 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977 "...but remove obsolete prereg-specific code again." Change-Id: I3a063ebfed1012aeb27ec3076cdd5ca545f918a2 Reviewed-on: https://gerrit.libreoffice.org/464 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-08-24gbuild: also in libmerge case library needs to depend on all headersMatúš Kukan
Change-Id: I4ea33f03594c83568f93c036e3143f84e72e2983 Reviewed-on: https://gerrit.libreoffice.org/471 Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz> Tested-by: Tomáš Chvátal <tchvatal@suse.cz>
2012-08-22fdo#53888: fix YaccTarget/LexTarget dependencies:Michael Stahl
These cannot be order only because if the source file is changed the generated cxx file has to be recompiled as well. Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379 (cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c) Reviewed-on: https://gerrit.libreoffice.org/450 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2012-08-20concat-deps.c: add || defined (__FreeBSD_kernel__) for arch-specificsRene Engelhard
Change-Id: Ie321ada6d2c078881fdedc61d72c94034297fea3 (cherry picked from commit 410b6f01f07f8f1a84f2118c71735cdbb5331d5f) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-08-17Revert "fdo#49919 Don't default to desktop pollution"Jan Holesovsky
If somebody made a mistake in his / her preferences during installation, it is much easier to remove the unwanted icon, than to add it. This reverts commit 6af68b494dafcc6822463a0445692929735eb0af. Signed-off-by: Stefan Knorr <heinzlesspam@gmail.com>
2012-08-14bump product version to 3.6.2.0+, reset number to 0Petr Mladek
Change-Id: I8035825fcd581c1d4a5646781207641aee63ae38
2012-08-13Related fdo#51252: No more prereg, no more unopkg syncStephan Bergmann
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying share/prereg/bundled to avoid startup crashes" removed the use of share/prereg, there is no longer need to generate it in the first place (by calling "unopkg sync" at build or installation time), and so no need for the "unopkg sync" sub- command, either. This also allows to simplify some of the jvmfwk code that was only there so that "unopkg sync" (which can require a JVM) can work in "hostile" environments (during build and installation). Conflicts: setup_native/prj/d.lst Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f Signed-off-by: Andras Timar <atimar@suse.com>
2012-08-02gbuild: WinResTarget: fix dep-target dependencies:Michael Stahl
Windows specific fallout of 8b5a984d45005d3df1c89eae897d6e04612625d8, similar to 236055746ffe92ce3b2a7a9316b1083da046deb9; can be observed by building with "make check" from scratch, on the "subsequentcheck" target one res file depends on some lngconvex executable by way of a custom target in shell, which causes udkapi to rebuild itself before the make restart. Change-Id: I14f370a66f4ac5088da4af7eceede09f5a6bae84 (cherry picked from commit 8a05f1265e6307c34b2ffdb5fc5279870c8397b7) Signed-off-by: David Tardon <dtardon@redhat.com>
2012-07-30gbuild: let JunitTests run with MSVC:Michael Stahl
Apparently the long path name hack is no longer necessary; at least i did not experience any obvious problem with a source tree rooted in D:/lo/master. Change-Id: I2fd1893a827c27b5dcee438eae6572c596ae907c (cherry picked from commit 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-07-30gbuild: need to set gb_Helper_LIBRARY_PATH_VAR for MSVCMichael Stahl
Change-Id: Ic23e6e26093ed381a1930ee6d3c1bc04ac2625b9 (cherry picked from commit 184179f583d26c26639781e65eb75afc13e0a149) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-07-30gbuild: un-break setting classpath on Windows:Michael Stahl
Apparently LO patched GNU make 3.82 interprets the semicolon which is the value of $(gb_CLASSPATHSEP) as a terminator if it occurs while setting a target local variable; the part of the value that follows the first semicolon is cut off. Hence escape the $(gb_CLASSPATHSEP) and $(XCLASSPATH) vars. Change-Id: I213dba7155f9515e492c20cfff3bef1c4d8269fc (cherry picked from commit 111e10bd401b3fee981f32f5f98fc7512a5c47f8) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-07-17bump product version to 3.6.1.0+, release number to 200Fridrich Štrba
Change-Id: Id22777baf4f15f09756af09254b56ce28b455a0e
2012-07-11gbuild: sigh... that didn't help... let's try an eval hereMichael Stahl
Change-Id: Ief6367a5fb8e2e1000bb94c7a4e6cf2095b24543 (cherry picked from commit 9991c0f552bfc9c6ea3e6e6d65fe67cc32f243fd) Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
2012-07-11gbuild: remove trailing \ that is apparently...Michael Stahl
... causing LO patched make 3.82 to fail with "Malformed target-specific variable definition" on the next line. (cherry picked from commit c854d36984789c1ffac8c83c929406c10ba99462) Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
2012-07-11bump product version to 3.6.0.1+, release number to 101Petr Mladek
Change-Id: I9e5d752a6120a76d28dba8de258ec5998131ef53
2012-07-04bump product version to 3.6.0.0.beta3+, build id to 13Petr Mladek
Change-Id: Icfe105ed9bf22e8569b952c3022cf2a41f858fac
2012-06-26fdo#51115: gb_Extension_add_file: fix Windows build:Michael Stahl
The DLL is not actually a make target, but is handled via the AUXTARGETS mechanism in LinkTarget.mk; add an ugly hack here to hopefully make adding libraries to extensions work. Change-Id: I85ee891fe8b7d470e09d9cb1d5a48d8b11b50d6e (cherry picked from commit e818f8fa1f79c2eb2d647678333b8d12599dda69) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-26gbuild: add gb_CppunitTest_use_executableMichael Stahl
and use it in sdext/CppunitTest_pdfimport.mk, which could fail previously in a parallel build. Change-Id: I3f251c945f5841c277a71a19fd411ecd77dec3b5 (cherry picked from commit 0d4cd11c74cf90cd3b987f628031d02fe3af47b4) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-25gbuild: add gb_Extension_add_executableMichael Stahl
This is not really necessary, but consistent. Change-Id: Ic0249efac26c9977ede7ef591d517cc03542b002 (cherry picked from commit efb69f7c737f8f8dae876c8d6b7bf3968a40676d) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-25fdo#51115: fix sdext extensions on Windows:Michael Stahl
The sdext extensions contain the .lib link stub instead of DLLs; add gb_Extension_add_library to get the correct DLL filename on Windows, and use it in presenter screen, presentation minimizer and PDF import extensions. Change-Id: Ie8113a6002f9038e4df798edc255208977ba9497 (cherry picked from commit f0de66d9a541505e14261ffac08e021bce6b67ba) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-25gbuild: fix UnoApiTarget header dependencies:Michael Stahl
The existing situtation of not having any explicit rules for header files does not work because it requires a make restart after the headers are generated in order for the headers to be delivered. Because requiring running make twice to get a complete rebuild is bad, add some rules to force the headers to be delivered immediately. Change-Id: I5b4d5c8f8e9c9d7d0874fc797e62972eaa1dd904 (cherry picked from commit 55c37591b63a5e9e7c8537679db8e92c7f0161c0) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-25bump product version to 3.6.0.0.beta2+, build id to 12Petr Mladek
Change-Id: I5c4bbf9ca2b24aea49cedfd4f6e67f476a0f7764
2012-06-21fdo#51274 optionally associate Visio file types (vsd/vst) to DrawAndras Timar
Change-Id: I0362d758205e7d12484e9e86ff2dce9608730c57
2012-06-21fdo#49919 Don't default to desktop pollutionAndras Timar
Change-Id: I4b9fda0f81d43cab80a015a2eb7374a94f3da7de
2012-06-19do not repeate twice .0.0.beta1 in the download tarball namePetr Mladek
PRODUCTVERSION is associated with SHORT_PRODUCTEXTENSION. ABOUTBOXPRODUCTVERSION is associated with ABOUTBOXPRODUCTVERSIONSUFFIX. We should not mix these another way. Change-Id: I991f74e058d19ec3ae0d98e8efe8458d648ae74c
2012-06-19use ure instead of ure-linkDavid Tardon
Change-Id: I5368770926aee871e20b2d87fa51b28212c8be4f Signed-off-by: David Tardon <dtardon@redhat.com>
2012-06-18change the way par files for ins are collectedDavid Tardon
This avoids the need for $(wildcard), which seemed to cause problems in some cases (in gentoo ebuild) and I never found any missing dependency that might account for it. Change-Id: Ia03d630bb85309fbb7da3068c396834fb56cffb1 Signed-off-by: David Tardon <dtardon@redhat.com>
2012-06-14bump product version to 3.6.0-beta1+Petr Mladek
Change-Id: I244bd6e896a11a1209dca059a8040bbefb6318be
2012-06-08Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and s390[x]Caolán McNamara
i.e. restore #i81127# to remove -fsigned-char from old-school dmake ppc[64] flags, but also remove them from the new-school gbuild ones. correspondingly remove -fsigned-char from the very similar s390[x] arch equivalents and drop them from the very obscure linux ports where I just cut and paste them in the first place. with 6b3bf27cb56d661725ac3fcfb756562e0ad75564 in place this now passes smoketestdoc for me on build from scratch on ppc[64] and s390[x] Change-Id: I3dae70fd7a3d3adc57cf04a02350689ad097e4d3 (cherry picked from commit 567147acbc8dcbb6c43652ac6b326759b48df9da)
2012-06-08signed char is default on m68k...Rene Engelhard
Change-Id: I5b57e8e9a9dce3eacc665979844f8cb29f968368 (cherry picked from commit c6b5b20d0a9506ae35421836940bbd1b0e86a3d4) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-06-07gbuild: introduce gb_Package_Package_internal:Michael Stahl
The gb_InternalUnoApi_set_xmlfile function creates a new package, which registers at the current Module, overwriting the InternalUnoApi targets set there and causing make clean not to clean the InternalUnoApi. Change-Id: I46e9b4437788a479701187334325fe1e065e612c (cherry picked from commit 31a353719851b08664b7f13ca59f39a993e66ba6)
generated by cgit (git 2.34.1) at 2025-02-05 23:51:59 +0000