assorted-commits

[Assorted-commits] SF.net SVN: assorted: [299] scala-commons/trunk/src/Makefile

[<yan...@us...>]

Revision: 299
          http://assorted.svn.sourceforge.net/assorted/?rev=299&view=rev
Author:   yangzhang
Date:     2008-02-03 00:40:45 -0800 (Sun, 03 Feb 2008)

Log Message:
-----------
added web, publish to makefile

Modified Paths:
--------------
    scala-commons/trunk/src/Makefile

Modified: scala-commons/trunk/src/Makefile
===================================================================
--- scala-commons/trunk/src/Makefile	2008-02-03 08:40:16 UTC (rev 298)
+++ scala-commons/trunk/src/Makefile	2008-02-03 08:40:45 UTC (rev 299)
@@ -1,23 +1,38 @@
 DOCDIR    := doc
 OUTDIR    := out
+WEBDIR    := web
 JAR       := $(OUTDIR)/scala-commons.jar
 SCALAC    := fsc
 SRCS      := $(wildcard commons/*.scala)
 
-all: $(JAR)
+all: jar
 
+jar: $(JAR)
+
 $(JAR): $(SRCS)
 	mkdir -p $(OUTDIR)
 	$(SCALAC) -d $(OUTDIR) $^
 	jar cf $(JAR) -C $(OUTDIR) commons/
 
+web: $(WEBDIR)/index.html
+
+$(WEBDIR)/index.html: ../README
+	mkdir -p $(WEBDIR)
+	# pandoc -s -S --tab-stop=2 -c main.css -H header.html -A footer.html -o $(WEBDIR)/index.html ../README
+	pandoc -s -S --tab-stop=2 -c ../main.css -o $(WEBDIR)/index.html ../README
+
 doc: $(DOCDIR)/index.html
 
 $(DOCDIR)/index.html: $(SRCS)
 	mkdir -p $(DOCDIR)
-	scaladoc -d $(DOCDIR) $^
+	scaladoc -d $(DOCDIR) -linksource $^
 
+publish: doc jar web
+	cp -r $(JAR) $(DOCDIR) $(WEBDIR)
+	ssh shell-sf 'rm -rf assorted/htdocs/scala-commons/'
+	scp -r -o CompressionLevel=9 $(WEBDIR) shell-sf:assorted/htdocs/scala-commons
+
 clean:
-	rm -rf $(OUTDIR) $(DOCDIR)
+	rm -rf $(OUTDIR) $(DOCDIR) $(WEBDIR)
 
-.PHONY: clean
+.PHONY: clean doc publish jar web


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [433] scala-commons/trunk/src/Makefile

[<yan...@us...>]

Revision: 433
          http://assorted.svn.sourceforge.net/assorted/?rev=433&view=rev
Author:   yangzhang
Date:     2008-02-14 18:32:44 -0800 (Thu, 14 Feb 2008)

Log Message:
-----------
using common google footer

Modified Paths:
--------------
    scala-commons/trunk/src/Makefile

Modified: scala-commons/trunk/src/Makefile
===================================================================
--- scala-commons/trunk/src/Makefile	2008-02-15 02:32:32 UTC (rev 432)
+++ scala-commons/trunk/src/Makefile	2008-02-15 02:32:44 UTC (rev 433)
@@ -4,6 +4,7 @@
 JAR       := $(OUTDIR)/scala-commons.jar
 SCALAC    := fsc
 SRCS      := $(wildcard commons/*.scala)
+HTMLFRAG  := ../../../assorted-site/trunk
 
 all: jar
 
@@ -18,14 +19,13 @@
 
 $(WEBDIR)/index.html: ../README
 	mkdir -p $(WEBDIR)
-	# pandoc -s -S --tab-stop=2 -c main.css -H header.html -A footer.html -o $(WEBDIR)/index.html ../README
-	pandoc -s -S --tab-stop=2 -c ../main.css -o $(WEBDIR)/index.html ../README
+	pandoc -s -S --tab-stop=2 -c ../main.css -H $(HTMLFRAG)/header.html -A $(HTMLFRAG)/google-footer.html -o $(WEBDIR)/index.html ../README
 
 doc: $(DOCDIR)/index.html
 
 $(DOCDIR)/index.html: $(SRCS)
 	mkdir -p $(DOCDIR)
-	scaladoc -d $(DOCDIR) -linksource $^
+	scaladoc -d $(DOCDIR) -linksource -header $(HTMLFRAG)/header.html -bottom $(HTMLFRAG)/google-footer.html $^
 
 publish: doc jar web
 	cp -r $(JAR) $(DOCDIR) $(WEBDIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [506] scala-commons/trunk/src/Makefile

[<yan...@us...>]

Revision: 506
          http://assorted.svn.sourceforge.net/assorted/?rev=506&view=rev
Author:   yangzhang
Date:     2008-02-24 23:20:01 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
removed buggy header - not what i was expecting!

Modified Paths:
--------------
    scala-commons/trunk/src/Makefile

Modified: scala-commons/trunk/src/Makefile
===================================================================
--- scala-commons/trunk/src/Makefile	2008-02-25 07:19:27 UTC (rev 505)
+++ scala-commons/trunk/src/Makefile	2008-02-25 07:20:01 UTC (rev 506)
@@ -25,7 +25,7 @@
 
 $(DOCDIR)/index.html: $(SRCS)
 	mkdir -p $(DOCDIR)
-	scaladoc -d $(DOCDIR) -linksource -header $(HTMLFRAG)/header.html -bottom $(HTMLFRAG)/google-footer.html $^
+	scaladoc -d $(DOCDIR) -linksource $^
 
 publish: doc jar web
 	cp -r $(JAR) $(DOCDIR) $(WEBDIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.