summaryrefslogtreecommitdiff
path: root/solenv/inc
AgeCommit message (Collapse)Author
2012-11-11Merge branch 'master' into feature/killsdfAndras Timar
Conflicts: Repository.mk RepositoryFixes.mk connectivity/prj/build.lst extensions/prj/build.lst filter/prj/build.lst fpicker/prj/build.lst l10ntools/StaticLibrary_transex.mk saxon/build.xml shell/prj/build.lst solenv/gbuild/AllLangResTarget.mk solenv/gbuild/Configuration.mk solenv/gbuild/UI.mk ucb/source/ucp/webdav/webdavcontent.cxx
2012-11-09binfilter.die.die.dieNorbert Thiebaud
Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3 Reviewed-on: https://gerrit.libreoffice.org/1014 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-03Set BUILD64, not sure if actually neededTor Lillqvist
Change-Id: I9e301d5887a7ca13c9abed56da433ef8b1498a07
2012-10-26minizip is not used anymoreDavid Tardon
Change-Id: I0ddc4d343882248d208c9f96366625bcbe6ac4f7
2012-10-22make dmake use C(XX)FLAGS from the environment tooLuboš Luňák
Change-Id: I2214674181c137a312b0109e7d19a1fd2fc942be
2012-10-22clean up configure options for debugging buildLubos Lunak
By default a product (non-developer) build is done. Code is optimized and no debugging information is included (may be overriden though, see below). Developers should preferably build with --enable-dbgutil , or at least --enable-debug. The --enable-symbols switch has been removed. Use explicit CFLAGS/CXXFLAGS/LDFLAGS instead if needed. With --enable-debug optimizations are turned off and debugging information is included (in order to make it possible to examine the code in a debugger). Additionally assertions and logging is enabled (see SAL_WARN/SAL_INFO documentation for details and better control). This switch should primarily by used for occassional development (such as when it is needed to debug one module in a non-debug build, see also 'make DEBUG=true' below). Using --enable-dbgutil is the recommended developer option. In addition to --enable-debug it also enables additional checks, such as debugging mode for STL or checking compiler plugins. This switch may also enable additional logging from obsolete debugging tools (which should be converted to SAL_WARN/SAL_INFO for better control). Note that this option makes the build binary incompatible from a --disable-dbgutil build, so it is not possible to mix them. When using --enable-debug/--enable-dbgutil , the build is noticeably larger because of the included debugging information (compiler -g option). When disk space is an issue (or the computer is not very powerful), the --enable-selective-debuginfo option allow specifying where the debugging information should or should not be used. The option takes a list of arguments, where all means everything, - prepended means not to enable, / appended means everything in the directory; there is no ordering, more specific overrides more general, and disabling takes precedence). For example, --enable-selective-debuginfo="all -sw/ -Library_sc" enables debugginfo for everything except for anything in the sw module and the sc library. Explicitly specified CFLAGS/CXXFLAGS/LDFLAGS override optimization and debugging options (can be now also passed to configure which will make the build system use them). If in a non-debug build it is needed to temporary build something as a debug build, 'make DEBUG=true' temporarily works as if --enable-debug was specified. It also temporarily overrides debuginfo disabled using --enable-selective-debuginfo. Old code using old logging functionality also has a concept of a debug level, forced using 'make DBGLEVEL=2'. Using a debug level of 2 (or higher) enables additional logging output. New code should use SAL_WARN/SAL_INFO and use extra areas for additional logging output that can be selectively enabled/disabled using SAL_LOG variable. (Some smaller parts of this design will be implemented by separate follow-up commits.) Change-Id: Ia6420ee3c99c217ead648e8967165eed7f632258
2012-10-13Merge branch 'master' into feature/killsdfAndras Timar
Conflicts: Makefile.top Module_tail_build.mk RepositoryExternal.mk RepositoryFixes.mk accessibility/source/standard/vclxaccessibletoolbox.cxx basic/source/uno/dlgcont.cxx connectivity/Library_ado.mk cross_tail_build/prj/build.lst desktop/source/offacc/acceptor.cxx filter/Library_PptImporter.mk filter/source/t602/filterenv.cxx i18npool/Library_textconv_dict.mk ooo.lst.in saxon/ExternalProject_saxon.mk saxon/build.xml sc/sdi/scalc.sdi sc/source/filter/xml/xmlstyli.cxx sc/source/ui/condformat/condformatdlg.cxx sc/source/ui/condformat/condformatmgr.cxx sc/source/ui/view/cellsh1.cxx sdext/source/pdfimport/misc/pwdinteract.cxx shell/qa/zip/makefile.mk shell/qa/zip/testimpl/makefile.mk solenv/gbuild/CppunitTest.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/android.mk solenv/gbuild/platform/com_GCC_defs.mk solenv/gbuild/platform/macosx.mk soltools/Executable_adjustvisibility.mk soltools/Executable_checkdll.mk soltools/Executable_cpp.mk soltools/Executable_javadep.mk soltools/Executable_makedepend.mk sw/qa/extras/rtfimport/rtfimport.cxx tail_build/prj/build.lst tomcat/ExternalProject_tomcat.mk ucb/source/ucp/webdav/webdavcontent.cxx xml2cmp/Executable_xml2cmp.mk
2012-10-12do not play stupid games with jpeg vs. jpeglibDavid Tardon
Change-Id: I72ed637ecec5aff7528ff724b2665e22650c224b
2012-10-11Use DISABLE_DYNLOADING on AndroidTor Lillqvist
IN this branch these changes are not conditional. Unclear yet whether this is what we finally will want to use or not. Maybe should make these changes conditional and do this stuff in master instead? Change-Id: I379d570a0e00648d295c675fd90eba6594ba3182
2012-10-04Clean up HAVE_THREADSAFE_STATICSStephan Bergmann
Change-Id: I042269aabaa2e9952c5d2f41cf93e55d654f6313
2012-10-03Rule to generate ..._description.cxx via xml2cmp appears unusedStephan Bergmann
Change-Id: I59ced6720bdfd2df7a8ed7d9247887a09beeb8fd
2012-10-03No code sets COMPnTYPELIST any moreStephan Bergmann
Change-Id: I6ef6a7dea7a5f594b907546e8dff39c3640d7509
2012-10-01No need for BITNESS_OVERRIDE in makefilery as CPU etc work fineTor Lillqvist
Change-Id: I59f4d5ad275af62c997723908754112c062a31be
2012-09-30Use po for merge of readme.xrmZolnai Tamás
And delete old dmake rule Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5 Reviewed-on: https://gerrit.libreoffice.org/738 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2012-09-29No need for BITNESS_OVERRIDE in makefilery as CPU etc work fineTor Lillqvist
Change-Id: I59f4d5ad275af62c997723908754112c062a31be
2012-09-28Merge branch 'master' into feature/killsdfAndras Timar
Conflicts: l10ntools/Module_l10ntools.mk l10ntools/source/merge.cxx solenv/gbuild/AllLangResTarget.mk solenv/gbuild/ExtensionTarget.mk solenv/gbuild/InstallModuleTarget.mk solenv/gbuild/TargetLocations.mk
2012-09-24Check DISABLE_DYNLOADING, not just iOSTor Lillqvist
Change-Id: I839137b19c802c45eed73bae57beac81973d8da3
2012-09-22neon: convert to gbuildMatúš Kukan
Change-Id: I1cca0e3be7e148c835af26d2c001878b849e8432
2012-09-20Use po file for merge 1. stepZolnai Tamás
Make executables to waiting for po as input Add some function to po files Rewrite makefiles to use po files for merge Change KeyId generator not to use xml special charachters One filetype remain: properties Change-Id: If2bd2ae7afc61518c2d838a3cae301ef62dd9761 Reviewed-on: https://gerrit.libreoffice.org/593 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-09-20Move -isysroot from gb_CFLAGS/gb_CXXFLAGS to CC/CXXTor Lillqvist
That is a much better place for it. The gb_C(XX)FLAGS don't get passed on to "external" modules, so they should not contain flags that are essential for the compilation to work at all. I think. At least for me, in my MacOSX SDK 10.4 -based build tree, using Xcode 3 installed in /Xcode3, on OS X 10.8, the -isysroot is essential for liborcus to compile. Change-Id: I1f11c690585e4ba512eb87d2fddf11872b91dd57
2012-09-20Add typedefs not in the 10.4 SDKTor Lillqvist
Change-Id: I67f6c5392feda674b3d7d53b5dd20ec86e4f9023
2012-09-19Start on experimental support for 64-bit Mac codeTor Lillqvist
Rename the --enable-cl-x64 switch to --enable-64-bit and make its meaning more generic. Drop the CL_X64 config variable, introduce the more generic BITNESS_OVERRIDE instead. Does not build yet. Change-Id: Iac66afe31dceaf40c8262fec2e5aef6a751ba3d2
2012-09-15Let --enable-assert-always-abort affect setting NDEBUG directlyStephan Bergmann
For one, assert.h is designed to be includeable multiple times with changing NDEBUG settings, so it is not robust to include it early in sal/macros.h with "correct" NDEBUG settings and potentially include it again later. For another, there is #ifndef NDEBUG code providing functionality used exclusively within assert calls, which must be compiled with the same NDEBUG-setting as the relevant #include <assert.h>. Change-Id: I7b2f9c85f8e2155051274757c64162ed5a5e9d1b
2012-09-10we don't need exslt for dmakeDavid Tardon
Change-Id: Id8cec9932c9c3bd76f0b1e50038582ae64a6f879
2012-09-10build and deliver internal libexslt. Use LIBEXSLT_LIBS is system xslt is usedPeter Jentsch
Change-Id: I7ab624bc4877af51d4182ab213ef49cd8c5bb2a4
2012-09-06gbuild: 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
2012-08-31boost: convert to gbuildMatúš Kukan
Change-Id: If3840e048edc93adec3df7fa818e8b43d17cb1d5
2012-08-31extension_helplink.mk is no longer usedStephan Bergmann
Change-Id: I54e7753f7123ed447253901d2251730371bef7b0
2012-08-31-DRTL_USING for dmake modules as wellCaolán McNamara
following logic of 608025986 Change-Id: I016b76bf350432a29e02d528814584c5dbbfff61
2012-08-29ecj knows about -source -targetCaolán McNamara
Change-Id: Ieb26135bb5eeee5cd472becf704e75bcbeeb8518
2012-08-29fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGINJung-uk Kim
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>: * bulk replacement of "-Wl,-z,origin,-rpath,..." with "-Wl,-z,origin -Wl,rpath,..." * additional hunk for directory/c-sdk/config/FreeBSD.mk in moz/seamonkey-source-1.1.14.patch did not apply and has been dropped Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
2012-08-16For kicks, enable cross-building for Android on MIPSTor Lillqvist
Change-Id: I6fa2b9a50c525fb2d8666a144409eb9a3ad2698a
2012-08-02gbuildify autodocCaolán McNamara
Change-Id: I587be109e33b91ba08eb5d2b51c265e39ce797e0
2012-08-02gbuildize cosvCaolán McNamara
Change-Id: I73eb612edaba21aa5bb07577b42bd31f8de2dd2a
2012-08-02sablotron gone for yearsCaolán McNamara
Change-Id: Ib62f0595c42bc4bd8f5c55c8d3de19e92dfe9698
2012-07-30Avoid -z dynsort, https://issues.apache.org/ooo/show_bug.cgi?id=116423Tor Lillqvist
gold doesn't have -z dynsort, so instead of introducing gold ifdefs, just don't bother with -z dynsort. See the bug for discussion. Change-Id: Icfb8395523127d79c30b688420c469ae50ed2dad
2012-07-29Partially revert "Remove unused defines"Thomas Arnhold
This partially reverts 00240d049790d11c4ef35de7a294819107197efd http://lists.freedesktop.org/archives/libreoffice/2012-July/035331.html Change-Id: Ib682cd258cca12e742be5fb1715b2aecfe0a761e
2012-07-23Define also MACOSX_SDK_VERSION in compilationsTor Lillqvist
Change-Id: I1f9810b1230c4e3e5ca0571e5392297c1daf6a47
2012-07-20android: x86 porting work.Michael Meeks
2012-07-20Support for --with-java-target-version in gbuildStephan Bergmann
...had been missing. Old dmake-based build system did not add -source/-target when using gcj (unless gcj really was Eclipse Java Compiler, in which case those -source/-target values were tunneled in via JAVAFLAGS)---hopefully all this is no longer necessary. (Also removed a single use of JAVA_TARGET_FLAG that was nowhere defined.) Change-Id: Ic3596691b622be45e151333981f8f236d11825b4
2012-07-17for external modules add a dependency on the makefile.mk itselfCaolán McNamara
so that on version bumps and/or added/removed patches that we rebuild them from scratch, which hopefully will make incremental builds post external module bump pain-free Change-Id: If268401a2794989d49861c08f7a69ef926cf5809
2012-07-16First attempt at removing mozilla ldap at all (please help to fix)Fridrich Štrba
Change-Id: I0559cf1820c782d22c4d75749f2171d7702b4e73
2012-07-13wntmsc.mk: disable warnings-as-errors for binfilterMichael Stahl
Change-Id: If5ac0aa620d514ca4affe2b20d647a9e9129032e
2012-07-10solenv/inc: SOLAR_JAVA should not be overwritten here.Michael Stahl
SOLAR_JAVA should really be set by configure. Thanks to Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com> for the hint.
2012-07-09targetted rename xcr -> xmlscript to match includes and module nameMichael Meeks
2012-07-09Trying to use Windows LDAP for Windows buildsFridrich Strba
Change-Id: Ic06bda1393de4da05af01f79b8ba54cf0ee2cb73 Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-07-01Remove unused definesThomas Arnhold
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
2012-06-28remove malingering legacy RCS tags.Michael Meeks
2012-06-28Remove unused header filesThomas Arnhold
Those are unused too. Change-Id: I09c9dbcdbc68131c7c54bf0762a23f1280e6e22a
2012-06-26re-base on ALv2 code.Michael Meeks