Step #2 in getting svn/www up to date

git-svn-id: svn://svn.rockbox.org/rockbox/www@16564 a1c6a512-1295-4272-9138-f99709370657

Author: zagor

.htaccess

@@ -0,0 +1,82 @@
+deny from 69.41.161.28
+
+RedirectMatch ^/devconwest2007(.*) http://scorche.cleansoap.org/rockbox/dcw.html
+RedirectPermanent /patches.shtml http://www.rockbox.org/tracker/index.php?type=4
+RedirectPermanent /bugs.shtml http://www.rockbox.org/tracker/index.php?type=2
+RedirectPermanent /requests.shtml http://www.rockbox.org/tracker/index.php?type=1
+RedirectMatch ^/langs(.*) http://www.rockbox.org/twiki/bin/view/Main/LangFiles
+RedirectMatch ^/fonts(.*) http://www.rockbox.org/dl.cgi?bin=fonts
+
+AddType application/octet-stream .mod .ajz .lng .fnt .voice
+AddType text/xml .rss
+AddDefaultcharset On
+
+### FS #5617 - Redirect from static pages to wiki ###
+# Root
+#RedirectPermanent /activity.html http://www.rockbox.org/
+#RedirectPermanent /status.html http://www.rockbox.org/
+#RedirectPermanent /tools.html http://www.rockbox.org/
+#RedirectPermanent /usb-howto.html http://www.rockbox.org/
+#RedirectPermanent /lock.html http://www.rockbox.org/
+
+RedirectPermanent /bugs.html http://www.rockbox.org/tracker/index.php?type=2
+RedirectPermanent /cross-gcc.html http://www.rockbox.org/twiki/bin/view/Main/CrossCompiler
+RedirectPermanent /patches.html http://www.rockbox.org/tracker/index.php?type=4
+RedirectPermanent /requests.html http://www.rockbox.org/tracker/index.php?type=1
+RedirectPermanent /screenshots.html http://www.rockbox.org/twiki/bin/view/Main/ScreenShots
+RedirectPermanent /TODO http://www.rockbox.org/twiki/bin/view/Main/ReleaseTodo
+
+# /screenshots dir
+RedirectPermanent /screenshots/index.html http://www.rockbox.org/twiki/bin/view/Main/ScreenShots
+#RedirectPermanent /screenshots/ http://www.rockbox.org/twiki/bin/view/Main/ScreenShots
+
+# /docs dir
+#RedirectPermanent /docs/mpeghdr.html http://www.rockbox.org/
+#RedirectPermanent /docs/rocklatin.html http://www.rockbox.org/
+#RedirectPermanent /docs/repairbattery.html http://www.rockbox.org/
+#RedirectPermanent /docs/repairlcd.html http://www.rockbox.org/
+#RedirectPermanent /docs/contributing.html http://www.rockbox.org/
+#RedirectPermanent /docs/license.html http://www.rockbox.org/
+RedirectPermanent /docs/rvf.html http://www.rockbox.org/twiki/bin/view/Main/VideoTutorial
+RedirectPermanent /docs/index.html http://www.rockbox.org/twiki/bin/view/Main/DocsIndex
+RedirectPermanent /docs/nodo.html http://www.rockbox.org/twiki/bin/view/Main/NoDo
+RedirectPermanent /docs/battery-faq.html http://www.rockbox.org/twiki/bin/view/Main/BatteryFAQ
+RedirectPermanent /docs/credits.html http://svn.rockbox.org/viewvc.cgi/trunk/docs/CREDITS
+RedirectPermanent /docs/cygwin_sdk.html http://www.rockbox.org/twiki/bin/view/Main/CygwinDevelopment
+RedirectPermanent /docs/custom_wps_format.html http://www.rockbox.org/twiki/bin/view/Main/CustomWPS
+RedirectPermanent /docs/datasheets.html http://www.rockbox.org/twiki/bin/view/Main/DataSheets
+RedirectPermanent /docs/devicechart.html http://www.rockbox.org/twiki/bin/view/Main/DeviceChart
+RedirectPermanent /docs/faq.html http://www.rockbox.org/twiki/bin/view/Main/GeneralFAQ
+RedirectPermanent /docs/features.html http://www.rockbox.org/twiki/bin/view/Main/FeatureComparison
+RedirectPermanent /docs/firsttime.html http://www.rockbox.org/twiki/bin/view/Main/DevelopmentGuide
+RedirectPermanent /docs/flash.html http://www.rockbox.org/twiki/bin/view/Main/FlashingRockbox
+RedirectPermanent /docs/how_to_compile.html http://www.rockbox.org/twiki/bin/view/Main/HowToCompile
+RedirectPermanent /docs/patch.html http://www.rockbox.org/twiki/bin/view/Main/WorkingWithPatches
+RedirectPermanent /docs/ports.html http://www.rockbox.org/twiki/bin/view/Main/PortPinAssignments
+RedirectPermanent /docs/rvf.html http://www.rockbox.org/twiki/bin/view/Main/VideoTutorial
+RedirectPermanent /docs/tools.html http://www.rockbox.org/twiki/bin/view/Main/UsefulTools
+#RedirectPermanent /docs/ http://www.rockbox.org/twiki/bin/view/Main/DocsIndex
+
+# /schematics dir
+RedirectPermanent /schematics/index.html http://www.rockbox.org/twiki/bin/view/Main/HardwareSchematics
+#RedirectPermanent /schematics/ http://www.rockbox.org/twiki/bin/view/Main/HardwareSchematics
+
+# /sh-win dir
+RedirectPermanent /sh-win/index.html http://www.rockbox.org/twiki/bin/view/Main/CygwinDevelopment
+#RedirectPermanent /sh-win/ http://www.rockbox.org/twiki/bin/view/Main/CygwinDevelopment
+
+# /mods dir
+#RedirectPermanent /mods/harddisk.html http://www.rockbox.org/
+RedirectPermanent /mods/index.html http://www.rockbox.org/twiki/bin/view/Main/DocsIndex#Hardware
+RedirectPermanent /mods/disassemble.html http://www.rockbox.org/twiki/bin/view/Main/DisassemblePlayer
+RedirectPermanent /mods/disassemble2.html http://www.rockbox.org/twiki/bin/view/Main/DisassemblePlayer2
+RedirectPermanent /mods/reassemble.html http://www.rockbox.org/twiki/bin/view/Main/ReassemblePlayer
+RedirectPermanent /mods/rs232.html http://www.rockbox.org/twiki
+#RedirectPermanent /mods/ http://www.rockbox.org/twiki/bin/view/Main/DocsIndex#Hardware
+
+# twiki/index.html
+RedirectPermanent /twiki/index.html http://www.rockbox.org/twiki/bin/view/Main/WebHome
+
+RedirectPermanent /wiki/ http://www.rockbox.org/twiki/bin/view/Main/
+
+RedirectMatch ^/viewcvs.cgi/(.*) http://svn.rockbox.org/viewvc.cgi/trunk/$1?view=log

