From b75ca3e58f2141eb154b696f1eff5b6b9c50df45 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Thu, 12 Jul 2018 14:13:46 +0200 Subject: [PATCH] generate tgz of doxygen doc. --- .gitlab-ci.yml | 7 ++++--- Makefile | 8 +++++++- tools/Makefile | 9 +++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 231a1ef0..9c457383 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ before_script: - apt-get update -qq && apt-get install -y -qq libsdl1.2-dev libpng-dev libsdl-ttf2.0-dev libsdl-image1.2-dev liblua5.1-0-dev zip - apt-get install -y -qq libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev - - apt-get install -y -qq gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-tools nsis + - apt-get install -y -qq gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-tools nsis doxygen graphviz stages: - build @@ -9,8 +9,9 @@ stages: job_linux: stage: build script: - - "cd src && make && make ziprelease" - - "API=sdl2 make && API=sdl2 make ziprelease" + - "make -j3 && make ziprelease" + - "API=sdl2 make -j3 && API=sdl2 make ziprelease" + - "make docarchive" artifacts: paths: - "*.zip" diff --git a/Makefile b/Makefile index 0d2bbd62..e76e3bbd 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,15 @@ OPT = WIN32CROSS=1 \ endif -.PHONY: all tools grafx2 ziprelease 3rdparty win32installer doc doxygen +.PHONY: all tools grafx2 ziprelease 3rdparty win32installer \ + doc doxygen docarchive doxygenarchive all: grafx2 tools doc: doxygen +docarchive: doxygenarchive + grafx2: $(OPT)$(MAKE) -C src/ @@ -26,3 +29,6 @@ win32installer: doxygen: $(MAKE) -C tools/ doxygen + +doxygenarchive: + $(MAKE) -C tools/ doxygenarchive diff --git a/tools/Makefile b/tools/Makefile index 4c1918dd..315eb94a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,14 @@ DOXYGEN = doxygen +TAR = tar + GIT_REVISION = $(shell cat ../src/version.c | cut -f 2 -d '"') LABEL = $(shell cat ../src/pversion.c | cut -f 2 -d '"') VERSION = $(subst wip.,wip,$(LABEL).$(GIT_REVISION)) SOURCES = $(wildcard ../src/*.c) $(wildcard ../src/*.h) +DOCARCHIVE = ../grafx2-$(VERSION)-doxygen.tgz + .PHONY: all gifanalyzer sdl_image_test test_iff doxygen all: gifanalyzer sdl_image_test test_iff @@ -18,6 +22,11 @@ sdl_image_test: test_iff: $(MAKE) -C $@ +doxygenarchive: $(DOCARCHIVE) + +$(DOCARCHIVE): ../doc/doxygen/html/index.html + cd ../doc && $(TAR) czf $@ doxygen/ + doxygen: ../doc/doxygen/html/index.html ../doc/doxygen/html/index.html: Doxyfile $(SOURCES)