summaryrefslogtreecommitdiff
path: root/bin
AgeCommit message (Collapse)Author
2017-01-22gbuild-to-ide, final cleanup in parser.jan Iversen
Now the json file can be expanded with new keys, without the need to touch parser. Change-Id: I8182e8030e206e302258bd156d7392ff5c98f3d4
2017-01-21gbuild-to-ide clean replaced GbuildLinkTarget with dictjan Iversen
The class GbuildLinkTarget was removed and replaced by a dict. This is first step in avoiding typing the json key names multiple times Change-Id: I3a2006979929c5d21549693e51eb47df7233400d
2017-01-20gbuild-to-ide.py - change directory for .sln,.vcxproj,.filtersFederico Bassini
this change the directory of all files .sln, . vcxproj,.filters to windows folder i change only a variable VisualStudioIntegrationGenerator.solution_path from './' to './windows'. i investigate in the .vcxproj, .filters, .sln if there are references to change but i don't find anything (all the files written in this files are an absolute path) and i test 'make vs2013-ide-integration'... the files are exactly generated, i test in a windows machine and visual studio work perfectly... Change-Id: I111c39173b95a6888c8d39058b1db4da7a9be206 Reviewed-on: https://gerrit.libreoffice.org/33301 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2017-01-18gbuil-to-ide.py functions improvmentFederico Bassini
this patch improve the functions: -find_all_headers -> make _allheaders a dict: _allheaders['<modulename>'] contains the list of all headers for that module -headers_of(modulename) -> it return the list of headers for that module, or a empty list for module that not have headers Change-Id: I7e4e2bf063ccf6fd2e3e5155b58d2be2412480ba Reviewed-on: https://gerrit.libreoffice.org/33255 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2017-01-18there's no need for this nutso redefineCaolán McNamara
both BMP_PLUGIN resources point to the same plugin.png ultimately Change-Id: Ifa1cc00698f749ba84f17a79074c73e080e1d356
2017-01-17making portable sed statements is not worth the hassleChristian Lohmaier
change to git's own formatting capabilities by using the text-wrap option with only indent settings/no rewrapping → %w(0,8,8) and also omit the additional empty line when there only is a summary, but no body in the commit message (remove a %n, make it %+b) finally drop the now no-longer needed starmarker (the @) previous differences in sed caused unnecessarily large diffs for distro-packagers, see https://anonscm.debian.org/git/pkg-openoffice/libreoffice-dictionaries.git/commit/?h=upstream&id=3dceac52f75030e87519e73b42babde51e471d9f now it will change once, but then we can put all the blame on git :-) Change-Id: Ifa719d062582c54c9c23b4ae08d4bae9a396e83c
2017-01-17gbuild-to-ide prepare for missing file types.jan Iversen
Expanded the parser to understand the new json keys. Change-Id: I8ff91a9113a7b539a1d85e8ea936555825260ba0
2017-01-17gbuild-to-ide - all headers add to moduleDict for each moduleFederico Bassini
i added a key 'headers' in the moduleDict that contains a list of all the headers files (.hxx, .h, .hpp) fot that module... moduleDict['<module>']['headers']= list of all the <module>'s headers files i run "make debug-ide-integration" found 3 error: i added also a if statement to skip 'include' module for eclipse and kdevelop...(2 error) the 3° error leave untouched; it is at the line 495 'os.mkdir', the error say(for UnoControls module) Unocontrols/.kdev exist yet! Update: i have change the code as jan suggests! i do 2 function: -find_all_headers(): that call only one a subprocess and it founds all the headers file contents in core folder and save it in a list -headers_of(modulename): it return a list of the headers only for the modulename parameter, it called in the assignment moduleDict[module]['headers']=... this only create a process once! it's more faster :) Change-Id: If05ce4104bcdd178c0c6a6f589fa0720d493dad6 Reviewed-on: https://gerrit.libreoffice.org/33208 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2017-01-16post_GbuildToJson.mk, extended with extra file typesjan Iversen
Extended the call to gbuildtojson, with extra file types. Some filetypes still need data collection, this is noted in the file as todo. Change-Id: I3e832f82656236d42d1d7b59bf3ac2925c5b1568
2017-01-16gbuild-to-ide, temporary fixjan Iversen
added test if key is in json file, this is needed at least temporary. Change-Id: I6fca2dff7fd198ac6b324869146c14de5f38b414
2017-01-16gbuildtojson prepare for new filetypes.jan Iversen
gbuild-to-ide now contains a dict with json name -> file extension post_GbuildToJson.ml contains a todo list (missing files, new arguments) gbuildtojson.cxx made resistent (no extra argument list to maintain) Change-Id: I7f346f606ed5fba0a1eaffdd38454b484cecfcf5
2017-01-16gbuild-to-ide, typojan Iversen
create_include_pathks --> create_include_paths Change-Id: I23a88e4c3685306beecc34df72fe6691fde042ca
2017-01-16gbuild-to-ide xcode-ide-integrationjan Iversen
change target to use "make" for now. this patch enables debug/build in xcode. Change-Id: I1bac15beb77af35d7348eab9e645a1bf3522c2c8
2017-01-16gbuildparser in gbuild-to-ide - added headers of the include moduleFederico Bassini
this is the version of gbuild-to-ide that implement a capture 1 of the project "keeping contributors" it adds all the headers files (.hxx,.h,.hpp) content in the folder include in moduleDict['include']['headers'] there is an error in the VisualStudioIntegrationGeneration.emit() because there is a for that work only with the modules[<module_name>]['targets'] whatever i'll do a comment in the code(i added a if statement!)with the error description that generate this error to not forget! Change-Id: I7cd6a15482d99406573dbd9bd095987772377cff Reviewed-on: https://gerrit.libreoffice.org/33162 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2017-01-16shellcheck: cleanup symstore.shThorsten Behrens
Change-Id: I8eb53c06892934c21d55b69d12e3c8ff09696295
2017-01-15gbuild: populate local symstore on WindowsThorsten Behrens
Script based on Lubos' tb master script from http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html Change-Id: I7f3247367a63078881f3cf51cf3e2cad59ad67b5 Reviewed-on: https://gerrit.libreoffice.org/33088 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-01-14gbuild-to-ide, prepare for more file types.jan Iversen
The structure how to capture new file types is in place, now search need to start in post_Gbuildtojson for missing/wrong macros. Change-Id: I9f97a6181c24d2cffbb004ee660c9cfbf5d0a099
2017-01-14gbuild-to-ide GbuildParser cleanedjan Iversen
Removed target_by_path. All targets listing is now via .modules[*]['targets'] Eclipse & Kdevelop classes updated. Change-Id: I71ec088cf2e77777eeb51ec68517c22bff9ddf44
2017-01-14gbuild-to-ide cleanup GbuildParserjan Iversen
Removed .files replaced by .modules[*]['targets'] Affected generators updated. Change-Id: I4bf4cb5a23ba0b48b11adb1795c0a4f9dfbb0d3a
2017-01-14gbuild-to-ide added control of platforms.jan Iversen
The debug generator is extended to build IDE for all platforms, these IDE will of course not be useable, but it gives a security that the script does not break. Removed target_by_location from GbuildParser, to simplify that class. Change-Id: Ie41ca3d156321041958213333b2d73c57ba918f9
2017-01-13gbuild-to-ide simplifications.jan Iversen
Simplified GbuildLinkTarget, removed functions. Prepare to clean GbuildParser Change-Id: I67bb3ba0279f615cb6c361818ade6fe629dca60c
2017-01-12No need for a separate variable. Just get the value directly from the ↵Edmund Wong
dictionary. Change-Id: Ic8a707ac78cf5ad3e225131ae23f1f1277f3ae7c Reviewed-on: https://gerrit.libreoffice.org/31991 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2017-01-10gbuild-to-ide, solved vs2013 generation problem.jan Iversen
mikekaganski reported a problem with the vs2013 class, due to the latest changes. Problem solved: .name() -> .name Change-Id: Idb3e063bee93041dd010ed0c0b5bb71ac7efcd57
2017-01-05gbuild xcode-ide-integration code cleaningjan Iversen
Cleaned some function to ease readability Prepare to add header files to solution. Change-Id: I7d9c5ea18cf74147d0639b6a8dcbf11bd9ad7bc8
2017-01-05gbuild-to-ide Problem with multiple targets.jan Iversen
2 statement changed indention and caused problems Change-Id: I67c1d51fcb9efa447085f8839c450c9741905f08
2017-01-05gbuild-to-ide general updatejan Iversen
Changed target_by_location to an OrderedDict, this makes the modules sorted in the single solutions. Change-Id: I55096638c08610f761844ab66fcaadf6c00ff2c8
2017-01-05gbuild-to-ide xcode updatejan Iversen
The xcode generator, now generates 1 solution. libreoffice.vcxproj The project contains all targets and all source files (as delivered by gbuildtojson). Lots of work still outstanding. Change-Id: Ibe233dba395aa2f342d865e56053f292f708efa3
2017-01-04gbuild-to-ide xcode updatejan Iversen
Update to isolate module, and have groups for: Sources Headers Targets Other files Change-Id: Id2c48b0e3dae7c943c122e767d391d324e936619
2017-01-02gbuild-to-ide xcode generator moved proj filesjan Iversen
All .xcodeproj files are now located in <core>/osx to prepare for combining into 1 .xcodeproj for all of LO Change-Id: I649389ba2b94355ebaf6b5413bdb5dfae8c04764
2017-01-02gbuild-to-ide update to xcode generatorjan Iversen
The generator now generates the same groups as xcode, with relative paths. This patch has been tested with l10ntools/pocheck. Next step is "sal" and actually compile Change-Id: I02c202434a346918e9ec725bd20e4713fc6fa73e
2017-01-02gbuild-to-ide, fixed typo and changed xcode generatorjan Iversen
target_name used - instead of _ which caused solutions to have a new name xcode generator changed to use fixed id for the major groups, in order to facilitate debugging of the solutions. Change-Id: I444c74f37dc471625fa3f28240678f9968d1e710
2017-01-01gbuild-to-ide performance optimize parserjan Iversen
Change-Id: I93c81e027269830af7d6b2c9df2f1b0f0194880e
2017-01-01gbuild-to-ide parser simplification.jan Iversen
Added build_type to objects instead of having 3 sets. Modified the generators to use build_type Change-Id: Ic884522eb6d2c41e7b838f62a0d0800dc4e02c8a
2017-01-01Update json parser in gbuild-to-idejan Iversen
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
2016-12-30Workaround strange sw test makefilesMatúš Kukan
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>
2016-12-25update to make cppunit load in xcodejan Iversen
cppunit was unknown product type, assigned it Change-Id: I39a08f52cd07c06fc77fc4ac6dc4ecfb167a86ae
2016-12-25update to prepare for multiple modules.jan Iversen
module filter name changes from source to module name. Change-Id: I979b3ca7f86bad70d0812207b3eccbed20499a08
2016-12-25update to make xcode load on sierra.jan Iversen
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
2016-12-23First attempt to make xcode project work again.jan Iversen
There are still a problem with references, but committing this part, since it is controlled, and before conflicting with other changes. Change-Id: I6a7551bfbb44edc5876e5432ca04bfd595cb3fab
2016-12-21Merge tbunosearchcontrollers.hxx into .cxxStephan Bergmann
Change-Id: Ic577e2dd4d6cc1d62c3c6f54e73ba891f8bad4a2
2016-12-15Move get options to a separate function.Edmund Wong
Change-Id: I014f49b8239b0165ab696398b5ef0a2af5e0ae8c Reviewed-on: https://gerrit.libreoffice.org/31990 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-12-15tdf#70414: Fix VisualStudio ide integrationMatúš Kukan
'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>
2016-12-14epoxy: fix Android buildMiklos Vajna
Assuming this line has been replaced by external/epoxy/Library_epoxy.mk. Change-Id: I0aaa86f6d001a266d7975a357e820c05045af338
2016-12-13change from glew to epoxyCaolán McNamara
because that works under wayland out of the box and gtk3 uses it already Change-Id: Iefaac31e325534a81a5389f752804af917c1baef Reviewed-on: https://gerrit.libreoffice.org/31213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-12[API CHANGE] Remove salcpprt static libraryStephan Bergmann
...containing replacements for global operator new/delete (that can be linked into executables), but which is no longer used. The mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2012-March/028690.html> "operator new no longer routes through rtl_AllocMemory in libsalcpprt under gbuild link rules" has the details of how this was used on some platforms (but not on others) before the switch to gbuild, and has been "lost" ever since---but apparently a loss not mourned much over the years. For the SDK, c5f974287fd04bb529de145113133b9e35687702 "INTEGRATION: CWS jsc3: #i62434# copy libsalcpprt.a" added the library (under Linux) and 6db9c5af960f9787e33e4addc56bddbb1695a402 "INTEGRATION: CWS jsc3: #i62434# extend link options for executbales to link libsalcpprt.a, LINUX only" added its use to odk/settings/settings.mk, but fc0ca57f2cd649c6330171445a06b80e2143a0e9 "INTEGRATION: CWS jsc21" removed that use again (for no documented reason). So this is an incompatible change, but unlikely to actually affect any users of the SDK. Change-Id: Ia38b4c439f21fca3f5d9af7d1a34054e992054e9 Reviewed-on: https://gerrit.libreoffice.org/31810 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-12-09fix copy&paste error in ide-integration scriptMarkus Mohrhard
Change-Id: I4e52851b41e3d5ec4fe4ae5277928bceac3c8283
2016-12-08tdf#102784 Patch 1 - Enhance removetooltip_markups.sh script with checksMarina Latini
This is the first part of this heasy hack. The script parses all the .ui files checking the existence of tooltip_markup and tooltip_text properties. If the ui file contains a tooltip_markup property and the related tooltip_text one, it removes the tooltip_markup line and add the deletion in a log file. If the ui file contains only a tooltip_markup propery the script rename it via sed in tooltip_text adding the renaming in a log file. Change-Id: I1f027e11c7a2a91596511e2def5f4b850e14fad4 Signed-off-by: Marina Latini <marina@studiostorti.com> Reviewed-on: https://gerrit.libreoffice.org/31596 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: jan iversen <jani@documentfoundation.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-11-28add cppunit tests to vim-ide-integrationMarkus Mohrhard
Change-Id: I5a03ff6d6e740d8032030d1590837610f39acd5e Reviewed-on: https://gerrit.libreoffice.org/31273 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-11-28integrate the cppunit tests into gbuild-to-ideMarkus Mohrhard
Change-Id: I0259b2a47175e6aac2eb801ac489fadeac562949 Reviewed-on: https://gerrit.libreoffice.org/31272 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-11-27also strip the first -DMarkus Mohrhard
Change-Id: Ifc95720b47e1adaadbca879d5b8f22ada658fd3a Reviewed-on: https://gerrit.libreoffice.org/31275 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
generated by cgit (git 2.34.1) at 2025-02-27 23:12:04 +0000