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>

diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
index e1356d2..14bfd8e 100644 (file)
--- a/mkspecs/aix-g++-64/qmake.conf
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -68,14 +68,5 @@ QMAKE_AR                = ar -X64 cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB            = ranlib -X64
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index f079f69..cf3266f 100644 (file)
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -68,14 +68,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index a3a52c5..49c976e 100644 (file)
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -67,14 +67,5 @@ QMAKE_AR             = ar -X64 cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB           = ranlib -X64
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 4a352a8..3897e61 100644 (file)
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -68,14 +68,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB           = 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 739f508..bfb4b2b 100644 (file)
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -49,19 +49,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/common/mac.conf b/mkspecs/common/mac.conf
index 56302c7..cb67462 100644 (file)
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -22,17 +22,4 @@ QMAKE_LIBS_THREAD    =
 QMAKE_AR               = ar cq
 QMAKE_RANLIB           = ranlib -s
 
-QMAKE_TAR              = tar -cf
-QMAKE_GZIP             = gzip -9f
-
-QMAKE_COPY             = cp -f
-QMAKE_COPY_FILE                = $$QMAKE_COPY
-QMAKE_COPY_DIR         = $$QMAKE_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
-
-
 include(unix.conf)

diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index b0949c1..175ef0d 100644 (file)
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -53,17 +53,4 @@ QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
 QMAKE_LINK              = $$QMAKE_CXX
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX
 
-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_STRIPFLAGS_LIB    += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS    = test -d
-QMAKE_MKDIR             = mkdir -p

diff --git a/mkspecs/common/shell-unix.conf b/mkspecs/common/shell-unix.conf
new file mode 100644 (file)
index 0000000..a894867
--- /dev/null
+++ b/mkspecs/common/shell-unix.conf
@@ -0,0 +1,12 @@
+QMAKE_TAR              = tar -cf
+QMAKE_GZIP             = gzip -9f
+
+QMAKE_COPY             = cp -f
+QMAKE_COPY_FILE        = $$QMAKE_COPY
+QMAKE_COPY_DIR         = $$QMAKE_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_STREAM_EDITOR    = sed

diff --git a/mkspecs/common/shell-win32.conf b/mkspecs/common/shell-win32.conf
new file mode 100644 (file)
index 0000000..ee13754
--- /dev/null
+++ b/mkspecs/common/shell-win32.conf
@@ -0,0 +1,9 @@
+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

diff --git a/mkspecs/common/unix.conf b/mkspecs/common/unix.conf
index c480ba4..9ee6265 100644 (file)
--- a/mkspecs/common/unix.conf
+++ b/mkspecs/common/unix.conf
@@ -12,3 +12,5 @@ QMAKE_YACC_SOURCE       = $base.tab.c
 QMAKE_PREFIX_SHLIB      = lib
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
+
+include(shell-unix.conf)

diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 6cc0edf..e76a675 100644 (file)
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -72,15 +72,7 @@ QMAKE_IDL            = midl
 QMAKE_LIB              = lib
 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(../shell-win32.conf)
 
 VCPROJ_EXTENSION       = .vcproj
 VCSOLUTION_EXTENSION   = .sln

diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index cacc9bf..35f504e 100644 (file)
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -73,13 +73,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 1d46d7a..5a6c6a9 100644 (file)
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -79,18 +79,6 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB           = ranlib -s
 
-QMAKE_TAR              = tar -cf
-QMAKE_GZIP             = gzip -9f
-
-QMAKE_COPY             = cp -f
-QMAKE_COPY_FILE                = $$QMAKE_COPY
-QMAKE_COPY_DIR         = $$QMAKE_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_PCH_OUTPUT_EXT    = .gch
 
 QMAKE_CXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}

diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 2838c24..a8c6bf6 100644 (file)
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -33,15 +33,6 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)

diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
index 755f7ee..9d9213a 100644 (file)
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -33,15 +33,6 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)

diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index 0509d75..5de842f 100644 (file)
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -91,14 +91,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 9463f73..0831df6 100644 (file)
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -112,14 +112,5 @@ QMAKE_AR           = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index 2e6cb2c..d8d780e 100644 (file)
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -110,14 +110,5 @@ QMAKE_AR           = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 9888e17..87b67f0 100644 (file)
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -91,14 +91,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index 33f1c7c..0323baa 100644 (file)
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -74,14 +74,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 1c4e5ef..b7040b7 100644 (file)
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -74,14 +74,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index ffc36b0..c17bda1 100644 (file)
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -66,14 +66,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index ee6d1ea..7505cc7 100644 (file)
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -109,14 +109,5 @@ QMAKE_AR           = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index 44492ca..01d39fa 100644 (file)
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -77,14 +77,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index 7337d42..aeeac65 100644 (file)
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -43,19 +43,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/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 2b74272..af102a0 100644 (file)
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -104,14 +104,5 @@ QMAKE_RANLIB               =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 2e41557..684e2cf 100644 (file)
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -104,14 +104,5 @@ QMAKE_RANLIB               =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index 0ee4a37..915e3f6 100644 (file)
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -74,14 +74,5 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = so_locations
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index fdcb6b8..2a7d964 100644 (file)
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -74,14 +74,5 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = so_locations
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 269a6af..2c0eb68 100644 (file)
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -63,14 +63,5 @@ QMAKE_LIBS_OPENGL_QT = -lGL
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index f92a430..01c11cc 100644 (file)
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -70,14 +70,5 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)/ti_files
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index dd1a329..d29d4a5 100644 (file)
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -79,16 +79,6 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)/ti_files
 
