strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use relative path to the script, to please python3 on Windows

Browse source 
Running 'make vs-ide-integration' fails since some recent change
(no idea if that was a cygwin upgrade, or some change in core).
Using 'verbose=t', the last lines are

  make[1]: Leaving directory 'C:/lo/src/build'
  cd C:/lo/src/core &&  C:/lo/src/core/bin/gbuild-to-ide --ide vs --make C:/cygwin64/opt/lo/bin/make
  python3: can't open file '/cygdrive/c/lo/src/core/C:/lo/src/core/bin/gbuild-to-ide': [Errno 2] No such file or directory
  make: *** [Makefile:495: vs-ide-integration] Error 2

It looks like python3 gets called by shell with the script path as
given in the comand line, according to shebang in the script; but
cygwin's python3 can't parse Windows-style path to the script, and
treats it as relative path from cygwin's current directory.

Just use true relative path to the script, to avoid the problem. We
cd to $(SRCDIR) anyway.

Change-Id: Idc25cc74f7a23f0e5733f0d10044986888b43ba1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129930
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
This commit is contained in:
Mike Kaganski 2022-02-14 19:19:41 +01:00 committed by Christian Lohmaier
parent 4190d16412
commit 18742c27af
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -488,7 +488,7 @@ define gb_Top_GbuildToIdeIntegration
$(1)-ide-integration: gbuildtojson $(if $(filter MACOSX,$(OS_FOR_BUILD)),python3.all)
cd $(SRCDIR) && \
$(if $(filter MACOSX,$(OS_FOR_BUILD)),PATH="$(INSTROOT_FOR_BUILD)/Frameworks/LibreOfficePython.framework/Versions/Current/bin:$(PATH)") \
$(SRCDIR)/bin/gbuild-to-ide --ide $(1) --make $(MAKE)
bin/gbuild-to-ide --ide $(1) --make $(MAKE)
endef