mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

odk: fix for change directory in complextoolbarcontrols sample

Browse Source 
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.Behrens@CIB.de>
This commit is contained in:
Vasily Melenchuk
2019-10-15 15:07:10 +03:00
committed by Thorsten Behrens
parent d8f6f30936
commit 3208236305
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
odk/examples/cpp/complextoolbarcontrols/Makefile
View File

@@ -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),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM)) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$<) $(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) $(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) $(UNOPKG_PLATFORM)/$(<F)
$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png $(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) $(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"

5
odk/settings/settings.mk
View File

@@ -59,6 +59,7 @@ CAT=type
OBJ_EXT=obj OBJ_EXT=obj
EXE_EXT=.exe EXE_EXT=.exe
COPY=copy COPY=copy
CD=cd /d
SHAREDLIB_EXT=dll SHAREDLIB_EXT=dll
SHAREDLIB_OUT=$(OUT_BIN) SHAREDLIB_OUT=$(OUT_BIN)
UNOPKG_PLATFORM=Windows UNOPKG_PLATFORM=Windows
@@ -190,6 +191,7 @@ P2BG=&
DEL=rm -f DEL=rm -f
DELRECURSIVE=rm -rf DELRECURSIVE=rm -rf
COPY=cp COPY=cp
CD=cd
URLPREFIX=file:// URLPREFIX=file://
COMID=gcc3 COMID=gcc3
@@ -333,6 +335,7 @@ P2BG=&
DEL=rm -f DEL=rm -f
DELRECURSIVE=rm -rf DELRECURSIVE=rm -rf
COPY=cp COPY=cp
CD=cd
URLPREFIX=file:// URLPREFIX=file://
SALLIB=-luno_sal SALLIB=-luno_sal
@@ -432,6 +435,7 @@ P2BG=&
DEL=rm -f DEL=rm -f
DELRECURSIVE=rm -rf DELRECURSIVE=rm -rf
COPY=cp COPY=cp
CD=cd
URLPREFIX=file:// URLPREFIX=file://
SALLIB=-luno_sal SALLIB=-luno_sal
@@ -542,6 +546,7 @@ P2BG=&
DEL=rm -f DEL=rm -f
DELRECURSIVE=rm -rf DELRECURSIVE=rm -rf
COPY=cp COPY=cp
CD=cd
URLPREFIX=file:// URLPREFIX=file://
SALLIB=-luno_sal SALLIB=-luno_sal