Simplified parser and added the missing json elements:
ASMOBJECTS
CFLAGS
CFLAGSAPPEND
CXXFLAGS
CXXFLAGSAPPEND
CXXOBJECTS
DEFS
GENCOBJECTS
GENCXXOBJECTS
ILIBTARGET
INCLUDE
LINKED_LIBS
LINKED_STATIC_LIBS
LINKTARGET
MAKEFILE
OBJCFLAGS
OBJCFLAGSAPPEND
OBJCOBJECTS
OBJCXXFLAGS
OBJCXXFLAGSAPPEND
OBJCXXOBJECTS
YACCOBJECTS
This patch should not affect the different generators
Change-Id: I74795880d7d34868d61ef73859bda0aedc8b2e28
Include ooxmlexport_setup.mk only once in Module_sw.mk,
so that gbuildtojson can properly set last included
makefile for test jsons.
Change-Id: Ie8ed3296ae97cf4a33d652599673f389b224993e
Reviewed-on: https://gerrit.libreoffice.org/32502
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
This update enables xcode 10.12 to open most projects
This is a pure expansion/correction of the current xcode-ide-integration.
When opening there are currently warnings.
Change-Id: Ibd0cebe1713dd74b2747aff039f094367a340a5f
There are still a problem with references, but committing this part, since
it is controlled, and before conflicting with other changes.
Change-Id: I6a7551bfbb44edc5876e5432ca04bfd595cb3fab
'LINKTARGET' is not really helpful as target name.
Use name based on makefile's name and hope something like
b81ac16e65b311d6e43c05c22c65d2040c9d7e04 is not needed anymore.
And if there are still some inconsistencies, we should fix makefile's name.
Also, don't use target.name because it's not unique.
There can be e.g. both Library_smoketest and CppunitTest_smoketest.
Change-Id: I541a1e41f80446e875e1bb2bfa89786e356e0e74
Reviewed-on: https://gerrit.libreoffice.org/32027
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
Of course not tested in any way but with any luck the project file
format hasn't changed and it will "just work".
Change-Id: I81c5043259feeabd69ef31ea7ef160901ac7ebdc
Up to now the screenshot creation was added/dependent of
target slowcheck. Since quite some modules have added screenshot
creations now, I added an own target 'screenshot' to allow to keep
current slowcheck and screenshot creation separated
Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7
And gives the error:
include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global namespace
when it's build against libstdc++.
Commit 9e6221f114ba4422caa79f38ee0a20fb8a8931cd (clang does not like gnu++11
that much, use c++11 instead, 2014-09-06) added support for invoking clang for
IDE purposes even in a tree configured for gcc. Extend this in case configure
sets -std=gnu++1y for gcc as well.
Change-Id: Ib767ef8f30bd6eb9ac825a1521184041f1269d93
Reviewed-on: https://gerrit.libreoffice.org/23983
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This wasn't noticeable in modules that use '#include "..."' for files in
the same directory, but does make a difference e.g. in sw.
With this, the include list in the database matches what gbuild in fact
uses.
Change-Id: I564c70d069fae41ea67ae7e57a188e99fa2ef861
Catching the needed information and the state machine is split.
gbuild-to-ide only finds 27 of 93 exe, due to the state machine
sequence:
CXXOBJECTS for exe1
CXXOBJECTS for exe2
Recipe to execute for exe2
Recipe to execute for exe1
only identifies exe2 and leaves exe1 without a project.
Solution is to have an array of state one for all pending exe.
This patch only contains the split
Change-Id: I2539f10a9850d956a85b6993b26561b1970575df
Reviewed-on: https://gerrit.libreoffice.org/20254
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
The defines we use to build are needed to correctly
parse the code, and find some types like OUString.
Change-Id: I3b3aaa51c4637beed113738503c8ab1a967c9149
This patch generated a setting file for per module. When imported the
eclipsesettingfile.xml, underlined include lines are clearing up.
Setting file includes included file paths for per module and provides
correct build. .project file generator deleted because eclipse
is creating .project file and overriding it.
This adds a new property to the parser that stores each module.
Change-Id: Ia10bb37c7c3fdb444a5b79ddf502b962e8ee5736
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
When running make vs2013-ide-integration on windows, the manifest
targets cause duplicate library/executable entries to be output in
the Visual Studio solution files, causing errors.
Change-Id: I6b0ce38a3ba84f7f54741e4974264e2c4c7b201a
Reviewed-on: https://gerrit.libreoffice.org/18719
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
This reverts commit 93cd7b78c29c11ccc87c19c845c6617acb834630.
We need to generate project files for unnamed projects as they seem to
correspond to libraries. If that causes problems for the msvc
integration (which seems strange) then we need to handle these problems
in the MSVC generator and not in the parser.
It also includes:
Revert "Clean trailing whitespace"
This reverts commit 7d92b27aff3b4d1c59aef9866003f4d001c0fc25.
That project file handles 12 global build options :
6 about tests, 3 about clean, 2 about l10n, 1 default.
There is one run command to launch 'soffice'.
Note that QtCreator will add automatically run commands for each subproject.
Change-Id: I3650a9041654cbec7d51d8cbb7951a11ed49aad5
Reviewed-on: https://gerrit.libreoffice.org/17458
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Use lib.include to list :
- all include paths (with generated c++ headers),
- header files for each lib/module.
Change-Id: I44f20ddbcaf2ffa844ec02977dea10f32fe9d92f
Reviewed-on: https://gerrit.libreoffice.org/17055
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
The script gbuild-to-ide now handles correctly specific case where a module
is not a direct subfolder of LibreOffice base folder.
Currently, 3 modules :
external/neon, external/clucene, external/ucpp.
Change-Id: I9477519a530439d43919b4e1b51dc2c71ee05fe0
Reviewed-on: https://gerrit.libreoffice.org/17054
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
First version of QtCreator IDE integration :
'make qtcreator-ide-integration' generates .pro and .pro.user files for each subfolder of LibreOffice.
It also creates a 'lo.pro' meta project that list all other .pro files.
Developers can use use QtCreator to edit, compile and debug LibreOffice.
Change-Id: Ib05d8c36a7ca055ecd7a4db5776f4c28bf05676c
Reviewed-on: https://gerrit.libreoffice.org/15804
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Added more Xcode specific files to .gitignore.
Made some properties common in gbuil-to-ide to avoid code duplication/bugs.
Xcode projects are broken for now.
Change-Id: I9530435ffe54158ae68ddae0581ac68f968af235
Reviewed-on: https://gerrit.libreoffice.org/15694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This patch is starting to EclipseCDT Integration. Written the .project file generating function.
Change-Id: If38077561820d9a333d186a2785ecddd1113fe92
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/14871
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
At least on some 64-bit Cygwin installations, the input gbuild-to-ide gets
include \r\n EOL. Python3 regex excludes \n from .* but leaves \r in the matching
group. This training cr ends up in the file paths in VS project files, breaking
it as they are invalid characters.
Change-Id: I481c1adbf6f6db7ab0ee0d3a768b7a397dc78ee5
Reviewed-on: https://gerrit.libreoffice.org/13803
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Use gperf instead of ls to find binpath, so that vs2012/3 can be tested
on non-Windows systems.
Output the vcxproj and vcxproj.filters files with indentation and
formatting.
Make some minor changes to improve pep8 compliance.
Change-Id: Ie8ac11ecf75ad170f0756f803c45356685792e5c
Reviewed-on: https://gerrit.libreoffice.org/11797
Tested-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Since GNU make 4.0 the output of --print-data-base command has been
slightly changed, so that class specific attributed aren'tt prefixed
with "#" char any more. To prevent the duplication of used regexs or
discontinuation of supporting widely used GNU make version 3.8x detect
the case that matches this regex:
target : VAR := VALUE
pand repend '#' character to retry the match for "pseudo" hash-starting
line. This way the same script works for both worlds.
Test Plan:
* have full build of LibreOffice
* install GNU make 4
* verify that gbuild-to-ide is able to parse and emit sane debug project
configuration for both GNU make versions:
$ make-3.8 debug-ide-integration
$ make-4 debug-ide-integration
Change-Id: I7d760d9570f2df510571cc1e8fd7f31115d43b92
Reviewed-on: https://gerrit.libreoffice.org/11751
Tested-by: Peter Foley <pefoley2@verizon.net>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
