Merge branch 'master' of https://github.com/WagicProject/wagic into cmake

tools/macos.travis.yml

@@ -5,11 +5,15 @@ before_install:
 - brew install qt5
 - sudo pip install pyjavaproperties
 - sudo pip install github3.py
-- brew install dpkg
-- curl -s -f -L https://raw.github.com/r-plus/dotfiles/master/install_theos.sh | bash
+- brew install dpkg ldid
+#- curl -s -f -L https://raw.github.com/r-plus/dotfiles/master/install_theos.sh | bash
+- mkdir theos
+- cd theos
+- git clone --recursive https://github.com/theos/theos.git
+- export THEOS="$TRAVIS_BUILD_DIR/theos"
+- cd ..
 - pwd
 - ls
-
 env:
   global:
     secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8="

tools/travis-script.sh

@@ -78,6 +78,7 @@ if [ "$BUILD_TYPE" = "Qt" ]; then
     cd build_qt_widget
     cmake -Dbackend_qt_widget=ON -Dbackend_qt_console=OFF ..
     make -j4 wagic
+    chmod -R 775 wagic
     cd ..
 
     # let's try an Intel linux binary in debug text-mode-only

tools/upload-binaries.py

@@ -13,6 +13,7 @@ def checkRelease(repository, remote, branch):
             for a in r.assets :
                 if a.name == remote :
                     # need to delete the old release
+                    print '!deleting old release! -> ' + r.name
                     r.delete()
                     # need also to delete the tag (reference)
                     ref = repository.ref('tags/latest-' + branch)
@@ -51,6 +52,10 @@ def main():
 
     if (options.token and options.sha and options.local and options.remote and (options.branch == 'master' or options.branch == 'travis_mac_osx' or options.branch == 'cmake' )):
         gh = login(token = options.token)
+    elif (options.branch != 'master' and options.branch != 'travis_mac_osx'):
+        print '!branch is not master or travis_mac_osx! -> ' + options.branch
+        print '-will not upload-'
+        return
     else:
         parser.print_help()
         return