Makefile

@@ -2,36 +2,27 @@ ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -
 
 SRC := $(wildcard *.t)
 SOBJS := daily.shtml main.shtml index.shtml status.shtml \
-	bugs.shtml requests.shtml patches.shtml manual.shtml
+	bugs.shtml requests.shtml patches.shtml manual.shtml \
+	recent.shtml
 
 OBJS := $(SRC:%.t=%.html) $(SOBJS) head.tmpl
 
 .SUFFIXES: .t .html
 
 %.html : %.t
 	$(ACTION) $<
+	@sed -i '/^$$/d' $@
 
 %.shtml : %.t
 	$(ACTION) $<
+	@sed -i '/^$$/d' $@
 
 all: $(OBJS) since25.html since20060801.html since-4weeks.html
-	@(cd schematics; $(MAKE))
-	@(cd docs; $(MAKE))
-	@(cd mods; $(MAKE))
-	@(cd internals; $(MAKE))
-	@(cd irc; $(MAKE))
-	@(cd mail; $(MAKE))
-	@(cd devcon; $(MAKE))
-	@(cd sh-win; $(MAKE))
-	@(cd download; $(MAKE))
-	@(cd manual; $(MAKE))
-	@(cd manual-1.2; $(MAKE))
-#	@(cd fonts; $(MAKE))
-	@(cd screenshots; $(MAKE))
-	@(cd digest; $(MAKE))
-	@(cd playerhistory; $(MAKE))
-#	@(cd devcon2006; $(MAKE))
-	@(cd doom; $(MAKE))
+	@(cd irc && $(MAKE))
+	@(cd mail && $(MAKE))
+	@(cd devcon && $(MAKE))
+	@(cd digest && $(MAKE))
+	@(cd doom && $(MAKE))
 
 since20060801.html:
 	ln -sf /home/dast/daniel_html/rockbox/since-200608.html since20060801.html
@@ -43,9 +34,9 @@ head.tmpl: head.t
 	$(ACTION) -DTWIKI $<
 	sed -i '/^$$/d' $@
 
-main.html: main.t activity.html head.t
+main.html: main.t head.t
 
-main.shtml: main.t activity.html head.t
+main.shtml: main.t head.t
 
 index.shtml: main.shtml head.t
 	ln -sf main.shtml index.shtml
@@ -61,20 +52,8 @@ since25.html:
 
 clean:
 	rm $(OBJS)
-	@(cd schematics; $(MAKE) clean)
-	@(cd docs; $(MAKE) clean)
-	@(cd mods; $(MAKE) clean)
-	@(cd internals; $(MAKE) clean)
-	@(cd irc; $(MAKE) clean)
-	@(cd mail; $(MAKE) clean)
-	@(cd devcon; $(MAKE) clean)
-	@(cd sh-win; $(MAKE) clean)
-	@(cd download; $(MAKE) clean)
-	@(cd manual; $(MAKE) clean)
-	@(cd manual-1.2; $(MAKE) clean)
-#	@(cd fonts; $(MAKE) clean)
-	@(cd screenshots; $(MAKE) clean)
-	@(cd digest; $(MAKE) clean)
-	@(cd playerhistory; $(MAKE) clean)
-#	@(cd devcon2006; $(MAKE) clean)
-	@(cd doom; $(MAKE) clean)
+	@(cd irc && $(MAKE) clean)
+	@(cd mail && $(MAKE) clean)
+	@(cd devcon && $(MAKE) clean)
+	@(cd digest && $(MAKE) clean)
+	@(cd doom && $(MAKE) clean)