summaryrefslogtreecommitdiff
path: root/solenv/inc
AgeCommit message (Collapse)Author
2013-01-17Fix fallout from checkdll.sh removalTor Lillqvist
The dmake build mechanism used to rename FOO.so files to check_FOO.so before handling them to checkdll.sh, which then renamed them back once the "check" was complete. The initial rename had accidentally been left in place even if the use of checkdll.sh has been removed. Change-Id: I60a2e110e27a15be906b770e86603d798cd055d1
2013-01-16Get rid of GetVersionInfo and checkdllTor Lillqvist
With gbuildification neither was actually used anyway, as far as I could see. Change-Id: I00d914e6571aed3110226f91ac1685a838031c65
2013-01-14Ignore and distclean generated filesStephan Bergmann
(Modelling .gitignore-per-directory instead of a single one in the root dir after exisiting config/.gitignore. No idea which approach is better.) Change-Id: I0ae90103ada4bfff48e90afcf3903bd3ba909314
2013-01-11Set version number in AC_INIT() in configure.ac onlyTor Lillqvist
Output a solenv/inc/minor.mk based on that. Get rid of RSCVERSION and RSCREVISION. Automate the end of the copyright year range, although I am actually not sure if that is OK. Change-Id: Ibae2d139b1dd468ee80d18a2a41b786a532df809
2013-01-11QUARTZ is equivalent to MACOSXTor Lillqvist
So just check MACOSX in the sources, and don't pass any -DQUARTZ to compilations. Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
2013-01-08more easier and better sortable download namesPetr Mladek
+ get rid of "install_multi" + move "SDK" and "Test" from the main name to the name suffix; use same position as "helppack" and "langpack" + move the content type identification "arc/deb/rpm" just after the <arch> string + use "archive" instead of the unclear "arc" content identification The new names look like: LibreOffice_<version>_<os>_<arch>_<content> LibreOffice_<version>_<os>_<arch>_<content>_helppack_<lang> LibreOffice_<version>_<os>_<arch>_<content>_langpack_<lang> LibreOffice_<version>_<os>_<arch>_<content>_sdk LibreOffice_<version>_<os>_<arch>_<content>_test , where the string "_<content>" is one of "_archive", "_deb", "_rpm". This string is missing for .msi, and .dmg installers because the content is described by the filename suffix. Conflicts: Makefile.in Change-Id: Ifecf947ba32e3381ef284d433096f7b37a02e9f5
2013-01-07fix install test to work with "LibreOffice" installer namePetr Mladek
Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb
2013-01-01Bump copyright year to 2013Andras Timar
Change-Id: Iab660dcfffc2a511092398926338ed06f6408925
2012-12-27Check for __GNUC__ instead of GCC in sourcesTor Lillqvist
We still have checks for $(COM) being GCC or MSC in makefiles, of course. But there is no reason to pass -D$(COM) to compilations. Checking the built-in compiler-specific macros __GNUC__, _MSC_VER (etc) is the right thing to do. Change-Id: Ia961a29ba74e2c4977e5300a92318f38104c6592
2012-12-25Get rid of (most uses of) GUITor Lillqvist
GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-18Replace GUIBASE checks with equivalent OS checksTor Lillqvist
The idea is to get rid of GUIBASE and GUI checks as much as possible. GUIBASE=aqua <=> OS=MACOSX GUIBASE=WIN <=> OS=WNT GUIBASE=cocoatouch <=> OS=IOS GUIBASE=android <=> OS=ANDROID Don't set GUIBASE to these values any more in configure.ac either. GUIBASE_FOR_BUILD is not used anywhere. Conflicts: configure.ac postprocess/packcomponents/makefile.mk postprocess/packregistry/makefile.mk Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
2012-12-18API CHANGE: Remove obsolete regcomp from UREStephan Bergmann
Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7
2012-12-17Remove --with-stlport from LO 4.0Stephan Bergmann
The STLport was only built for the benefit of old extensions on platforms that once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We deliberately break such old extensions for LO 4.0 by no longer shipping that backwards-compatiblity cludge. Keeps STLport listed in readlicense_oo/ because of o3tl/inc/o3tl/compat_functionality.hxx. Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?). Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from l10ntools/inc/helpmerge.hxx that was once added with 854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01 (1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename -> MoveFileEx" but now starts to cause trouble on Windows. Also disables warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both tools/wintypes.hxx and the Windows API) in a number of places that include windows.h -- however the old STLport caused those warnings to not show. Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
2012-12-15fdo#58145 dmake rule for ulf localization was not converted to use po filesAndras Timar
Change-Id: I7a47994fb74d2b7aa3e2069b91d02d7993ba993b
2012-12-14Make KeyID (qtz) work againAndras Timar
Conflicts: configure.ac Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
2012-12-10Try -std=c++11 if -std=gnu++0x does not workStephan Bergmann
...like when using Clang against GCC 4.7 headers that unconditionally use __float128 which is a GNU extension that Clang does not support. Change-Id: Ie27b5f17df4a10c9682fa750677e6cd8ef5eeeaf
2012-12-05Bye bye ODMATor Lillqvist
SUSE has no interest in it any longer, and I doubt anybody else has either.
2012-12-04bump minor.mk to 410Caolán McNamara
otherwise build dies with solenv/inc/settings.mk: line 50 Error: -- Expecting macro or rule defn, found neither with a SOURCEVERSION of OOO400 in minor.mk and a WORK_STAMP of OOO410 in config_host.mk Change-Id: I79cd39285c43e21c791dc5c8565ad58003553ad9
2012-12-04bump product version to 4.1.0.0.alpha0+, build id to 0Petr Mladek
Change-Id: I0a8e86dc862b05e8c92738a565ae1513ea9e60b0
2012-12-03Use -W4 instead of -Wall, and don't disable warnings that are off by defaultTor Lillqvist
2012-12-03Add -wd4986 here, tooTor Lillqvist
2012-11-30add Sidama (sid) languageAndras Timar
Change-Id: I7c7fb38d7df5aecda8e81443aa7045479e0efceb
2012-11-21dung out berkeleydb gnumake / configure bits ...Michael Meeks
2012-11-21remove qtz temporarily, until it works again reliablyAndras Timar
Change-Id: I66b117a56d8d545e6d09bfacb897ade383818895
2012-11-20bump product version to 4.0.0.0.alpha1+, release number to 1Petr Mladek
Change-Id: Iaf5af009ac86909bb293be4ab8ae3902215b3bfd
2012-11-20Merge branch 'feature/killsdf'Andras Timar
Conflicts: desktop/prj/build.lst helpcontent2 l10ntools/Executable_gsicheck.mk l10ntools/Executable_uiex.mk regexp/inc/regexp/reclass.hxx solenv/gbuild/AllLangResTarget.mk Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b
2012-11-18Localize tree files in helpZolnai Tamás
-Treex works well when po is not exist, send a warning but make en-US tree-s. Change-Id: Ib2b790742c022211a8d250b66891cef045941398
2012-11-18Localize xhp files in helpZolnai Tamás
Make helpex to be able to work with more xhp files at one time - Add new input flag "-mi" which means multiinput - Input is a file include pathes to xhp files (these are in the same directory so their strings are in the same po file) - Output is a file include pathes to dest xhp files - Merge reads all po entry from the specified po file if MergeDataFile ctor's second parameter is empty Rewrite makefiles to work with new syntax Plus Delete some unused code Change-Id: I5eb12d7a6f5e9cda378788410d3c50052eb752b8
2012-11-12re-base on ALv2 code. Includes:Michael Meeks
Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revision&revision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revision&revision=1238684 Correct /usr/bin/env path. http://svn.apache.org/viewvc?view=revision&revision=1235619 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1190390 i118615 - make epm more verbose http://svn.apache.org/viewvc?view=revision&revision=1204288 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revision&revision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revision&revision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revision&revision=1231878 Patches contributed by Ingo Schmidt native373: #i117733# no linux jre installation on 64 bit systems http://svn.apache.org/viewvc?view=revision&revision=1167536 native373: ##164464# improve debian support http://svn.apache.org/viewvc?view=revision&revision=1167537 Patch contribtued by Armin Le-Grand: Changed various aspects concerning usages of old vendor names http://svn.apache.org/viewvc?view=revision&revision=1293313 fix for neon webdav, remove coinmp bits, improve odk script, cleanup & remove OS/2 conditionals, system ucpp fixes, remove OS/2 conditionals, restore our license filenames.
2012-11-12bump version to 4.0.0.0.alpha0+Petr Mladek
Change-Id: I04cb89d04ebebcaef2276813864f79365f6899fd
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
generated by cgit (git 2.34.1) at 2024-08-09 14:15:19 +0000