Browse Source

scripts: remove waf jobs, as waf smart enough to get CPU number, fix upload archive name for osx, install newer python in windows

pull/2/head
Alibek Omarov 6 years ago
parent
commit
d7ea40d850
  1. 2
      .travis.yml
  2. 2
      scripts/build_linux_engine.sh
  3. 4
      scripts/build_mingw_engine.sh
  4. 2
      scripts/build_osx_engine.sh
  5. 2
      scripts/build_windows_engine.sh
  6. 5
      scripts/travis_windows_deps.sh

2
.travis.yml

@ -69,7 +69,7 @@ jobs: @@ -69,7 +69,7 @@ jobs:
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
after_script:
- cd ${TRAVIS_BUILD_DIR}
- sh scripts/yadisk_upload.sh Xash3DFWGS-i386.AppImage xash3d-mingw.7z
- sh scripts/yadisk_upload.sh xash3d-osx.tar.bz2
- # ...
name: "Build for Windows MSVC"
cache: ccache

2
scripts/build_linux_engine.sh

@ -32,7 +32,7 @@ cd $TRAVIS_BUILD_DIR @@ -32,7 +32,7 @@ cd $TRAVIS_BUILD_DIR
export CC="ccache gcc"
export CXX="ccache g++"
./waf configure --sdl2=$TRAVIS_BUILD_DIR/SDL2_linux --vgui=$TRAVIS_BUILD_DIR/vgui-dev --build-type=debug --enable-stb || die
./waf build -j2 || die
./waf build || die
# Build AppImage
scripts/build_appimage.sh

4
scripts/build_mingw_engine.sh

@ -8,11 +8,11 @@ export CC="ccache i686-w64-mingw32-gcc" @@ -8,11 +8,11 @@ export CC="ccache i686-w64-mingw32-gcc"
export CXX="ccache i686-w64-mingw32-g++"
export CFLAGS="-static-libgcc -no-pthread -msse2" # add sse2 to workaround mingw multiple definition of MemoryBarrier bug
export CXXFLAGS="-static-libgcc -static-libstdc++ -no-pthread -msse2"
export LDFLAGS="-static-libgcc -static-libstdc++ -no-pthread --allow-multiple-definition" # workaround some other mingw bugs
export LDFLAGS="-static-libgcc -static-libstdc++ -no-pthread -Wl,--allow-multiple-definition" # workaround some other mingw bugs
export WINRC="i686-w64-mingw32-windres"
rm -rf build # clean build directory
./waf configure --sdl2=$TRAVIS_BUILD_DIR/SDL2_mingw/i686-w64-mingw32/ --disable-vgui --build-type=debug --verbose || die # can't compile VGUI support on MinGW, due to differnet C++ ABI
./waf build -j2 --verbose || die
./waf build --verbose || die
cp $TRAVIS_BUILD_DIR/SDL2_mingw/i686-w64-mingw32//bin/SDL2.dll . # Install SDL2
cp vgui_support_bin/vgui_support.dll .
cp build/engine/xash.dll .

2
scripts/build_osx_engine.sh

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
cd $TRAVIS_BUILD_DIR
python waf configure --sdl2=$HOME/Library/Frameworks/SDL2.framework/ --vgui=$TRAVIS_BUILD_DIR/vgui-dev --build-type=debug || die
python waf build -j2 || die
python waf build || die
mkdir -p pkg/
cp build/engine/libxash.dylib build/game_launch/xash3d build/mainui/libmenu.dylib build/vgui_support/libvgui_support.dylib vgui-dev/lib/vgui.dylib pkg/
cp ~/Library/Frameworks/SDL2.framework/SDL2 pkg/libSDL2.dylib

2
scripts/build_windows_engine.sh

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# Build engine
cd $TRAVIS_BUILD_DIR
./waf configure --sdl2=$TRAVIS_BUILD_DIR/SDL2_VC --vgui=$TRAVIS_BUILD_DIR/vgui-dev --build-type=debug || die
./waf build -j2 || die
./waf build || die
cp $TRAVIS_BUILD_DIR/SDL2_VC/lib/x86/SDL2.dll . # Install SDL2
cp build/vgui_support/vgui_support.dll .

5
scripts/travis_windows_deps.sh

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
# python 2.7 cp65001 support
python -m pip install -U pip
pip install win-unicode-console
# python 3.6
choco install python3
# SDL2 for VC prebuilt
curl http://libsdl.org/release/SDL2-devel-$SDL_VERSION-VC.zip -o SDL2.zip

Loading…
Cancel
Save