Skip to content

Commit

Permalink
Merge branch 'develop' into 'main'
Browse files Browse the repository at this point in the history 
New GDX release 7.11.8

See merge request devel/gdx!80
  • Loading branch information
@0x17
0x17 committed Sep 27, 2024
2 parents 9ed0d10 + 365a1cd commit adb3491
Show file tree
Hide file tree
Showing 128 changed files with 10,243 additions and 184 deletions.
12 changes: 5 additions & 7 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
/stubwarnings.txt
/gdx.vcxproj.user
/out/
/build/
/x64/
/cmake-build-debug-coverage/
/cmake-build-release-coverage/
/cmake-build-release/
/cmake-build-debug/
/gdx/x64/
/cmake-build-*/
.idea/
.vs/
.vscode/
/slowdown.txt
/class_benchmarks.txt
/gdxbench_collected.txt
/.vscode/
/gdxtest.xcodeproj/project.xcworkspace/xcuserdata/
/gdxtest.xcodeproj/xcuserdata/
/zlib/
/src/gclgms.h
/src/gdxcc.c
/src/gdxcc.h
/src/__pycache__
/venv/
/docs/html/
/gdx/x64/
/src/__pycache__
102 changes: 96 additions & 6 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ stages:
- build
- analyze
- test
# - test-gdxtools
- leak-check
- perf-check
- docs
Expand Down Expand Up @@ -100,10 +101,12 @@ build-leg:
- cmake --build . 2>&1 | tee build_log.txt
- python3 ciscripts/report_for_log.py gcc build_log.txt warnings.xml
- mv libgdx-static.a libgdx-linux.a
- mkdir -p ./build
- mv {gdxdump,gdxdiff,gdxmerge} ./build
needs: [fetch-ci-scripts,apigenerator]
artifacts:
name: gdx-leg
paths: [gdxtest,gdxwraptest,libgdxcclib64.so,libgdx-linux.a]
paths: [gdxtest,gdxwraptest,libgdxcclib64.so,libgdx-linux.a,build]
expire_in: 2 hours
reports:
junit: warnings.xml
Expand Down Expand Up @@ -138,10 +141,12 @@ build-deg:
- cmake --build . 2>&1 | tee build_log.txt
- python3 ciscripts/report_for_log.py clang build_log.txt warnings.xml
- mv libgdx-static.a libgdx-macos.a
- mkdir -p ./build
- mv {gdxdump,gdxdiff,gdxmerge} ./build
needs: [fetch-ci-scripts,apigenerator]
artifacts:
name: gdx-deg
paths: [gdxtest,gdxwraptest,libgdxcclib64.dylib,libgdx-macos.a]
paths: [gdxtest,gdxwraptest,libgdxcclib64.dylib,libgdx-macos.a,build]
expire_in: 2 hours
reports:
junit: warnings.xml
Expand All @@ -162,10 +167,12 @@ build-dac:
- mv libgdx-static.a libgdx-macos-dac.a
- lipo -create libgdxcclib64_deg.dylib libgdxcclib64_dac.dylib -output libgdxcclib64.dylib
- lipo -create libgdx-macos-deg.a libgdx-macos-dac.a -output libgdx-macos.a
- mkdir -p ./build
- mv {gdxdump,gdxdiff,gdxmerge} ./build
needs: [fetch-ci-scripts,apigenerator,build-deg]
artifacts:
name: gdx-dac
paths: [gdxtest,gdxwraptest,libgdxcclib64.dylib,libgdx-macos.a]
paths: [gdxtest,gdxwraptest,libgdxcclib64.dylib,libgdx-macos.a,build]
expire_in: 2 hours
reports:
junit: warnings.xml
Expand All @@ -192,14 +199,14 @@ build-wei:

#=======================================================================================================================

