m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve gitlab pages : link to source package and windows installers

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-30 16:23:10 +01:00
parent 06cfc802d4
commit ba82473ccc
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -12,17 +12,20 @@ job_linux:
- "make -j3 && make ziprelease" - "make -j3 && make ziprelease"
- "API=sdl2 make -j3 && API=sdl2 make ziprelease" - "API=sdl2 make -j3 && API=sdl2 make ziprelease"
- "make docarchive" - "make docarchive"
- "echo $CI_JOB_ID > LINUX_JOB_ID"
artifacts: artifacts:
paths: paths:
- "*.zip" - "*.zip"
- "grafx2*.tgz" - "grafx2*.tgz"
- "VERSION"
- "LINUX_JOB_ID"
pages: pages:
stage: pages stage: pages
script: script:
- "NOLUA=1 API=x11 make htmldoc" - "NOLUA=1 API=x11 make htmldoc"
- "mkdir -p public/htmldoc && cp doc/html/* public/htmldoc/" - "mkdir -p public/htmldoc && cp doc/html/* public/htmldoc/"
- "echo -e '<DOCTYPE html>\n<html><head><title>GrafX2</title></head>\n<body>\n<ul>\n<li><a href=\"doxygen/html/\">doxygen</a></li>\n<li><a href=\"htmldoc/\">htmldoc</a></li>\n</ul>\n</body>\n</html>\n' > public/index.html" - "./.gitlab-page.sh"
- "cd public && tar xzf ../grafx2*doxygen.tgz" - "cd public && tar xzf ../grafx2*doxygen.tgz"
artifacts: artifacts:
paths: paths:
@ -48,7 +51,9 @@ job_win32:
- "WIN32CROSS=1 API=sdl2 make -j2" - "WIN32CROSS=1 API=sdl2 make -j2"
- "WIN32CROSS=1 API=sdl2 make ziprelease" - "WIN32CROSS=1 API=sdl2 make ziprelease"
- "WIN32CROSS=1 API=sdl2 make win32installer" - "WIN32CROSS=1 API=sdl2 make win32installer"
- "echo $CI_JOB_ID > WIN32_JOB_ID"
artifacts: artifacts:
paths: paths:
- "*.zip" - "*.zip"
- "install/grafx2*.exe" - "install/grafx2*.exe"
- "WIN32_JOB_ID"

39
.gitlab-page.sh Executable file
View File

@ -0,0 +1,39 @@
#!/bin/sh
# (c) 2019 Thomas Bernard
#
OUTFILE=public/index.html
VERSION=$(cat VERSION)
LINUX_JOB_ID=$(cat LINUX_JOB_ID)
WIN32_JOB_ID=$(cat WIN32_JOB_ID)
# for debug:
echo "CI_JOB_URL=${CI_JOB_URL}"
echo "CI_PAGES_URL=${CI_PAGES_URL}"
echo "CI_PIPELINE_URL=${CI_PIPELINE_URL}"
echo "CI_PROJECT_URL=${CI_PROJECT_URL}"
echo "CI_PROJECT_NAMESPACE=${CI_PROJECT_NAMESPACE}"
echo "CI_PROJECT_NAME=${CI_PROJECT_NAME}"
echo "CI_PROJECT_PATH_SLUG=${CI_PROJECT_PATH_SLUG}"
echo "<DOCTYPE html>" > ${OUTFILE}
echo "<html>" >> ${OUTFILE}
echo "<head><title>GrafX2</title></head>" >> ${OUTFILE}
echo "<body>" >> ${OUTFILE}
echo "<h1>GrafX2 version ${VERSION}</h1>" >> ${OUTFILE}
echo "<ul>" >> ${OUTFILE}
echo "<li><a href=\"doxygen/html/\">doxygen</a></li>" >> ${OUTFILE}
echo "<li><a href=\"htmldoc/\">htmldoc</a></li>" >> ${OUTFILE}
echo "<li>Sources :" >> ${OUTFILE}
echo "<a href=\"${CI_PROJECT_URL}/-/jobs/${LINUX_JOB_ID}/artifacts/raw/grafx2-${VERSION}-src.tgz\">grafx2-${VERSION}-src.tgz</a></li>" >> ${OUTFILE}
echo "<li>Windows installer (win32 API) :" >> ${OUTFILE}
echo "<a href=\"${CI_PROJECT_URL}/-/jobs/${WIN32_JOB_ID}/artifacts/raw/install/grafx2-win32-${VERSION}.win32.exe\">grafx2-win32-${VERSION}.win32.exe</a></li>" >> ${OUTFILE}
echo "<li>Windows installer (SDL API) :" >> ${OUTFILE}
echo "<a href=\"${CI_PROJECT_URL}/-/jobs/${WIN32_JOB_ID}/artifacts/raw/install/grafx2-sdl-${VERSION}.win32.exe\">grafx2-sdl-${VERSION}.win32.exe</a></li>" >> ${OUTFILE}
echo "<li>Windows installer (SDL2 API) :" >> ${OUTFILE}
echo "<a href=\"${CI_PROJECT_URL}/-/jobs/${WIN32_JOB_ID}/artifacts/raw/install/grafx2-sdl2-${VERSION}.win32.exe\">grafx2-sdl2-${VERSION}.win32.exe</a></li>" >> ${OUTFILE}
echo "</ul>" >> ${OUTFILE}
echo "</body>" >> ${OUTFILE}
echo "</html>" >> ${OUTFILE}
echo ${VERSION}

1
src/Makefile
View File

@ -906,6 +906,7 @@ endif
../share/grafx2/gfx2def.ini $(SCRIPT_FILES) $(SKIN_FILES) \ ../share/grafx2/gfx2def.ini $(SCRIPT_FILES) $(SKIN_FILES) \
../share/grafx2/gfx2.gif ../share/grafx2/gfx2.png ../share/icons/grafx2.svg \ ../share/grafx2/gfx2.gif ../share/grafx2/gfx2.png ../share/icons/grafx2.svg \
$(DOC_FILES) $(wildcard ../misc/*/*) $(FONT_FILES) $(DOC_FILES) $(wildcard ../misc/*/*) $(FONT_FILES)
echo "$(VERSIONTAG)" > ../VERSION
$(BIN) : $(OBJ) $(BIN) : $(OBJ)
@test -d ../bin || $(MKDIR) ../bin @test -d ../bin || $(MKDIR) ../bin