Commit 13bb7179 authored by Andre Heydt's avatar Andre Heydt
Browse files

makefile edited to new server www3.

new javadoc site.
organize imports

git-svn-id: https://svn.math.tu-berlin.de/svn/jtem@1744 f5b180c5-49ee-4939-b20e-b6ed35f0f7b7
parent b5120900
......@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -21,7 +21,7 @@ PACKAGESUMHTML=$(DOCDIR)/de/jtem/$(NAME)/package-summary.html
#location of the web site, may be empty
SERVER=gauss.math.tu-berlin.de
#directory of the website on the server, or local if SERVER is empty
SRVDIR=/net/www/pub/jtem
SRVDIR=/net/www3/pub/jtem/
#directory for the dependencies
LIBDIR=
......@@ -30,16 +30,17 @@ LIBDIR=
#web site
RELDIR=rel
#directories of the JUnit tests, all files that match Test*.java or *Test.java will be executed
TESTDIR=test
#directories of the JUnit tests, all classes whose source files match Test*.java or *Test.java will be executed
TESTDIR=src-test
TESTBINDIR=$(TESTDIR)
#exclude the following tests
EXCLTESTS=RuppertTest TestLLL TestExactLLL
EXCLTESTS=
#where to find junit.jar
JUNIT=$(shell locate junit.jar | grep '/junit.jar' | tail --lines=1)
JUNIT=$(wildcard junit*.jar)
JUNITTESTRUNNER =org.junit.runner.JUnitCore
#compile options
JAVACOPTS=-target 1.5 -source 1.5
JAVACOPTS=-target 1.6 -source 1.6
#javadoc options
JAVADOCOPTS= -author -protected -nodeprecated -nodeprecatedlist \
......@@ -48,12 +49,12 @@ JAVADOCOPTS= -author -protected -nodeprecated -nodeprecatedlist \
-header '<a href="http://www.jtem.de/$(NAME)" target="_top">$(NAME)</a> by<br><a href="http://www.jtem.de" target="_top">jTEM</a>' \
-footer '<a href="http://www.jtem.de/$(NAME)" target="_top">$(NAME)</a> by<br><a href="http://www.jtem.de" target="_top">jTEM</a>' \
-bottom '<font size=-1><b><a href="mailto:jtem@math.tu-berlin.de?subject=$(NAME):">jTEM</a></b></font>' \
-link http://java.sun.com/javase/6/docs/api/ \
-link http://docs.oracle.com/javase/7/docs/api/ \
$(foreach d, $(DEPNAMES), -link $(JTEMURL)/$(d)/api) \
-d $(DOCDIR) -classpath "$(BINDIR):`find $(LIBDIR) -name '*.jar' -printf %p: 2> /dev/null `" \
-sourcepath `echo $(SRCDIRS) | tr \ :` \
$(DOCPACKAGES)
#things that are removed recursively by the clean target
CLEAN=$(BINDIR) $(DOCDIR) $(WEBDIR) $(RELDIR) .testscompiled \
......@@ -61,7 +62,7 @@ CLEAN=$(BINDIR) $(DOCDIR) $(WEBDIR) $(RELDIR) .testscompiled \
$(LIBDIR)/.lastUpdateDepsPlusADay $(LIBDIR)/.lastUpdateDepsCheck
#jtem site url
JTEMURL=http://www.math.tu-berlin.de/jtem
JTEMURL=http://www3.math.tu-berlin.de/jtem
......@@ -162,7 +163,7 @@ $(BINDIR): $(SOURCEFILES) | $(DEPS)
|| { rm -rf $(BINDIR); echo "ERROR: compilation failed, folder \"$(BINDIR)\" removed"; exit 1; }
@touch $(BINDIR)
@echo " - compilation of sources in \"$(SRCDIRS)\" successfull, class files in \"$(BINDIR)\" "
# --- test ---
#compile and run JUnit tests form TESTDIR
......@@ -176,7 +177,7 @@ else
@for test in $(TESTS); do \
echo "- JUnitTest: $$test"; \
java -ea -classpath "`find $(LIBDIR) -name '*.jar' -printf %p: 2> /dev/null`$(JUNIT):$(BINDIR):$(TESTBINDIR)" \
junit.textui.TestRunner $$test || { echo "JUnit Test failed!" ; exit 1; } \
$(JUNITTESTRUNNER) $$test || { echo "JUnit Test failed!" ; exit 1; } \
done;
@if [ -n "$(ext_)" ]; then echo "WARNING: some tests where exluded, see variable EXCLTESTS"; fi
endif
......@@ -214,7 +215,7 @@ web: $(WEBDIR)/teaser.html $(WEBDIR)/content.html
@if [ -d $(dir $(PACKAGEHTML))/doc-files ]; then $(call copy_to_website,$(dir $(PACKAGEHTML))/doc-files,$(NAME)/doc-files); fi
@if [ -f releasenotes.txt ]; then $(call copy_to_website, releasenotes.txt,downloads/$(NAME)); fi
@-$(call exec_on_server, find $(SRVDIR) -user `whoami` | xargs chmod ug+rw 2> /dev/null)
$(WEBDIR)/teaser.html: $(DOCDIR)
@if [ ! -d $(WEBDIR) ]; then mkdir $(WEBDIR); fi
@sed -e '0,/teaser start/d;/teaser end/,$$d' $(PACKAGESUMHTML) > $(WEBDIR)/teaser.html
......@@ -262,13 +263,13 @@ $(RELDIR)/$(NAME).jar: $(BINDIR) $(RELDIR)/manifest.txt
$(RELDIR)/$(NAME).tgz: $(shell find $(SRCDIRS)) | updatedeps
@if [ ! -d $(RELDIR) ]; then mkdir $(RELDIR); fi
@tar czf $(RELDIR)/$(NAME).tgz $(SRCDIRS) $(LIBDIR) --exclude-vcs --exclude "\.*"
#jar and jars of all dependencies
$(RELDIR)/$(NAME).zip: $(RELDIR)/$(NAME).jar | updatedeps
@if [ ! -d $(RELDIR) ]; then mkdir $(RELDIR); fi
@cd $(RELDIR); zip $(NAME).zip $(NAME).jar
@if [ $(LIBDIR) != "" -a -d $(LIBDIR) ]; then cd $(LIBDIR); zip -g ../$(RELDIR)/$(NAME).zip *.jar *license* *License* *LICENSE* >> /dev/null; fi
#archive of api-documentation
$(RELDIR)/$(NAME)-api.tgz: $(DOCDIR)
@if [ ! -d $(RELDIR) ]; then mkdir $(RELDIR); fi
......@@ -281,7 +282,7 @@ $(RELDIR)/manifest.txt: $(RELDIR)/current.txt
@echo "Implementation-Version: "`cat $(RELDIR)/current.txt` >> $(RELDIR)/manifest.txt
@echo "Implementation-Vendor: jTEM ($(JTEMURL))" >> $(RELDIR)/manifest.txt
@echo "Implementation-URL: $(JTEMURL)/downloads/$(NAME).jar" >> $(RELDIR)/manifest.txt
#release date
.PHONY: $(RELDIR)/current.txt
$(RELDIR)/current.txt:
......
File added
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