From 5a7d3ba4c8c390b6fddb5b17e38327a41caf55f2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 4 Nov 2009 15:36:13 +0000
Subject: [PATCH] move things to installer/resources; fix initial news

---
 build.xml                                            | 12 +++++++-----
 .../resources/initialNews.xml                        |  0
 news.xml => installer/resources/news.xml             |  0
 .../resources/readme/readme.html                     |  0
 .../resources/readme/readme_de.html                  |  0
 .../resources/readme/readme_fr.html                  |  0
 .../resources/readme/readme_nl.html                  |  0
 .../resources/readme/readme_sv.html                  |  0
 .../resources/readme/readme_zh.html                  |  0
 9 files changed, 7 insertions(+), 5 deletions(-)
 rename initialNews.xml => installer/resources/initialNews.xml (100%)
 rename news.xml => installer/resources/news.xml (100%)
 rename readme.html => installer/resources/readme/readme.html (100%)
 rename readme_de.html => installer/resources/readme/readme_de.html (100%)
 rename readme_fr.html => installer/resources/readme/readme_fr.html (100%)
 rename readme_nl.html => installer/resources/readme/readme_nl.html (100%)
 rename readme_sv.html => installer/resources/readme/readme_sv.html (100%)
 rename readme_zh.html => installer/resources/readme/readme_zh.html (100%)

diff --git a/build.xml b/build.xml
index 9d7f55c1b..d065d0655 100644
--- a/build.xml
+++ b/build.xml
@@ -291,7 +291,8 @@
         <!-- polecat: please put your modified toolbar.html in installer/resources/toolbar.html 
              and uncomment the following -->
         <!-- <copy file="installer/resources/toolbar.html" todir="pkg-temp/docs/" /> -->
-        <copy file="initialNews.xml" tofile="pkg-temp/docs/news.xml" />
+        <!-- overwrite the news put in by the updater -->
+        <copy file="installer/resources/initialNews.xml" tofile="pkg-temp/docs/news.xml" overwrite="true" />
         <copy file="installer/resources/startconsole.html" todir="pkg-temp/docs/" />
         <copy file="installer/resources/start.ico" todir="pkg-temp/docs/" />
         <copy file="installer/resources/console.ico" todir="pkg-temp/docs/" />
@@ -351,7 +352,7 @@
             <fileset  dir="installer/resources/themes/console/images/" />
         </copy>          
         <copy todir="pkg-temp/docs/" >
-          <fileset dir="." includes="readme*.html" />
+          <fileset dir="installer/resources/readme/" includes="readme*.html" />
         </copy>
     </target>
 
@@ -398,7 +399,8 @@
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
         <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
         <copy file="history.txt" todir="pkg-temp/" />
-        <copy file="news.xml" todir="pkg-temp/docs/" />
+        <!-- may be pointless now, people with split directories will never see this -->
+        <copy file="installer/resources/news.xml" todir="pkg-temp/docs/" />
     </target>
     <target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepthemeupdates">
         <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
@@ -574,9 +576,9 @@
         <exec executable="ls">
             <arg value="-l" />
             <arg value="history.txt" />
-            <arg value="initialNews.xml" />
+            <arg value="installer/resources/initialNews.xml" />
             <arg value="installer/install.xml" />
-            <arg value="news.xml" />
+            <arg value="installer/resources/news.xml" />
 	    <arg value="core/java/src/net/i2p/CoreVersion.java" />
 	    <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
         </exec>
diff --git a/initialNews.xml b/installer/resources/initialNews.xml
similarity index 100%
rename from initialNews.xml
rename to installer/resources/initialNews.xml
diff --git a/news.xml b/installer/resources/news.xml
similarity index 100%
rename from news.xml
rename to installer/resources/news.xml
diff --git a/readme.html b/installer/resources/readme/readme.html
similarity index 100%
rename from readme.html
rename to installer/resources/readme/readme.html
diff --git a/readme_de.html b/installer/resources/readme/readme_de.html
similarity index 100%
rename from readme_de.html
rename to installer/resources/readme/readme_de.html
diff --git a/readme_fr.html b/installer/resources/readme/readme_fr.html
similarity index 100%
rename from readme_fr.html
rename to installer/resources/readme/readme_fr.html
diff --git a/readme_nl.html b/installer/resources/readme/readme_nl.html
similarity index 100%
rename from readme_nl.html
rename to installer/resources/readme/readme_nl.html
diff --git a/readme_sv.html b/installer/resources/readme/readme_sv.html
similarity index 100%
rename from readme_sv.html
rename to installer/resources/readme/readme_sv.html
diff --git a/readme_zh.html b/installer/resources/readme/readme_zh.html
similarity index 100%
rename from readme_zh.html
rename to installer/resources/readme/readme_zh.html