Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deactivate window cross-compiling build

Browse Source
This commit is contained in:
xawotihs
2014-07-23 23:20:54 +02:00
parent f2a5273029
commit e87996a7f2
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
travis-script.sh
+19 -18
View File
@@ -74,24 +74,25 @@ make -j 8
# we're cross-compiling a Qt Windows version here, # we're cross-compiling a Qt Windows version here,
# PATH is only set here to prevent colision # PATH is only set here to prevent colision
export PATH="$PATH:/opt/mingw32/bin"
mkdir build # export PATH="$PATH:/opt/mingw32/bin"
cd build # mkdir build
mkdir win-cross # cd build
cd win-cross # mkdir win-cross
/opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics # cd win-cross
make -j 8 # /opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
cd release # make -j 8
cp ../../../projects/mtg/bin/fmod.dll . # cd release
cp /opt/mingw32/bin/QtCore4.dll . # cp ../../../projects/mtg/bin/fmod.dll .
cp /opt/mingw32/bin/QtGui4.dll . # cp /opt/mingw32/bin/QtCore4.dll .
cp /opt/mingw32/bin/QtNetwork4.dll . # cp /opt/mingw32/bin/QtGui4.dll .
cp /opt/mingw32/bin/QtOpenGL4.dll . # cp /opt/mingw32/bin/QtNetwork4.dll .
cp ../../../projects/mtg/bin/zlib1.dll . # cp /opt/mingw32/bin/QtOpenGL4.dll .
cp /opt/mingw32/bin/libpng15-15.dll . # cp ../../../projects/mtg/bin/zlib1.dll .
cd .. # cp /opt/mingw32/bin/libpng15-15.dll .
zip win-cross.zip -r release/ # cd ..
cd ../.. # zip win-cross.zip -r release/
# cd ../..
# Now we run the testsuite (Res needs to be in the working directory) # Now we run the testsuite (Res needs to be in the working directory)
cd projects/mtg cd projects/mtg
upload-binaries.sh
+12 -12
View File
@@ -26,12 +26,12 @@ if [ "$TRAVIS_BRANCH" == "alphas" ]; then
--data-binary @projects/mtg/psprelease.zip \ --data-binary @projects/mtg/psprelease.zip \
"https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip"
echo -e "Uploading Windows package\n" # echo -e "Uploading Windows package\n"
curl -X POST -H "Authorization: token ${GH_TOKEN}" \ # curl -X POST -H "Authorization: token ${GH_TOKEN}" \
-H "Accept: application/vnd.github.manifold-preview" \ # -H "Accept: application/vnd.github.manifold-preview" \
-H "Content-Type: application/zip" \ # -H "Content-Type: application/zip" \
--data-binary @build/win-cross/win-cross.zip \ # --data-binary @build/win-cross/win-cross.zip \
"https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" # "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip"
echo -e "Done uploading\n" echo -e "Done uploading\n"
fi fi
@@ -87,12 +87,12 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
--data-binary @projects/mtg/psprelease.zip \ --data-binary @projects/mtg/psprelease.zip \
"https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip"
echo -e "Uploading Windows package\n" # echo -e "Uploading Windows package\n"
curl -X POST -H "Authorization: token ${GH_TOKEN}" \ # curl -X POST -H "Authorization: token ${GH_TOKEN}" \
-H "Accept: application/vnd.github.manifold-preview" \ # -H "Accept: application/vnd.github.manifold-preview" \
-H "Content-Type: application/zip" \ # -H "Content-Type: application/zip" \
--data-binary @build/win-cross/win-cross.zip \ # --data-binary @build/win-cross/win-cross.zip \
"https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" # "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip"
echo -e "Done uploading\n" echo -e "Done uploading\n"
fi fi