bin/gbuild-to-ide | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 0779066f4788ec01daee6b452cde02b9139019aa
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Oct 30 15:30:18 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Oct 31 07:05:41 2023 +0100
bin/gbuild-to-ide: Drop trailing whitespace
Change-Id: I3142080721db11f75631accd3a5e403027a63110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158664
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index ce72f4ae2e53..82ff9e6fc631 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -304,7 +304,7 @@ class
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
</language>
</section>
</cdtprojectproperties>
-"""
+"""
for module in self.gbuildparser.modulenamelist:
tempxml = []
@@ -329,7 +329,7 @@ class
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
macrokey = macroskeyvalue[0]
macrovalue = macroskeyvalue[1]
if macrovalue[-1:] == "\n":
- macrovalue = macrovalue[:-1]
+ macrovalue = macrovalue[:-1]
templine = "<macro><name>%s</name><value>%s</value></macro>\n"
%(macrokey, macrovalue)
tempxml.insert(-13, templine)
tempxml="".join(tempxml)
@@ -344,7 +344,7 @@ class
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
def emit(self):
self.create_include_paths()
self.create_macros()
- self.create_settings_file()
+ self.create_settings_file()
class CodeliteIntegrationGenerator(IdeIntegrationGenerator):
commit 303899b811f8cf3dd72caacb0d9a4f59d245b02d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Oct 30 11:45:30 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Oct 31 07:05:34 2023 +0100
qtcreator: Set correct soffice path on macOS
The soffice path is different on macOS than it is on
Linux or Windows. Let gbuild-to-ide take that into
account when generating the QtCreator IDE integration
(`make qtcreator-ide-integration`), so the autogenerated
run/debug target works.
Change-Id: Ibdd4cf32bddadfe67608b06b7b3ce58c2a9dd518
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158653
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index f428f451e990..ce72f4ae2e53 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1472,9 +1472,10 @@ class
QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
def generate_run_configs(self, lib_folder):
- # If we use 'soffice', it's ok only for "Run", not for "Debug".
- # So we put "soffice.bin" that is ok for both.
- loexec = "%s/instdir/program/soffice.bin" % self.base_folder
+ if platform == 'darwin':
+ loexec = "%s/instdir/LibreOfficeDev.app/Contents/MacOS/soffice" %
self.base_folder
+ else:
+ loexec = "%s/instdir/program/soffice.bin" % self.base_folder
xml = QtCreatorIntegrationGenerator.run_configs_template % {
'loexec': loexec,
'workdir': self.base_folder
