[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk solenv/gbuild

[Jan Holesovsky]

 smoketestoo_native/makefile.mk |    2 ++
 solenv/gbuild/BuildDirs.mk     |    9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 0f1b0e5b7ad813069630e7ae719a800ecab640a8
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 30 16:20:11 2011 +0100

    Don't overwrite OUTDIR & friends.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 6a0933b..828546f 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,15 +35,6 @@ ifeq ($(strip $(SOLARENV)),)
 $(error SOLARENV variable is empty, no environment set, aborting)
 endif
 
-# HACK
-# unixify windoze paths
-ifeq ($(OS_FOR_BUILD),WNT)
-override WORKDIR := $(shell cygpath -u $(WORKDIR))
-override OUTDIR := $(shell cygpath -u $(OUTDIR))
-override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
-override SRCDIR := $(shell cygpath -u $(SRCDIR))
-endif
-
 REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
 
 # vim: set noet sw=4:
commit 5d5df8c6615be1a382f660283dd0f251d1b3b278
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Dec 2 10:35:16 2011 +0100

    Fix build on Windows.

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 333d646..bbfa24d 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -47,7 +47,9 @@ SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
+.IF "$(RUN_SMOKETEST)" == "YES"
 .INCLUDE: installationtest.mk
+.END
 
 .IF "$(depend)" == "" && "$(RUN_SMOKETEST)" == "YES"
 # disable smoketest when cross-compiling for now; we can use wine at some stage (?)