odk/examples/cpp/complextoolbarcontrols/Makefile | 6 +++---
odk/settings/settings.mk | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 3208236305f7c24fce556fda10eeb9905779a37c
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Tue Oct 15 15:07:10 2019 +0300
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri Nov 1 00:27:35 2019 +0100
odk: fix for change directory in complextoolbarcontrols sample
On Windows classical "cd" command does not change drive automatically.
So if OO_SDK_OUT folder located on another drive than SDK_HOME we
will receive confusing buid errors.
To avoid this for Windows configuration we should use "cd /d".
Change-Id: I22908d49fc915d3a834972357934349ba82bbec5
Reviewed-on: https://gerrit.libreoffice.org/80827
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile
b/odk/examples/cpp/complextoolbarcontrols/Makefile
index 446b06e50e15..ad75987cfab0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -142,10 +142,10 @@ $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME)
Addons.xcu ProtocolHandler.
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst
/,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$<) $(subst
/,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
- cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F)
$(COMP_NAME).components description.xml
- cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F)
$(UNOPKG_PLATFORM)/$(<F)
+ $(CD) $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F)
$(COMP_NAME).components description.xml
+ $(CD) $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F)
$(UNOPKG_PLATFORM)/$(<F)
$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu
CalcWindowState.xcu logo_small.png logo_big.png
- cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) &&
$(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
+ $(CD) $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F)))
&& $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
$(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 7998410704bd..25e5cb4af4b4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -59,6 +59,7 @@ CAT=type
OBJ_EXT=obj
EXE_EXT=.exe
COPY=copy
+CD=cd /d
SHAREDLIB_EXT=dll
SHAREDLIB_OUT=$(OUT_BIN)
UNOPKG_PLATFORM=Windows
@@ -190,6 +191,7 @@ P2BG=&
DEL=rm -f
DELRECURSIVE=rm -rf
COPY=cp
+CD=cd
URLPREFIX=file://
COMID=gcc3
@@ -333,6 +335,7 @@ P2BG=&
DEL=rm -f
DELRECURSIVE=rm -rf
COPY=cp
+CD=cd
URLPREFIX=file://
SALLIB=-luno_sal
@@ -432,6 +435,7 @@ P2BG=&
DEL=rm -f
DELRECURSIVE=rm -rf
COPY=cp
+CD=cd
URLPREFIX=file://
SALLIB=-luno_sal
@@ -542,6 +546,7 @@ P2BG=&
DEL=rm -f
DELRECURSIVE=rm -rf
COPY=cp
+CD=cd
URLPREFIX=file://
SALLIB=-luno_sal
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
