Skip to content

Commit

Permalink
Merge branch '14-apigenerator-cpp-gdxheader' into 'develop'
Browse files Browse the repository at this point in the history
Get rid of doxy2yaml

See merge request devel/gdx!21
  • Loading branch information
0x17 committed Oct 23, 2023
2 parents 99d9e0d + 2feeb01 commit 753593a
Show file tree
Hide file tree
Showing 4 changed files with 1,167 additions and 8 deletions.
6 changes: 2 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ apigenerator:
name: registry.gams.com/devel/gdx/leg/builder-gdx:latest
entrypoint: [ "" ]
script:
# first generate gdxapi.yaml from files in src/apiyaml and GDX main header file with doxy2yaml-tool
- python3 src/doxy2yaml/doxy2yaml.py name=gdxapi header=../gdx.h indir=src/apiyaml outdir=`pwd`
# somehow I need absolute path for apidef arg
- GVERSIONMAJOR=45 GVERSIONMINOR=0 GVERSIONRELEASE=0 python3 src/apigenerator/src/mkapi.py --apidef `pwd`/gdxapi.yaml --outputpath apifiles/ --output cc cpplib
- GVERSIONMAJOR=45 GVERSIONMINOR=0 GVERSIONRELEASE=0 python3 src/apigenerator/src/mkapi.py --apidef `pwd`/src/gdxapi.yaml --outputpath apifiles/ --output cc cpplib
- cp src/apigenerator/include/gc*.h apifiles
- |
for f in "gdxcc.h" "gdxcc.c" "gdxcclib.cpp" "gclgms.h"; do
Expand All @@ -70,7 +68,7 @@ apigenerator:
artifacts:
name: apifiles
expire_in: 2 hours
paths: [ apifiles/* ]
paths: [apifiles/*]

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

Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "src/apigenerator"]
path = src/apigenerator
url = ../apigenerator.git
[submodule "src/doxy2yaml"]
path = src/doxy2yaml
url = ../doxy2yaml.git
1 change: 0 additions & 1 deletion src/doxy2yaml
Submodule doxy2yaml deleted from 48271a
Loading

0 comments on commit 753593a

Please sign in to comment.