H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2024-12-22 14:16:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build scripts for workflow

Browse Source
This commit is contained in:
nillerusr 2023-11-08 21:58:33 +03:00
parent ab527be41a
commit abb470a471
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
- name: Build windows-i386 - name: Build windows-i386
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T debug ./waf.bat configure -T debug --32bits
./waf.bat build ./waf.bat build
build-windows-amd64: build-windows-amd64:
@ -49,7 +49,7 @@ jobs:
- name: Build windows-amd64 - name: Build windows-amd64
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T debug -8 ./waf.bat configure -T debug
./waf.bat build ./waf.bat build
build-dedicated-windows-i386: build-dedicated-windows-i386:

4
.github/workflows/tests.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
- name: Run tests windows-i386 - name: Run tests windows-i386
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T release --tests --prefix=out/ ./waf.bat configure -T release --tests --prefix=out/ --32bits
./waf.bat install ./waf.bat install
cd out cd out
$env:Path = "bin"; $env:Path = "bin";
@ -52,7 +52,7 @@ jobs:
- name: Run tests windows-amd64 - name: Run tests windows-amd64
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T release --tests --prefix=out/ -8 ./waf.bat configure -T release --tests --prefix=out/
./waf.bat install ./waf.bat install
cd out cd out
$env:Path = "bin"; $env:Path = "bin";

2
scripts/build-macos-amd64.sh
View File

@ -4,5 +4,5 @@ git submodule init && git submodule update
brew install sdl2 brew install sdl2
./waf configure -T debug --64bits --disable-warns $* && ./waf configure -T debug --disable-warns $* &&
./waf build ./waf build

2
scripts/build-ubuntu-amd64.sh
View File

@ -4,5 +4,5 @@ git submodule init && git submodule update
sudo apt-get update sudo apt-get update
sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev
./waf configure -T debug --64bits --disable-warns $* && ./waf configure -T debug --disable-warns $* &&
./waf build ./waf build

2
scripts/build-ubuntu-i386.sh
View File

@ -6,5 +6,5 @@ sudo apt-get update
sudo apt-get install -y aptitude sudo apt-get install -y aptitude
sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386 sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386
PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns $* && PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns --32bits $* &&
./waf build ./waf build

2
scripts/tests-macos-amd64.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
git submodule init && git submodule update git submodule init && git submodule update
./waf configure -T release --sanitize=address,undefined --disable-warns --tests -8 --prefix=out/ $* && ./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
./waf install && ./waf install &&
cd out && cd out &&
DYLD_LIBRARY_PATH=bin/ ./unittest || exit 1 DYLD_LIBRARY_PATH=bin/ ./unittest || exit 1

2
scripts/tests-ubuntu-amd64.sh
View File

@ -4,7 +4,7 @@ git submodule init && git submodule update
sudo apt-get update sudo apt-get update
sudo apt-get install -y libbz2-dev sudo apt-get install -y libbz2-dev
./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ --64bits $* && ./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
./waf install && ./waf install &&
cd out && cd out &&
LD_LIBRARY_PATH=bin/ ./unittest LD_LIBRARY_PATH=bin/ ./unittest

2
scripts/tests-ubuntu-i386.sh
View File

@ -5,7 +5,7 @@ sudo dpkg --add-architecture i386
sudo apt-get update sudo apt-get update
sudo apt-get install -y g++-multilib gcc-multilib libbz2-dev:i386 sudo apt-get install -y g++-multilib gcc-multilib libbz2-dev:i386
PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* && PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --32bits --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
./waf install && ./waf install &&
cd out && cd out &&
LD_LIBRARY_PATH=bin/ ./unittest LD_LIBRARY_PATH=bin/ ./unittest

2
wscript
View File

@ -441,7 +441,7 @@ def configure(conf):
conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01' conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
conf.env.MSVC_TARGETS = ['x64'] # explicitly request x86 target for MSVC conf.env.MSVC_TARGETS = ['x64'] # explicitly request x86 target for MSVC
if conf.options.TARGET32: if conf.options.TARGET32:
conf.env.MSVC_TARGETS = ['x32'] conf.env.MSVC_TARGETS = ['x86']
if sys.platform == 'win32': if sys.platform == 'win32':
conf.load('msvc_pdb_ext msdev msvs') conf.load('msvc_pdb_ext msdev msvs')