d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-03-12 13:41:59 +00:00
Code Issues Projects Releases Wiki Activity

fix ci

Browse Source
This commit is contained in:
Er2 2023-05-09 20:12:03 +03:00
parent f9added066
commit 569816e8ed
10 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ jobs:
- name: Build dedicated windows-i386 - name: Build dedicated windows-i386
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T debug -d ./waf.bat configure -T debug -dl
./waf.bat build ./waf.bat build
build-dedicated-windows-amd64: build-dedicated-windows-amd64:
@ -71,7 +71,7 @@ jobs:
- name: Build dedicated windows-amd64 - name: Build dedicated windows-amd64
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T debug -d -8 ./waf.bat configure -T debug -dl -8
./waf.bat build ./waf.bat build
build-dedicated-linux-i386: build-dedicated-linux-i386:
@ -81,7 +81,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Build dedicated linux-i386 - name: Build dedicated linux-i386
run: | run: |
scripts/build-ubuntu-i386.sh -d scripts/build-ubuntu-i386.sh -dl
build-dedicated-linux-amd64: build-dedicated-linux-amd64:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
@ -90,7 +90,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Build dedicated linux-amd64 - name: Build dedicated linux-amd64
run: | run: |
scripts/build-ubuntu-amd64.sh -d scripts/build-ubuntu-amd64.sh -dl
build-macos-amd64: build-macos-amd64:
runs-on: macos-latest runs-on: macos-latest
@ -108,4 +108,4 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Build dedicated macos-amd64 - name: Build dedicated macos-amd64
run: | run: |
scripts/build-macos-amd64.sh -d scripts/build-macos-amd64.sh -dl

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 -lt --prefix=out/
./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 -lt --prefix=out/ -8
./waf.bat install ./waf.bat install
cd out cd out
$env:Path = "bin"; $env:Path = "bin";

2
scripts/build-android-armv7a.sh
View File

@ -5,5 +5,5 @@ wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip
unzip android-ndk-r10e-linux-x86_64.zip unzip android-ndk-r10e-linux-x86_64.zip
export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/ export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/
export NDK_HOME=$PWD/android-ndk-r10e/ export NDK_HOME=$PWD/android-ndk-r10e/
./waf configure -T debug --android=armeabi-v7a-hard,4.9,21 --togles --disable-warns && ./waf configure -T debug --android=armeabi-v7a-hard,4.9,21 --use-togles --no-warns &&
./waf build ./waf build

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 --64bits --no-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 --64bits --no-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 --no-warns $* &&
./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 --no-warns -lt -8 --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 --no-warns -lt --prefix=out/ --64bits $* &&
./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 --sanitize=address,undefined --no-warns -lt --prefix=out/ $* &&
./waf install && ./waf install &&
cd out && cd out &&
LD_LIBRARY_PATH=bin/ ./unittest LD_LIBRARY_PATH=bin/ ./unittest

17
wscript
View File

@ -181,18 +181,19 @@ def define_platform(conf):
if conf.options.LAUNCHER: if conf.options.LAUNCHER:
conf.env.projects += ['main'] conf.env.projects += ['main']
if conf.options.GL: conf.env.GL = conf.options.GL or conf.options.TOGLES
conf.env.GL = True if conf.options.TOGLES:
conf.env.TOGLES = True
conf.env.targets += ['togles']
conf.env.append_unique('DEFINES', ['TOGLES'])
if conf.env.GL:
if not conf.env.TOGLES:
conf.env.targets += ['togl'] conf.env.targets += ['togl']
conf.env.append_unique('DEFINES', [ conf.env.append_unique('DEFINES', [
'DX_TO_GL_ABSTRACTION', 'DX_TO_GL_ABSTRACTION',
'GL_GLEXT_PROTOTYPES', 'GL_GLEXT_PROTOTYPES',
'BINK_VIDEO' 'BINK_VIDEO'
]) ])
elif conf.options.TOGLES:
conf.env.TOGLES = True
conf.env.targets += ['togles']
conf.env.append_unique('DEFINES', ['TOGLES'])
if conf.options.SDL: if conf.options.SDL:
conf.env.SDL = True conf.env.SDL = True
@ -283,7 +284,7 @@ def options(opt):
if sys.platform == 'win32': if sys.platform == 'win32':
grp.add_option('--use-sdl', action = 'store_true', dest = 'SDL', default = False, grp.add_option('--use-sdl', action = 'store_true', dest = 'SDL', default = False,
help = 'build engine with SDL [default: %default]') help = 'build engine with SDL [default: %default]')
grp.add_option('--use-togl', action = 'store_true', dest = 'SDL', default = False, grp.add_option('--use-togl', action = 'store_true', dest = 'GL', default = False,
help = 'build engine with ToGL [default: %default]') help = 'build engine with ToGL [default: %default]')
else: else:
grp.add_option('--no-sdl', action = 'store_false', dest = 'SDL', default = True, grp.add_option('--no-sdl', action = 'store_false', dest = 'SDL', default = True,
@ -610,6 +611,8 @@ def configure(conf):
for proj in conf.env.projects: for proj in conf.env.projects:
conf.add_subproject(projects[proj]) conf.add_subproject(projects[proj])
for targ in conf.env.targets:
conf.add_subproject(targ)
def build(bld): def build(bld):
os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU) os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU)