Commit e80e6440 authored by Guenter Paul Peters's avatar Guenter Paul Peters
Browse files

bugs fixed that prevented other users than the initial user to make new releases

git-svn-id: https://svn.math.tu-berlin.de/svn/jtem@496 f5b180c5-49ee-4939-b20e-b6ed35f0f7b7
parent bd9e5d11
......@@ -77,7 +77,7 @@ DOWNLOADDEPS=$(JTEMURL)/downloads
#function to copy to SRVDIR
ifeq ($(strip $(SERVER)),)
copy_to_website=cp -a $(1) $(SRVDIR)/$(strip $(2))
copy_to_website=cp $(1) $(SRVDIR)/$(strip $(2))
else
copy_to_website=scp -r $(1) $(SERVER):$(SRVDIR)/$(strip $(2))
endif
......@@ -87,10 +87,6 @@ ifeq ($(strip $(SERVER)),)
else
exec_on_server=ssh $(SERVER) $(1)
endif
#function to get last change date from svn
svndate=`( svn --xml info $(1) 2> /dev/null | grep "<text-updated>" \
|| svn --xml info $(1) 2> /dev/null | grep "<date>" ) \
| sed -e 's/.*>\(....-..-..\).*/\1/'`
# ---Targets --
......@@ -197,11 +193,8 @@ $(DOCDIR): $(shell find $(SRCDIRS) -path "*.svn" -prune -o -print ) | $(DEPS)
web: $(WEBDIR)/teaser.html $(WEBDIR)/content.html
@for f in $?; do $(call copy_to_website,$$f,$(NAME)/$${f#$(WEBDIR)}); done
@if [ -d $(dir $(PACKAGEHTML))/doc-files ]; then $(call copy_to_website,$(dir $(PACKAGEHTML))/doc-files,$(NAME)/doc-files); fi
@date=$(call svndate, $(subst -summary,,$(subst $(DOCDIR),$(firstword $(SRCDIRS)),$(PACKAGEHTML)))); \
if [ "" = "$$date" ]; then date=`date -r $< +%F`; fi; \
$(call exec_on_server,touch -d $$date $(SRVDIR)/$(NAME)/content.html $(SRVDIR)/projects.html)
@if [ -f releasnotes.txt ]; then $(call copy_to_website, releasnotes.txt, downloads/$(NAME)); fi
@$(call exec_on_server, find $(SRVDIR) -user `whoami` | xargs chmod g+rw)
@-$(call exec_on_server, find $(SRVDIR) -user `whoami` | xargs chmod g+rw)
$(PACKAGEHTML): $(DOCDIR)
......@@ -235,7 +228,7 @@ release: web test $(DOCDIR) $(RELDIR)/$(NAME).jar $(RELDIR)/$(NAME).tgz $(RELDIR
@$(call copy_to_website, $(DOCDIR), $(NAME)/api)
@$(call copy_to_website, $(RELDIR)/current.txt,downloads/$(NAME))
@$(call copy_to_website, releasnotes.txt,downloads/$(NAME))
@$(call exec_on_server, find $(SRVDIR) -user `whoami` | xargs chmod g+rw)
@-$(call exec_on_server, find $(SRVDIR) -user `whoami` | xargs chmod g+rw)
@echo release `cat rel/current.txt` succesfully deployed
#jar of compiled classes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment