Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 80e09853e5f60f292d00e57b5f6d5f2962e49147
Author: Mike Kaganski <[email protected]>
AuthorDate: Mon Feb 14 19:19:41 2022 +0100
Commit: Mike Kaganski <[email protected]>
CommitDate: Tue Nov 1 22:03:57 2022 +0100
Use relative path to the script, to please python3 on Windows
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 <[email protected]>
Reviewed-by: Christian Lohmaier <[email protected]>
Tested-by: Jenkins
(cherry picked from commit 18742c27af1c67d41831b5d2297746c299ace3d7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141925
Tested-by: Jenkins CollaboraOffice <[email protected]>
Reviewed-by: Mike Kaganski <[email protected]>
diff --git a/Makefile.in b/Makefile.in
index f15ed75d8acf..2c3f9c89c648 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -520,7 +520,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