-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
-
 # pch support
 CONFIG += icc_pch_style
 QMAKE_PCH_OUTPUT_EXT    = .pchi

diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 97315b4..5a48435 100644 (file)
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -79,14 +79,5 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)ti_files
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index b0a2986..dfe7f19 100644 (file)
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -68,14 +68,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index 961510c..1b29b09 100644 (file)
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -71,16 +71,8 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS   = test -d
-QMAKE_MKDIR            = mkdir -p
+
 include(../common/unix.conf)
 load(qt_config)

diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf
index 579eccd..6e3639c 100644 (file)
--- a/mkspecs/macx-xlc/qmake.conf
+++ b/mkspecs/macx-xlc/qmake.conf
@@ -79,16 +79,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB           = ranlib -s
 
-QMAKE_TAR              = tar -cf
-QMAKE_GZIP             = gzip -9f
-
-QMAKE_COPY             = cp -f
-QMAKE_COPY_FILE         = $$QMAKE_COPY
-QMAKE_COPY_DIR          = $$QMAKE_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
 include(../common/unix.conf)
 load(qt_config)

diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index bf94ca7..9ca9f16 100644 (file)
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -69,14 +69,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB           = 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 1eb2482..8bb5515 100644 (file)
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -70,14 +70,5 @@ QMAKE_AR             = ar q
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB           = 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 9948e05..afa5781 100644 (file)
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -64,14 +64,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index 73d1ff9..a9b6713 100644 (file)
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -66,14 +66,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 6a046f2..a3a12e6 100644 (file)
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -91,14 +91,5 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 58c5fe7..aef2647 100644 (file)
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -74,14 +74,5 @@ QMAKE_RANLIB         =
 
 QMAKE_CLEAN            = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
-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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index d6e4058..59b0eeb 100644 (file)
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -93,14 +93,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 1c2b91f..a080111 100644 (file)
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -76,14 +76,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index 2f08b07..f2f5403 100644 (file)
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -65,14 +65,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index 46c06d4..ff53757 100644 (file)
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -67,14 +67,5 @@ QMAKE_AR             = ar cqs
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index d273462..8300a04 100644 (file)
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -70,14 +70,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index 2c9fa85..f827be0 100644 (file)
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -69,14 +69,5 @@ QMAKE_AR             = ar cq
 QMAKE_OBJCOPY           = objcopy
 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/unix.conf)
 load(qt_config)

diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index 969d22f..12891d5 100644 (file)
--- 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 53cc955..e791291 100644 (file)
--- 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 d269be2..6c87839 100644 (file)
--- 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 4fed2b5..1d078b1 100644 (file)
--- 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 eb3b02b..512d37f 100644 (file)
--- 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 903c655..00a6a26 100644 (file)
--- 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 baa3b04..23e3261 100644 (file)
--- 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 68fa5ec..41bdfb0 100644 (file)
--- 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 19b4507..6914642 100644 (file)
--- 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 55f1d71..14835eb 100644 (file)
--- 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 abf1657..cc486f7 100644 (file)
--- 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 1bb5447..4eb1bb5 100644 (file)
--- 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

diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 2740e6d..de50a15 100644 (file)
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -83,28 +83,14 @@ QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 !isEmpty(QMAKE_SH) {
     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
-       QMAKE_MKDIR             = mkdir -p
-       QMAKE_DEL_DIR           = rmdir
-    QMAKE_CHK_DIR_EXISTS = test -d
+    include(../common/shell-unix.conf)
 } else {
-       QMAKE_COPY              = copy /y
-       QMAKE_COPY_DIR          = xcopy /s /q /y /i
-       QMAKE_MOVE              = move
-       QMAKE_DEL_FILE          = del
-       QMAKE_MKDIR             = mkdir
-       QMAKE_DEL_DIR           = rmdir
-    QMAKE_CHK_DIR_EXISTS       = if not exist
+    include(../common/shell-win32.conf)
 }
 
 QMAKE_IDL              = midl
 QMAKE_LIB              = ar -ru
 QMAKE_RC               = windres
-QMAKE_ZIP              = zip -r -9
 
 QMAKE_STRIP            = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 50d815d..58043e4 100644 (file)
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -69,15 +69,7 @@ QMAKE_IDL            = midl
 QMAKE_LIB              = xilib /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)
 
 DSP_EXTENSION          = .dsp
 load(qt_config)

diff --git a/mkspecs/win32-msvc11/qmake.conf b/mkspecs/win32-msvc11/qmake.conf
index 0603c10..2f663c6 100644 (file)
--- a/mkspecs/win32-msvc11/qmake.conf
+++ b/mkspecs/win32-msvc11/qmake.conf
@@ -85,15 +85,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        = .vcxproj
 VCSOLUTION_EXTENSION    = .sln

diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 3bf2422..01cfe05 100644 (file)
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -79,15 +79,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

diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index d79c94e..904b57a 100644 (file)
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -81,15 +81,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

diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 7d662db..3047146 100644 (file)
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -83,15 +83,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        = .vcxproj
 VCSOLUTION_EXTENSION    = .sln