summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2013-09-14fdo#68790: fix build error on Win when system locale=="Japanese(Japan)"Tomofumi Yagi
This patch modifies transex3. Modified transex3 outputs a file with BOM(if MergeMode is true). *.[hs]rc files with BOM avoid this problem. This problem is that MSVC interprets UTF-8 source code without BOM as local codepage when system locale is "Japanese(Japan)". Change-Id: I3e12499a91a954236f48e6d7e360d26c93d19ed6 Reviewed-on: https://gerrit.libreoffice.org/5851 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2013-09-14Clean up Mac OS X .jnilibsStephan Bergmann
Those .jnilibs that are not needed as .dylibs (this includes those that are also UNO components) are handled via RepositoryFixes.mk. The remaining one, libjava_uno.jnilib is packaged as a symlink in instdir. Everything else is not necessary and removed (including the venerable oddity macosx-create-bundle). Change-Id: I34a1801b0733cdff885c1c72db16fa631c5d82ef
2013-09-13installer: put in a hack for MacOSX to find language pack filesMichael Stahl
The files are in LibreOffice.app, are packaged in LibreOffice Language Pack.app and will then be copied into LibreOffice.app when the lang-pack is clicked by the user. This also neatly avoids having to deal with file names with spaces in make. Also, root directory is $(PRODUCTNAME).app which works with --disable-release-build too. Change-Id: Ie064831316d790b137022a1632721c62500a46a1
2013-09-13configure: ensure that install_name_tool matches the toolchain...Michael Stahl
... used to build, since otherwise it'll break with "malformed object" errors. Alo replace now unused XCRUN variable. Change-Id: I58a20c34f903b7a7acb46597d94243389e6b3842
2013-09-13gbuild: add missing directory dependencies for Obj{C,Cxx}ObjectMichael Stahl
Change-Id: Ifafcbe6ed88a2cc18ecb1ff123adf974e10e5187
2013-09-13gbuild: fix rule for gb_ObjCxxObject_get_dep_targetMichael Stahl
The typo causes spurious re-builds and error messages about the dep-target. Change-Id: Ia8bc236759c7ef13f81fe91c88f467d6e507bf29
2013-09-12installer: find files in INSTDIR also on WNTMichael Stahl
... where everything is inside some artificial "LibreOffice 4" directory that is set as WINDOWSBASISROOTNAME in openoffice.lst.in Change-Id: Ib04f84a8064739e0ea9d11b3b79cc1fa167a06e5
2013-09-12gbuild: remove gb_Rdb__get_final_targetMichael Stahl
... by replacing gb_Rdb_install with a separate constructor so the right target can be registered at the module. There is still an ugly special case for the ure/services. Change-Id: I81c004143f201aaf38daca99819888313ee24f49
2013-09-12gbuild: remove gb_Pagein__get_final_targetMichael Stahl
Change-Id: Ie3fcd7330e4e9f9d3ab48227edd192984d7ec49a
2013-09-12';' as a delimiter sometimes does not work for unknown reasonMatúš Kukan
Or rather it does work only sometimes. Change-Id: I97efd718dc6fcf370ca6456432b275e563f62f62
2013-09-12gb_CustomTarget_ulfex_rule: add dependency on directoryMatúš Kukan
Change-Id: Ibe00404978cc5b7efc31fe84cb5d0a79a0e13ce3
2013-09-12use ';' instead of ':' to separate two parts of a stringMatúš Kukan
':' is used in a path to files on Windows Change-Id: I3ca283a575bb753cbcd4dfd350947710efad3a62
2013-09-12Unbreak mingw build of udkapiFridrich Štrba
Change-Id: I8b88aec19d5aa95761f58b26b4290b7a468dcb8f
2013-09-12installer: restore these tooThomas Arnhold
This was dumb - I can't use search correctly ;) Change-Id: I966ad8bce2edbd4a6c58f82568210e110c88a6c5
2013-09-12installer: restore generate_cab_filename_for_some_cabsThomas Arnhold
Change-Id: I98155bcf6663aa0e7944807fd7cc8b49ab349ee8
2013-09-12installer: Remove packager.plThomas Arnhold
This script seems obsolete since: 1d84e9d1d363bd550129efcbeafe670c0a049dd0 updatepack: $(PERL) -w $(SOLARENV)$/bin$/packager.pl Found it because it calls dmake. Change-Id: I9cb1c194ed56d1fc8125ae5848190854dfe4d86e
2013-09-12installer: remove unused variablesThomas Arnhold
Change-Id: I3c9669f6fdf25a1a244335ae0317c3a8a933762b
2013-09-12installer: spring cleaningThomas Arnhold
some uncalled and unused stuff Change-Id: I74cc7f58a78befa119102f18560782c5b1ff45fd
2013-09-12installer: search files in INSTDIRMichael Stahl
INSTDIR has everything that will be installed anyway, so ideally the file search patch should only be INSTDIR + whatever is needed to get the Package file lists; especially WORKDIR seems inappropriate there. The exception is extension .oxt files which apparently are not in INSTDIR; not sure what to do about those. Change-Id: I2477c25ab9fcf953fae9c219e76c467e14729cda
2013-09-12installer: remove support for FILE_CAN_MISS styleMichael Stahl
The idea appears fundamentally error prone, and is unused. Change-Id: I65e1c5b80d7101b8ba37c213fcb787d31e3b9d1d
2013-09-12installer: remove resolving_hidden_flagMichael Stahl
Fortunately such "tooling" appears to be extinct, and there are no HIDDEN flags in scp2 anyway. Change-Id: I33bd80e3e74cc1eaaab0fbc50d02090088ae4be4
2013-09-11solenv: remove other addsym-macosx.sh tooMichael Stahl
Unnecessary since gbuild does not use map files on Mac OS X. Change-Id: I2d3ae95634a5c4fe925f391ea37b62f73d2f1524
2013-09-11remove comment about removed multi-repository supportMichael Stahl
Change-Id: I67e9caa794ec5b55a7e7ab897c331008a675a2ac
2013-09-11Set gb_INSTROOT and gb_DEVINSTALLROOT here, tooTor Lillqvist
Change-Id: I6831d9436dfb24ae42e124676cf283aae075be7e
2013-09-11Use LIBO_URE_LIB_FOLDER instead of hardcoding the "ure" directoryTor Lillqvist
The directory name is "ure-link" in a traditional OS X LibreOffice app bundle. Change-Id: I8e1380522a3c05e9018909fec8d46ba1f7be7858
2013-09-11Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixesStephan Bergmann
Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-10changed all 'sh' language to 'sr-Latn'Eike Rathke
Change-Id: Iafadaea87501bc3675eaf2856b5050a7e3ecaa37
2013-09-10gbuild: bin obsoleted gb_Configuration__get_sourceMatúš Kukan
Change-Id: If6f125b83114643430fcc02a2ec7f59ab406da7b
2013-09-10gbuild: install pagein files directly from workdirMatúš Kukan
Change-Id: I51e632ab96a5a569446c1a46ffce5cc3d85eadf9
2013-09-10gbuild: install .res files directly from workdirMatúš Kukan
Change-Id: I95e4f150c21f991f629530eebf19748c2768f856
2013-09-10gbuild: use xml .rdb files directly from workdirMatúš Kukan
Change-Id: I876a41dc77a59841c39b2c1fa43f22c20940dbf2
2013-09-10fix typoMatúš Kukan
Change-Id: If47c5d77b0f05415e5fb38e0f825474892d628dc
2013-09-10fix gdb pretty printers for --enable-mergelibsMatúš Kukan
And install them into $(INSTDIR) at the end of build, as it is done in dev-install case. Change-Id: I1a9852684361a12333046fa58f83720aa2c835da
2013-09-10kill VERSION_INDEPENDENT_COMP_IDAndras Timar
Version independent ComponentID in Component table of MSI means that the GUID is calculated from the Component name only, the PRODUCTVERSION is not concatenated to the name. Providing that name is constant in all versions, the resulting GUID would be the same e.g. for 4.0, 4.1, 4.2 etc. But what is it good for? Faster upgrades maybe? But name can also change, we did not pay attention to keep it constant. So in order to help scp2 cleanup, VERSION_INDEPENDENT_COMP_ID flag was obsoleted and removed. Change-Id: I8e1ee450524b02f07d0b0553f6b82d0321dbddcf
2013-09-10CompID is not in use in scp2 filesAndras Timar
Change-Id: I3d5b92d9890d6525b05575760a9fb4b4db65172b
2013-09-10fix lcms2 library in solverMatúš Kukan
This commit repairs broken link liblcms2.so -> liblcms2.so.2.0.4 as liblcms2.so -> liblcms2.so.2. Change-Id: Idccd65bba5cec822d285859f609e222c84f2fad9
2013-09-09gbuild: remove redundant defintion of gb_DEVINSTALLDIRMichael Stahl
At least the PythonTest will pick up the one from platform makefiles. Change-Id: Ia1c3c0535529f4051f66d0ce91c377108a1a3cd7
2013-09-09gbuild: put the DLL into INSTDIR, not the import libMichael Stahl
Change-Id: Iea2a3d5d73ae6decb12082d850afd72514ef21a0
2013-09-09gbuild: ExternalPackage: use gb_Helper_installMatúš Kukan
Change-Id: I001563c8aaf4e21e57c53aa2045b6709a35464d7
2013-09-09start to use instdir for subsequentcheck tests; avoid make dev-installMatúš Kukan
This commit breaks linkoo. make dev-install continues to work as before but it's not necessary to use it anymore. make check now uses files copied into instdir by gbuild. TODO: fix remaining issues so that instdir is the same as install/. Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
2013-09-09gbuild: fix Jar layers for WNTMichael Stahl
Change-Id: I516abd165f947c155f3e969e27f51fb093bfa8fc
2013-09-09gbuild: avoid packages when copying files into instdirMatúš Kukan
There should be only two ways how to add file into instdir: - gb_Helper_install used in gbuild - gb_Package_set_outdir used also elsewhere, preferably with scp2 containing its .filelist. Change-Id: I75ec0ba63f32acf4b56b17dc972f4488edf6a777
2013-09-09gbuild: add definition of gb_Executable_LAYER to windows.mkMichael Stahl
Change-Id: I474881a5713dd2e09fdb47a683dc79f97f014b6b
2013-09-09gbuild: install rdb files directly in module they come fromMatúš Kukan
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
2013-09-09linkoo: do not link shell scripts that use `pwd`Michael Stahl
Change-Id: I194671feef281e07507e829fa43576f6a4468edf
2013-09-09install whole sdk using filelistsMatúš Kukan
Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a
2013-09-09installer: adapt to find README and LICENSE in file listsMichael Stahl
Change-Id: I9c949e61afd1afe9853b9afcd050803df3388e2f
2013-09-09ure: install files with filelistsMatúš Kukan
This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-09-09installer: fix handling of symbolic links in filelists so EPM is happyMichael Stahl
also, chmodding symlinks rarely does something useful Change-Id: Icdeb62728c3c0684d40d3a2c4d3bcb87b21bfb5a