janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 13:03:58 +01:00
Code Activity

doxygen.mk: Improve upload support

Browse source 
- Add support for __PROJECT_TOPDIR__ pattern substitution
  - Fix upload url
  - Create files with umask 0022 to prevent them from ending up
    online as 0660
This commit is contained in:
Jan Lindemann 2010-08-02 17:35:10 +00:00 • committed by Jan Lindemann
commit fa2dc47678
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/doxygen.mk
View file

@ -15,7 +15,7 @@ UPLOAD_DIR_MODE ?= 755
include $(MODDIR)/make/upload-defs.mk include $(MODDIR)/make/upload-defs.mk
UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP) UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
OUTPUT_DIR ?= html OUTPUT_DIR ?= html
INSTALL_DOXYGEN_DIR ?= $(DOC_PREFIX)/devel INSTALL_DOXYGEN_DIR ?= $(DOC_PREFIX)/devel
@ -38,10 +38,11 @@ html: doxygen.done cpfiles.done
| sed "s/__PROJECT__/$(PROJECT)/" \ | sed "s/__PROJECT__/$(PROJECT)/" \
| sed "s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/" \ | sed "s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/" \
| sed "s/__OUTPUT_DIR__/$(OUTPUT_DIR)/" \ | sed "s/__OUTPUT_DIR__/$(OUTPUT_DIR)/" \
| sed "s%__PROJECT_TOPDIR__%$(TOPDIR)%" \
> $@ > $@
doxygen.done: $(UNTEMPLATED) doxygen.done: $(UNTEMPLATED)
doxygen $(DOXYGEN_CONF) umask 022; doxygen $(DOXYGEN_CONF)
touch $@ touch $@
cpfiles.done: doxygen.done $(DOC_FILES) cpfiles.done: doxygen.done $(DOC_FILES)
@ -55,7 +56,7 @@ view: doc.done
konqueror $(OUTPUT_DIR)/index.html konqueror $(OUTPUT_DIR)/index.html
upload.done: doxygen.done cpfiles.done upload.done: doxygen.done cpfiles.done
upload.sh $(OUTPUT_DIR) $(UPLOAD_URL) upload.sh $(OUTPUT_DIR)/ $(UPLOAD_URL)
clean.doxygen: clean.doxygen:
rm -rf $(OUTPUT_DIR) *.done $(UNTEMPLATED) rm -rf $(OUTPUT_DIR) *.done $(UNTEMPLATED)