diff --git a/travis-script.sh b/travis-script.sh index 244d7c19a..b42f6c070 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -74,24 +74,25 @@ make -j 8 # we're cross-compiling a Qt Windows version here, # PATH is only set here to prevent colision -export PATH="$PATH:/opt/mingw32/bin" -mkdir build -cd build -mkdir win-cross -cd win-cross -/opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics -make -j 8 -cd release -cp ../../../projects/mtg/bin/fmod.dll . -cp /opt/mingw32/bin/QtCore4.dll . -cp /opt/mingw32/bin/QtGui4.dll . -cp /opt/mingw32/bin/QtNetwork4.dll . -cp /opt/mingw32/bin/QtOpenGL4.dll . -cp ../../../projects/mtg/bin/zlib1.dll . -cp /opt/mingw32/bin/libpng15-15.dll . -cd .. -zip win-cross.zip -r release/ -cd ../.. + +# export PATH="$PATH:/opt/mingw32/bin" +# mkdir build +# cd build +# mkdir win-cross +# cd win-cross +# /opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics +# make -j 8 +# cd release +# cp ../../../projects/mtg/bin/fmod.dll . +# cp /opt/mingw32/bin/QtCore4.dll . +# cp /opt/mingw32/bin/QtGui4.dll . +# cp /opt/mingw32/bin/QtNetwork4.dll . +# cp /opt/mingw32/bin/QtOpenGL4.dll . +# cp ../../../projects/mtg/bin/zlib1.dll . +# cp /opt/mingw32/bin/libpng15-15.dll . +# cd .. +# zip win-cross.zip -r release/ +# cd ../.. # Now we run the testsuite (Res needs to be in the working directory) cd projects/mtg diff --git a/upload-binaries.sh b/upload-binaries.sh index a558ccbb9..272b4771d 100755 --- a/upload-binaries.sh +++ b/upload-binaries.sh @@ -26,12 +26,12 @@ if [ "$TRAVIS_BRANCH" == "alphas" ]; then --data-binary @projects/mtg/psprelease.zip \ "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" - echo -e "Uploading Windows package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @build/win-cross/win-cross.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" +# echo -e "Uploading Windows package\n" +# curl -X POST -H "Authorization: token ${GH_TOKEN}" \ +# -H "Accept: application/vnd.github.manifold-preview" \ +# -H "Content-Type: application/zip" \ +# --data-binary @build/win-cross/win-cross.zip \ +# "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" echo -e "Done uploading\n" fi @@ -87,12 +87,12 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then --data-binary @projects/mtg/psprelease.zip \ "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" - echo -e "Uploading Windows package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @build/win-cross/win-cross.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" +# echo -e "Uploading Windows package\n" +# curl -X POST -H "Authorization: token ${GH_TOKEN}" \ +# -H "Accept: application/vnd.github.manifold-preview" \ +# -H "Content-Type: application/zip" \ +# --data-binary @build/win-cross/win-cross.zip \ +# "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" echo -e "Done uploading\n" fi