summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2012-08-01bump product version to 3.5.7.0, build id to 0Petr Mladek
Change-Id: I04f6411143d5921ccdee0609c612d4c0a4b82f11
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> (cherry picked from commit e0c8a659d18d33fec4f6aa648be82f2241dd75f6)
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> (cherry picked from commit 3e67572cc8bd057a0b7916bcaffb60618d18069e)
2012-06-12bump product version to 3.5.6-rc0+Petr Mladek
Change-Id: I8d03cd70127804607feedee908845660d1a43d0e
2012-06-08remove -fsigned-char from s390 to fix smoketest..Rene Engelhard
Change-Id: I66c468e917513cdb096937f9955eb8a41aabaa37 (cherry picked from commit b9cdff5477f830ca01237d95597ebe952e1cc031) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
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) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
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-07fdo#47805 rework handling of 64-bit registry entriesAndras Timar
64-bit registry entries were entered via a custom action, which did not always work. By default the custom action ran with user privileges, which were not sufficient to write the registry. It is not necessary to use custom actions for this task. Windows installer supports it well. Backported from 6d9be05a6fb251ed0cbcbcefd55ed174b1e8e39d Change-Id: I753612e32c56cd4101f1257d4f635b525cf09cf0 Signed-off-by: Fridrich Strba <fridrich.strba@suse.com>
2012-06-07Revert "Revert "sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove ↵Rene Engelhard
-fsigned-char"" This reverts commit 7ef203d2bf72f7d96fd10d1297af06e82550a1c4. Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-06-05Revert "sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove -fsigned-char"Caolán McNamara
This reverts commit 875c9a28f49c7a73607fcdfac245b648801dccee. because it doesn't make sense to build the dmake modules without -fsigned-char and the gbuild modules with -fsigned-char and we're still got a few bugs where we assume chars are signed Conflicts: solenv/inc/unxlngppc.mk Change-Id: I6ac07fa3ebadd83efd0da1ee69a010b62dfaad59 Signed-off-by: Rene Engelhard <rene@debian.org>
2012-05-23don't let the Mac/PPC linker complain when the symbol isn't usedChristian Lohmaier
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-05-23fdo#42865: privatized unique empty string symbol:Michael Stahl
Unfortunately this --enable-dbg-util only problem (caused by _GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based logging in sal; adapt all map files to export the unique symbol. Change-Id: I445efb9b621638efcea80b0b83846338ca42bf7d Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-05-23release branch only: -Wno-deprecated-declarations always onMichael Stahl
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-05-18fdo#48914 uninstall process should remove .pyc files from install directoryAndras Timar
When install location is writable to user (typical on Windows XP), Python generates .pyc files. We can remove them using the RemoveFile table in MSI. We generate an entry for each .py file in the install set. Change-Id: I314582d52162c6f3ae3acc72de9d620680fb23e0 Signed-off-by: David Tardon <dtardon@redhat.com>
2012-05-15bump product version to 3.5.5-rc0+Petr Mladek
Change-Id: Idc0be9f4258e816a909a37638a1125fa0c5e3f01
2012-05-15fdo#46519 workaround of MSI installer error 1935Andras Timar
In some circumstances installation of embedded VC++ runtime fails with error code 1935. This usually occurs, when there are many different versions of VC++ runtimes installed on the computer, including beta versions. We can workaround this Microsoft bug, if we don't install our VC++ runtime. A new property was introduced. It is called VC_REDIST, and installation of VC++ runtime depends on its value. (BTW the solution is general, ComponentCondition can be used for any merge module, now we have only the VC++ runtime merge module.) When the user experiences error code 1935, he should try to install LibreOffice with the following command line: msiexec /i <msi file name> VC_REDIST=0 The patch fixes another minor issue. 64-bit VC++ runtime will not be installed on 32-bit systems any more. Change-Id: I I6c5e066c6e60b011235e6019a8a35c9e953209bc Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-04-18bump product version to 3.5.4-rc0+Petr Mladek
2012-04-12pack "en" dictionary only with "en" langpacksPetr Mladek
it is in the main installation tarball anyway; it was put in langpacks that did not have its own dictionary from some strange reason Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
2012-04-11set correct value of FINDPRODUCT propertyAndras Timar
(cherry picked from commit ee7084c4f720c932df67c8ff033dab4d8d556179) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-11fdo#48411 Find install location during help pack installAndras Timar
(cherry picked from commit da2ec9aac3699c951c544a51acd6ab3aede706eb) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-10match version in about dialog and file properties (fdo#47840)Petr Mladek
bump VERSIONMICRO to 3 and reset buildid to 0 Signed-off-by: Andras Timar <atimar@suse.com>
2012-04-04always pass --headless to cppunitsTomáš Chvátal
They should not need any actual UI anyway, and most of them already pass the option manually. http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html This is partial code grab as cherry-pick had the test-mk files collisions all over the place. I pick only the additional define which results in some tests adding --headless twice, which does no harm. Author: Luboš Luňák <l.lunak@suse.cz> Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
2012-04-02filter-showIncludes.pl: Attempt to prevent creating incomplete .d files.Jan Holesovsky
(cherry picked from commit 3cf66a899ec1c8eed3a95b7f08824d5c8db0d0a8) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-03-26Revert "Revert "make gbuild follow --disable-dependency-tracking too""Luboš Luňák
Revert again, the option itself is correct. Resulting problems need to be fixed and the option should not be used now where it breaks. This reverts commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8.
2012-03-26Revert "make gbuild follow --disable-dependency-tracking too"Luboš Luňák
3-5 branch is not ready for this, there are a number of build failures. Okayed by Petr Mladek, but this is rather obvious. This reverts commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3.
2012-03-26make gbuild follow --disable-dependency-tracking tooLubos Lunak
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2012-03-23JavaClassSet: giving only changed java files to javac is bogusMichael Stahl
(cherry picked from commit 526a31be4c31fe519c14c16241a48729dd9aa465) Conflicts: solenv/gbuild/JavaClassSet.mk Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-03-20bump product version to 3.5.3-rc0+, release number to 300Petr Mladek
2012-03-16fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832Noel Power
(cherry picked from commit c3d806be7d30a437607d924a4d33f13fe20dd1ba) Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-03-02tabs -> spacesFridrich Štrba
2012-03-02fdo#46181 Use Traditional Chinese installer for zh-HK and zh-MO localesAndras Timar
Microsoft Installer thinks that it is a good idea to fall back to zh-CN from zh-HK and zh-MO. It is wrong, because zh-CN uses Simplified Chinese zh-HK and zh-MO use Traditional Chinese. So we need to fall back to zh-TW. Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-02-24bump product version to 3.5.2-rc0+, release number to 200Petr Mladek
2012-02-23Add shl/LOADER/URELIB to make --without-sytem-libxml work on Mac OS XStephan Bergmann
I doubt that the "LOADER" token is needed at all, but will investigate that later.
2012-02-22Don't misuse CLASSPATH for what goes into the -cp option to javacTor Lillqvist
CLASSPATH is supposed to show where to find the classes needed by Java programs running at build time. The -cp switch to javac tells where to find classes referenced by the code being compiled. These are different things. (But it doesn't seem to have mattered much in our build system.) So use T_CP instead, named in the same fashion as T_CXXFLAGS etc. But... for some reason this change, which as such should be just more or less cosmetic, also fixes a build problem in the "scripting" module on Windows, seen by Noel Grandin (http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/19016 ) and me. Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-02-20gdb: don't barf on non-ASCII text in SwTxtNodeMichael Stahl
Because the default text encoding in Python 2 is "ascii" these would throw a UnicodeEncodeError: 'ascii' codec can't encode character... Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-02-17use bzip2 compression for dmgNorbert Thiebaud
On MacOSX the installable packages (dmg), can use diverse format and diverse compression method. Since 10.4 a new format is supported that use bzip2 as a compression back-end. The result if a reduction of ~30MB of the main dmg. Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2012-02-14gbuild: Executable.mk: don't build unregistered exesMichael Stahl
(cherry picked from commit 5a0ab1a45858f4f7336f6dbdc218502cc31f0168) Signed-off-by: Rene Engelhard <rene@debian.org>
2012-01-26solenv: handle error code from ./gMiklos Vajna
This avoids "Cannot find the git binary! Is git installed and is in PATH?" strings in the about dialog when building from a tarball. (cherry picked from commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae) Conflicts: solenv/bin/modules/installer/scriptitems.pm
2012-01-24bump product version to 3.5.1-rc0+, release number to 100Petr Mladek
2012-01-20Fix WiLangId.vbs operationFridrich Štrba
The script needs %TEMP% to be set in order to work properly. Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the TEMP variable to $TMPDIR before we call the cscript.exe. Signed-off-by: Michael Meeks <mmeeks@suse.com>
2012-01-20fdo#44915 MSI installer l10n bugAndras Timar
Unfortunately msiinfo.exe has a limitation, it truncates Language property in Summary Information at char position 254. The replacement, WiLangId.vbs does not have this limitation. Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-01-19Report backtraces for all threads.Stephan Bergmann
(cherry picked from commit 54a918bbfba47734d414832755e35434da103ed5) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-01-19honour JAVAFLAGS in gbuildRene Engelhard
2012-01-18bump product version to 3.5.0-rc1+, release number to 11Fridrich Štrba
2012-01-17gbuild: UnoApiTarget: initialize target local varsMichael Stahl
Fixes the problem in offapi, where a rebuild after changing an IDL file would produce an offapi.rdb that contained the stale content of the old version of the IDL file. This was because in offapi 2 rdb files are built, offapi.rdb and types.rdb, and types.rdb is a merge of udkapi.rdb and offapi.rdb, hence it depends on offapi.rdb. Unfortunately this means that the UNOAPI_MERGE variable for types.rdb is inherited to offapi.rdb, with the result that after the workdir offapi.rdb is built from .urd files, it is overwritten by a merge of udkapi.rdb and a stale offapi.rdb from the solver. (cherry picked from commit f25ef2b904652ab3162c61864eeb5a2381bb796f)
2012-01-14gbuild: UnoApiTarget: fix dependenciesMichael Stahl
This should fix the bug, probably introduced with the per-directory performance enhancements, that after a change to an IDL file 2 builds are required to rebuild everything. (cherry picked from commit 26450b3136979db86577591ef380040972d111fc)
2012-01-14grml.. back to the drawing boardEike Rathke
Reverted 80f60ef540528ec5304b9fb9624a7ff1b077f108 cf1f87948bcf9b8edf8487fa7938a928cfed8f2f as also MinGW bails out. Don't add yet more quirks, keep in mind the faulty behavior and hope for the best until solved.
2012-01-13make MacOSX happy again and have no /usr/include thereEike Rathke
Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4
2012-01-13ensure that /usr/include is _appended_ to INCLUDEEike Rathke
At least with gcc 4.6.2 the situation was that if /usr/include was missing from the -I... includes, header files were pulled from /usr/include/ instead of solver/$INPATH/inc/external/ This clearly makes a difference for not --with-system-... libs where the internal version is to be used.
2012-01-10bump product version to 3.5.0-beta3+, release number to 3Petr Mladek
generated by cgit (git 2.34.1) at 2024-06-26 18:52:20 +0000