diff options
author | Memphiz <memphis@machzwo.de> | 2014-08-21 17:59:36 +0200 |
---|---|---|
committer | Memphiz <memphis@machzwo.de> | 2014-08-21 17:59:36 +0200 |
commit | 05cee4b2cb358b016c5d16b006bc6c89e3245acd (patch) | |
tree | 0ce58cb7d2268fd7ab7d028069766e56f40c28a5 | |
parent | f735be9d05108b30298b5ecfa83024e99c193092 (diff) | |
parent | 8ff5b9de07928e02ac12357f89f535c9b72b706d (diff) |
Merge pull request #5260 from Memphiz/gitcleanforceforce
[jenkins] - when cleaning the tree because of changed depends - ensure to to doubleforce
-rw-r--r-- | tools/buildsteps/android/prepare-depends | 2 | ||||
-rw-r--r-- | tools/buildsteps/androidx86/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/atv2/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/ios/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/linux32/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/linux64/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/osx32/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/osx64/prepare-depends | 2 | ||||
-rwxr-xr-x | tools/buildsteps/rbpi/prepare-depends | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/tools/buildsteps/android/prepare-depends b/tools/buildsteps/android/prepare-depends index 8aabe48b7c..a923c8dc04 100644 --- a/tools/buildsteps/android/prepare-depends +++ b/tools/buildsteps/android/prepare-depends @@ -8,6 +8,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/androidx86/prepare-depends b/tools/buildsteps/androidx86/prepare-depends index 8aabe48b7c..a923c8dc04 100644 --- a/tools/buildsteps/androidx86/prepare-depends +++ b/tools/buildsteps/androidx86/prepare-depends @@ -8,6 +8,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/atv2/prepare-depends b/tools/buildsteps/atv2/prepare-depends index 133dee826d..e3e15f72ef 100755 --- a/tools/buildsteps/atv2/prepare-depends +++ b/tools/buildsteps/atv2/prepare-depends @@ -9,7 +9,7 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/ios/prepare-depends b/tools/buildsteps/ios/prepare-depends index 3d2eef33af..5f7bc391a1 100755 --- a/tools/buildsteps/ios/prepare-depends +++ b/tools/buildsteps/ios/prepare-depends @@ -9,6 +9,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/linux32/prepare-depends b/tools/buildsteps/linux32/prepare-depends index 51878d9f1a..0678e4c114 100755 --- a/tools/buildsteps/linux32/prepare-depends +++ b/tools/buildsteps/linux32/prepare-depends @@ -8,6 +8,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/linux64/prepare-depends b/tools/buildsteps/linux64/prepare-depends index 710ad5b8ff..bc10fbae25 100755 --- a/tools/buildsteps/linux64/prepare-depends +++ b/tools/buildsteps/linux64/prepare-depends @@ -8,6 +8,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/osx32/prepare-depends b/tools/buildsteps/osx32/prepare-depends index e3661ccde1..ed4ad83448 100755 --- a/tools/buildsteps/osx32/prepare-depends +++ b/tools/buildsteps/osx32/prepare-depends @@ -9,6 +9,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/osx64/prepare-depends b/tools/buildsteps/osx64/prepare-depends index 81403fadda..da1a2b82a1 100755 --- a/tools/buildsteps/osx64/prepare-depends +++ b/tools/buildsteps/osx64/prepare-depends @@ -9,6 +9,6 @@ cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi diff --git a/tools/buildsteps/rbpi/prepare-depends b/tools/buildsteps/rbpi/prepare-depends index 10ebd93341..615e3b26e1 100755 --- a/tools/buildsteps/rbpi/prepare-depends +++ b/tools/buildsteps/rbpi/prepare-depends @@ -15,6 +15,6 @@ fi if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then #clean up the rest too - cd $WORKSPACE;git clean -xfd + cd $WORKSPACE;git clean -xffd cd $WORKSPACE/tools/depends/;./bootstrap fi |