codechecker-leg:
extends: .codechecker-leg
codechecker-leg-debug:
extends: .codechecker-leg-debug
needs: [fetch-ci-scripts,apigenerator]
script:
- !reference [.get-gams]
- !reference [.gams-folder-leg]
- cp apifiles/* src/
- !reference [.default-codecheck-script, script]
- !reference [.default-codecheck-script-debug, script]

#=======================================================================================================================

Expand Down Expand Up @@ -278,6 +285,89 @@ test-wei:

#=======================================================================================================================

# test-gdxtools-leg:
# stage: test-gdxtools
# tags: [linux]
# image:
# name: $MACHINES_CONTAINER_REG/leg/builder-full:latest
# entrypoint: [""]
# needs: [fetch-ci-scripts,build-leg]
# script:
# - !reference [ .get-gams ]
# - !reference [ .gams-folder-leg ]
# - GAMS_PATH=/cache/gams-installs/`cat gams_folder_leg.txt`/
# - PATH="$GAMS_PATH:$PATH"
# - mkdir -p ~/miniconda3
# - curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -o ~/miniconda3/miniconda.sh
# - bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
# - rm -rf ~/miniconda3/miniconda.sh
# - ~/miniconda3/bin/conda init bash
# - source ~/.bashrc
# - ./src/tools/tests/environments/conda/install.sh
# - conda activate gdxtools
# - python3 ./src/tools/tests/main.py

# test-gdxtools-deg:
# stage: test-gdxtools
# tags: [macos]
# needs: [fetch-ci-scripts,build-deg]
# script:
# - !reference [ .get-gams ]
# - !reference [ .gams-folder-deg ]
# - GAMS_PATH=$HOME/cache/gams-installs/`cat gams_folder_deg.txt`
# - PATH="$GAMS_PATH:$PATH"
# - mkdir -p ~/miniconda3
# - curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o ~/miniconda3/miniconda.sh
# - bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
# - rm -rf ~/miniconda3/miniconda.sh
# - ~/miniconda3/bin/conda init bash
# - source ~/.bashrc
# - ./src/tools/tests/environments/conda/install.sh
# - conda activate gdxtools
# - python3 ./src/tools/tests/main.py

# test-gdxtools-dac:
# stage: test-gdxtools
# tags: [macos-arm64]
# needs: [fetch-ci-scripts,build-dac]
# script:
# - !reference [ .get-gams ]
# - !reference [ .gams-folder-dac ]
# - GAMS_PATH=$HOME/cache/gams-installs/`cat gams_folder_dac.txt`
# - PATH="$GAMS_PATH:$PATH"
# - mkdir -p ~/miniconda3
# - curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o ~/miniconda3/miniconda.sh
# - bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
# - rm -rf ~/miniconda3/miniconda.sh
# - ~/miniconda3/bin/conda init bash
# - source ~/.bashrc
# - ./src/tools/tests/environments/conda/install.sh
# - conda activate gdxtools
# - python3 ./src/tools/tests/main.py

# test-gdxtools-wei:
# stage: test-gdxtools
# tags: [windows]
# image:
# name: $MACHINES_CONTAINER_REG/wei/builder-full:latest
# needs: [fetch-ci-scripts,build-wei]
# script:
# - !reference [ .get-gams-wei ]
# - !reference [ .gams-folder-wei ]
# - $gmsdirname = Get-Content mygmsdir.tmp -Raw
# - $GAMS_PATH = "C:\Cache\gams-installs\$gmsdirname"
# - $env:Path = "$GAMS_PATH;$GAMS_PATH\gbin;" + $env:Path
# # - $env:GAMSDIR = "$GAMS_PATH;$GAMS_PATH\gbin"
# - curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -o miniconda.exe
# - start /wait "" miniconda.exe /S
# - del miniconda.exe
# # - Update-SessionEnvironment
# - .\src\tools\tests\environments\conda\install.sh
# - conda activate gdxtools
# - python3 .\src\tools\tests\main.py

#=======================================================================================================================

leak-check-leg:
stage: leak-check
tags: [linux]
Expand Down
164 changes: 82 additions & 82 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,97 +54,97 @@ endif (UNIX)
include(base-units.cmake)

set(zlib-units
# ZLIB modules
# missing? run in project root: git clone https://github.com/madler/zlib zlib
zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzclose.c zlib/gzlib.c zlib/gzread.c
zlib/gzwrite.c zlib/infback.c zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c zlib/uncompr.c
zlib/zutil.c
# ZLIB modules
# missing? run in project root: git clone https://github.com/madler/zlib zlib
zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzclose.c zlib/gzlib.c zlib/gzread.c
zlib/gzwrite.c zlib/infback.c zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c zlib/uncompr.c
zlib/zutil.c
)

set(gdx-core
# P3 runtime library
src/rtl/dtoaLoc.h
src/rtl/dtoaLoc.c
src/rtl/p3io.h
src/rtl/p3io.cpp
src/rtl/p3utils.h
src/rtl/p3utils.cpp
src/rtl/sysutils_p3.h
src/rtl/sysutils_p3.cpp
src/rtl/p3platform.h
src/rtl/p3platform.cpp
src/rtl/math_p3.h
src/rtl/math_p3.cpp

# gdlib essential units
src/gdlib/gmsstrm.cpp
src/gdlib/gmsstrm.h
src/gdlib/utils.h
src/gdlib/utils.cpp
src/gdlib/strutilx.h
src/gdlib/strutilx.cpp
src/gdlib/strindexbuf.h

# GDX specific units
src/gxfile.h
src/gxfile.cpp
src/gdx.h

${zlib-units}
# P3 runtime library
src/rtl/dtoaLoc.h
src/rtl/dtoaLoc.c
src/rtl/p3io.h
src/rtl/p3io.cpp
src/rtl/p3utils.h
src/rtl/p3utils.cpp
src/rtl/sysutils_p3.h
src/rtl/sysutils_p3.cpp
src/rtl/p3platform.h
src/rtl/p3platform.cpp
src/rtl/math_p3.h
src/rtl/math_p3.cpp

# gdlib essential units
src/gdlib/gmsstrm.cpp
src/gdlib/gmsstrm.h
src/gdlib/utils.h
src/gdlib/utils.cpp
src/gdlib/strutilx.h
src/gdlib/strutilx.cpp
src/gdlib/strindexbuf.h

# GDX specific units
src/gxfile.h
src/gxfile.cpp
src/gdx.h

${zlib-units}
)

set(test-deps
# runtime library
src/rtl/p3library.cpp
src/rtl/p3library.h
src/rtl/stdthread.cpp
src/rtl/stdthread.h

# global
src/global/gmslibname.cpp
src/global/gmslibname.h

# gdlib
src/gdlib/charmaps.cpp
src/gdlib/charmaps.h
src/gdlib/gmacro.cpp
src/gdlib/gmacro.h
src/gdlib/gmsheapnew.cpp
src/gdlib/gmsheapnew.h
src/gdlib/gmsonly.h
src/gdlib/gmsonly.cpp
src/gdlib/obfuscatestr.cpp
src/gdlib/obfuscatestr.h
src/gdlib/strhash.h
src/gdlib/strhash.cpp
src/gdlib/xcompress.cpp
src/gdlib/xcompress.h
# runtime library
src/rtl/p3library.cpp
src/rtl/p3library.h
src/rtl/stdthread.cpp
src/rtl/stdthread.h

# global
src/global/gmslibname.cpp
src/global/gmslibname.h

# gdlib
src/gdlib/charmaps.cpp
src/gdlib/charmaps.h
src/gdlib/gmacro.cpp
src/gdlib/gmacro.h
src/gdlib/gmsheapnew.cpp
src/gdlib/gmsheapnew.h
src/gdlib/gmsonly.h
src/gdlib/gmsonly.cpp
src/gdlib/obfuscatestr.cpp
src/gdlib/obfuscatestr.h
src/gdlib/strhash.h
src/gdlib/strhash.cpp
src/gdlib/xcompress.cpp
src/gdlib/xcompress.h
)

set(tests
src/tests/doctestmain.cpp

src/tests/gdxtests.h
src/tests/gdxtests.cpp
src/tests/gxfiletests.cpp

src/tests/gdlib/datastoragetests.cpp
src/tests/gdlib/glookuptests.cpp
src/tests/gdlib/gmacrotests.cpp
src/tests/gdlib/gmsdatatests.cpp
src/tests/gdlib/gmsheapnewtests.cpp
src/tests/gdlib/gmsobjtests.cpp
src/tests/gdlib/gmsstrmtests.cpp
src/tests/gdlib/obfuscatestrtests.cpp
src/tests/gdlib/strhashtests.cpp
src/tests/gdlib/strutilxtests.cpp
src/tests/gdlib/utilstests.cpp
src/tests/gdlib/xcompresstests.cpp

src/tests/rtl/p3iotests.cpp
src/tests/rtl/p3utilstests.cpp
src/tests/rtl/stdthreadtests.cpp
src/tests/rtl/sysutilsp3tests.cpp
src/tests/doctestmain.cpp

src/tests/gdxtests.h
src/tests/gdxtests.cpp
src/tests/gxfiletests.cpp

src/tests/gdlib/datastoragetests.cpp
src/tests/gdlib/glookuptests.cpp
src/tests/gdlib/gmacrotests.cpp
src/tests/gdlib/gmsdatatests.cpp
src/tests/gdlib/gmsheapnewtests.cpp
src/tests/gdlib/gmsobjtests.cpp
src/tests/gdlib/gmsstrmtests.cpp
src/tests/gdlib/obfuscatestrtests.cpp
src/tests/gdlib/strhashtests.cpp
src/tests/gdlib/strutilxtests.cpp
src/tests/gdlib/utilstests.cpp
src/tests/gdlib/xcompresstests.cpp

src/tests/rtl/p3iotests.cpp
src/tests/rtl/p3utilstests.cpp
src/tests/rtl/stdthreadtests.cpp
src/tests/rtl/sysutilsp3tests.cpp
)

set(inc-dirs zlib src generated)
Expand Down
Loading

0 comments on commit adb3491

Please sign in to comment.