centralize definitions of shell commands

there are only two types. everything else is duplication.

Change-Id: I87f2bdd3d56b94bb2ecdb60e8861afeb9af3666f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

12 files changed, 10 insertions, 138 deletions

diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index 969d22f1b7..12891d5489 100644
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -50,14 +50,6 @@ QMAKE_LIBS_THREAD       =
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
+include(../../common/shell-unix.conf)
 load(qt_config)
 
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 53cc95508a..e791291e30 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -109,19 +109,8 @@ QMAKE_AR              = host-ar cqs
 QMAKE_OBJCOPY         = host-objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = host-strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index d269be2b7c..6c87839d65 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -37,19 +37,7 @@ QMAKE_LIBS_NETWORK      = -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
+
 load(qt_config)
diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf
index 4fed2b58ad..1d078b105f 100644
--- a/mkspecs/unsupported/qws/qnx-641/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf
@@ -76,19 +76,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ntox86-ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
+
 load(qt_config)
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
index eb3b02bc54..512d37f76e 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
@@ -79,19 +79,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
+
 load(qt_config)
diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
index 903c655bda..00a6a263e6 100644
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
@@ -75,19 +75,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
+
 load(qt_config)
diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
index baa3b0487f..23e326197a 100644
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
@@ -75,19 +75,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
+
 load(qt_config)
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index 68fa5ece81..41bdfb03c2 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -85,19 +85,8 @@ QMAKE_AR              = ar cqs
 QMAKE_OBJCOPY         = objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 19b45075d7..69146423cc 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -84,19 +84,8 @@ QMAKE_AR              = ar cqs
 QMAKE_OBJCOPY         = objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
diff --git a/mkspecs/unsupported/win32-borland/qmake.conf b/mkspecs/unsupported/win32-borland/qmake.conf
index 55f1d71fbd..14835eb861 100644
--- a/mkspecs/unsupported/win32-borland/qmake.conf
+++ b/mkspecs/unsupported/win32-borland/qmake.conf
@@ -71,14 +71,5 @@ QMAKE_IDL		= midl
 QMAKE_LIB		= tlib /C /P256
 QMAKE_RC		= brcc32 -dQ_CC_BOR
 
-QMAKE_ZIP		= zip -r -9
-
-QMAKE_COPY		= copy /y
-QMAKE_COPY_DIR		= xcopy /s /q /y /i
-QMAKE_MOVE		= move
-QMAKE_DEL_FILE		= del
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= if not exist
-QMAKE_MKDIR		= mkdir
-
+include(../../common/shell-win32.conf)
 load(qt_config)
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index abf1657f5e..cc486f7a17 100644
--- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
+++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf
@@ -81,24 +81,14 @@ QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2
 QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 
 QMAKE_SH		= bash
-
 MINGW_IN_SHELL		= 1
-QMAKE_DIR_SEP		= /
-QMAKE_COPY		= cp
-QMAKE_STREAM_EDITOR     = sed
-QMAKE_COPY_DIR		= cp -R
-QMAKE_MOVE		= mv
-QMAKE_DEL_FILE		= rm -f
-QMAKE_MKDIR		= mkdir -p
-QMAKE_DEL_DIR		= rmdir
-QMAKE_SYMBOLIC_LINK	= ln -s
-QMAKE_CHK_DIR_EXISTS	= test -d
+include(../../common/shell-unix.conf)
 
 QMAKE_LIB		= i686-pc-mingw32-ar -ru
 QMAKE_RC		= i686-pc-mingw32-windres
-QMAKE_ZIP		= zip -r -9
 
 QMAKE_STRIP		= i686-pc-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 PKG_CONFIG		= i686-pc-mingw32-pkg-config
+
 load(qt_config)
diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index 1bb544767a..4eb1bb5bbf 100644
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -69,15 +69,7 @@ QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
 
-QMAKE_ZIP               = zip -r -9
-
-QMAKE_COPY              = copy /y
-QMAKE_COPY_DIR          = xcopy /s /q /y /i
-QMAKE_MOVE              = move
-QMAKE_DEL_FILE          = del
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = if not exist
-QMAKE_MKDIR             = mkdir
+include(../../common/shell-win32.conf)
 
 VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln