summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2014-07-28Improvements for Windows build with only VS2013 installedTor Lillqvist
I thought it was possible now to build on Windows with Visual Studio 2013 as the only installed Visual Studio version, but no. I tried on a fresh Windows 8.1 installation. This commit fixes the configury a bit at least. (One needs to pass the --with-visual-studio=2013 option. Otherwise configure gets confused by the partial (?) VS2012 that seems to be installed, too, when installing VS2013, and prefers that...) The build fails at least in external/lcms2, but I'll leave sorting out that for later. Change-Id: I15942e4b088a3f0a62c3f7fa8f9b45f77beaff6f
2014-07-24allow to continue build after removing workdir/DepDavid Tardon
Change-Id: Ia5ccf924979fc3c72ce585af46a7443733be2ad3
2014-07-23installer/environment.pm: fix variable nameDouglas Mencken
Fixes "Use of uninitialized value in concatenation (.) or string at solenv/bin/modules/installer/environment.pm line 110." Since: 38e6216cfd04f23ca0dbfa6bb99c5631f4891e78 Change-Id: Ia4ed62f64b07d1d244e172dd6e02010d896b845b Reviewed-on: https://gerrit.libreoffice.org/10480 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-23OSX: change CXXFLAGS_CXX11 to be used not only with clangDouglas Mencken
Otherwise, zillions of warnings are displayed like: "defaulted and deleted functions only available with -std=c++11 or -std=gnu++11" "override controls (override/final) only available with -std=c++11 or -std=gnu++11" Change-Id: Icedaf55c4f301d44587141ad937abbfce8d10457 Reviewed-on: https://gerrit.libreoffice.org/10130 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-20scp2: move postgresqlsdbc libraries to AutoInstallMichael Stahl
Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c
2014-07-18gbuild: really fix the build of instset with missing .ui translationsMichael Stahl
workdir zip file was not copied to instdir Change-Id: I47f86745613a1b99836523036fba2b393f9ba1bd
2014-07-18gbuild: fix build of installation set with missing .ui translationsMichael Stahl
As demonstrated by commit b875362cd576b29aee4da899335b8d8f6c74d192, scp2 will reference all languages' UIConfig zip file, but gbuild only builds those that have existing input files from translations; tweak UIConfig class to always build a zip file, and the Zip command to work with no inputs as well, which requires a little hack. Change-Id: If6dbb07aa856c94802b9abdcaa20ba03e59d37fa
2014-07-16gbuild: set VCL_HIDE_WINDOWS for non-headless CppunitTestsMiklos Vajna
This avoids the flashing window even on Linux, while making such tests headless would make them fail. Change-Id: I7cf8d410e257574f0177ca8b7e6465a5efd62280
2014-07-11gbuild: always prepend our stuff to PATH on WindowsMichael Stahl
Who knows what weird conflicting stuff could be on PATH. Change-Id: I5acec89687efe736ecc1f970eb56efa22393b251
2014-07-08gbuild: AutoInstall: fix the command line for Win32 makeMichael Stahl
Replace one ugly way with a different ugly way; it looks like the make_define invocation did not actually work before. Change-Id: Idd365f82a6fabab9444471ac88f91d81476bf124
2014-07-08kill UPD,SOURCEVERION and WORK_STAMPNorbert Thiebaud
Change-Id: Icea7057734020914fe0df3df70c8a895e96c1af0
2014-07-08auto-detect the presence of a native gmake on windowsNorbert Thiebaud
Change-Id: Ie1c7e022a2e1713a111ebd2db9db866e09f4f4f4 Reviewed-on: https://gerrit.libreoffice.org/10120 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-08configure, gbuild: remove Cygwin paths from make environmentMichael Stahl
All environment variables contain native Win32 paths. This allows building with Win32 make and Cygwin sh.exe, but Cygwin make cannot build any more with the Win32 entries in PATH. Requires adding "bash" detection to configure since /usr/bin/env can't be invoked by Win32 make and it's possible to install cygwin somewhere else than C:/cygwin. Change-Id: Ia8f4ee3c91222e8f5919cfbfc452f12ffbfadd40 Reviewed-on: https://gerrit.libreoffice.org/9698 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-07Use -FS for VS 2013Tor Lillqvist
Change-Id: I3beea86e97a4217128383c01049b2fc19c85c67a
2014-07-07chmod -xTor Lillqvist
Change-Id: Ia39ce5eeb26a11c633bc414872481d0bc08910dc
2014-07-07Use -FS with VS 2013Tor Lillqvist
Change-Id: I31cb7aec1a48b7b052f104ea3558cb13595a3687
2014-07-03Fix dependencies for libmerged wrt. libsofficeappMatúš Kukan
Change-Id: If1575e0bcacbc5c3c40d485063b1025017eef73a
2014-07-03CustomTarget_autotextshare is l10n targetDavid Tardon
Change-Id: Id82bbfc94645d9153e0d79475de008adb0edf3b9
2014-07-01android: We need com.sun.star.comp.filters.StorageFilterDetect to detect ODT.Jan Holesovsky
Change-Id: Ia57e2cb4c5e1f65a78e0f3bddd3910c67971306d
2014-07-01lok bootstrap: nicer function names, clean-upTomaž Vajngerl
+ prevent lokandroid JNI functions to be removed from the library + basic use of lok Office / Document in LibreOfficeMainActivity Change-Id: I7bfe53738cf821b2270ab3e024cc506a7cff42f0
2014-06-30use VCL_HIDE_WINDOWS env on Windows, tooAndras Timar
Change-Id: Ia313f82f75c1dfdb0952810056c6f17048658cee
2014-06-30android: Make use of LibreOfficeKit.Jan Holesovsky
Now the LibreOfficeKit is used to actually attempt to bootstrap LibreOffice; at the moment fails to do that. Change-Id: I91220dbff783213bf7702e7213a5646859db4581
2014-06-30bin_library_info.sh: popd does not take a directory parameterMichael Stahl
Change-Id: I164f03f8ab185fdb71632fd894f94b78bb3d994f
2014-06-30use VCL_HIDE_WINDOWS env on Mac to 'simulate' headless mode on MacNorbert Thiebaud
Building, and running the unit/subsequent test on Mac cause massive amount of flashing windows creation/destruction that make building with test very annoying on a box used for other purposes. This patch prevent the windows to be actually displayed hence mitigating the problem Change-Id: Ied2a36699b50856e0c4e6b618212481796ec99d3
2014-06-17-Wstrict-prototypesStephan Bergmann
...no reason to not have it enabled for URE C include files and what little real C code is still left. (But note that Clang ignores that warning.) Change-Id: Ia6940f9f940a0c226e9b724331d65c9862ce32e6
2014-06-12Fix vclplug_* dependencies for gb_CppunitTest_use_vclStephan Bergmann
...and replace gb_CppunitTest_unset_headless with gb_CppunitTest_use_vcl_non_headless. Change-Id: Ibd859f98ed8df09988ca26ffcee26e06e25d8313
2014-06-10Make test-install work also in the non-release-build caseTor Lillqvist
In the (default) --disable-release-build case the -p option to make_installer.pl should be "LibreOffice_Dev", not "LibreOffice". See instsetoo_native/util/openoffice.lst.in. Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or LibreOfficeDev.app. Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e
2014-06-09gbuild: UnpackedTarball: use Win32 paths for make targetsMichael Stahl
Change-Id: I78f56bb28d4b9b6c0696f83f3e06d836fd3427cd
2014-06-09gbuild, gengal: Win32 make command line limit strikes again ...Michael Stahl
... so add a response file parameter --filename. Change-Id: Idc71de7508b571b0e0608a65b92cd45e6800f7c3
2014-06-09gbuild: Rdb: another workaround for Win32 make command line limitMichael Stahl
This breaks in postprocess (services.rdb). Change-Id: I573279e510b5f3dedd7e32059688d21c4c844c47
2014-06-09gbuild: UIConfig: response file to work around Win32 command line limitMichael Stahl
Change-Id: I74d7ed5dd35e51168cc788a8336cf932b92102ca
2014-06-09gbuild: AutoInstall: work around command line limit with Win32 makeMichael Stahl
Change-Id: Ice87781147d62d2ba5f7fe3e7cede89a0404c186
2014-06-09gbuild: tweak var2file so it handles some shell metacharactersMichael Stahl
Always quote the passed string; this cannot handle arbitrary strings like $(file) can, but everything that is needed currently. Also, try to ensure that output does not start with a space. Note: there needs to be a newline at the end, otherwise helpex ignores the last item on the line. Change-Id: I51a4058591cc4f12dd878c2d113bd5cfc8c22d61
2014-06-09gbuild, cli_ure: Win32 make issues with back and forward slashesMichael Stahl
It looks like what works is to give the source file names with backslashes but everything else with forward slashes? Change-Id: Iaf910ab5fc41984d1315a30b164a334d28344c16
2014-06-09gbuild: remove config_libraries.h and gb_Helper_generate_config_librariesMichael Stahl
This much ugly complexity, generating a header on every gbuild startup etc. is really not warranted for 6 callers of the generated macros. Also, the Win32 make has problems with the quoting. Change-Id: If945e09c1730e52174a6084677842dc611d66b2f
2014-06-09gbuild: partial_build.mk: avoid a problem with Win32 makeMichael Stahl
Somehow 2 successive / in a path result in $(wildcard) returning nothing. Change-Id: Ie8b84543d36fe50fa706b9ccabcd280a7e3913ab
2014-06-09concat-deps: Win32 make $(file) will end lines with CRLFMichael Stahl
Change-Id: I3677de94e064c2f737cc7882b3cc4f42a6bf626a
2014-06-09A few improvements to macosx-codesign-app-bundleTor Lillqvist
Try harder to handle app bundles with space in name. (Not sure if this version yet does that 100%.) Include the directory names in the "ids" to make them unique. There are lots of files with the same name (in different directories, of course), especially in an app bundle that includes help in multiple languages. Change-Id: I424c539f6389ac6f7c9cef96aeb873ddac459f78
2014-06-09Use essentially the same OS X code signing script as in libreoffice-4-2Tor Lillqvist
Change-Id: Ica7dcc823cc7027a00b15d2dcf5b73b0ef322189
2014-06-09gbuild: avoid leaving invalid .d files behind if build interruptedMichael Stahl
The LinkTarget command builds the LinkTarget's dep-file as well as an optimization so the next make does not restart; in this case the dep-file is not the target so it will not be deleted by make in case the build is interrupted, and the next make can choke on the partially written .d file. Change-Id: I13b1884f1a974b7ce10b00e1df1d0f30222f4790
2014-06-09Revert "add missing dep on dir"David Tardon
This was a PEBKAC. The dep is already made in gb_Executable__Executable_impl. This reverts commit d14624c0f356035248983940b193ee71fc5c3c4a. Change-Id: I3342714422a3fd23d2d896773f4917130dbdc931
2014-06-08add missing dep on dirDavid Tardon
Change-Id: Ib10f30620027ad8a79a8464abee094e3961684d5
2014-06-08Use MACOSX_APP_NAME (with dashes instead of spaces) instead of build-time nameTor Lillqvist
Change-Id: I01bf646635668429c68f53bd6ab543b7a8b0be2d
2014-06-04DeInitVCL at end of testsStephan Bergmann
This required some changes to the framework: * Init-/DeInitVCL is no longer done per individual test in BootstrapFixture, but once per CppunitTest invocation in a new vclbootstrapprotector (similarly to the exisiting unobootstrapprotector). CppunitTests that need VCL now need to declare gb_CppunitTest_use_vcl. * For things to work properly, the UNO component context needs to be disposed from within DeInitVCL (cf. Desktop's Application::DeInit called from DeInitVCL). The easiest solution was to introduce an Application::setDeInitHook (where the hook is called from DeInitVCL) specifically for vclbootstrapprotector to call. * PythonTests don't (yet) call DeInitVCL; they still hook into BootstrapFixture's original test_init functionality (to call InitVCL), and do not make use of the vclbootstrapprotector. Change-Id: I4f3a3c75db30b58c1cd49d81c51db14902ed68b2
2014-06-04Include gdb backtrace in PythonTest done.long (just as for CppunitTest)Stephan Bergmann
Change-Id: Idc671a4af5474443130afed2dd6f0728c1504319
2014-06-01fix header guardThomas Arnhold
Change-Id: I0e3216f6451fdb06a3519a042e412ca2e5147f4b
2014-06-01fdo#68849: Add header guards to all include filesJens Carl
Added header guards to files in directories sc/, sd/, slideshow/, and solenv/ Change-Id: Ib4577761644fe72f5ddb3c5060e629bf94d6e6e2 Reviewed-on: https://gerrit.libreoffice.org/9583 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-05-30rebuild ext. project if makefile changesDavid Tardon
Change-Id: Ib1b7dab5b4fa10f068bcce58e00450895c455121
2014-05-26Do not override VALGRIND_OPTS=--leak-check=fullStephan Bergmann
Change-Id: I35c8376a45fa7ed2cc292ed9442e4ddf2e4172db
2014-05-26Fragile concat-deps _process misinterprets ENOMEM from file_loadStephan Bergmann
Change-Id: I0df494b74f23b0a30fe26e25f58b4827bd28ed47