Merge branch 'master' of http://github.com/quen/browserstats

Conflicts:
	build.xml
	src/com/leafdigital/browserstats/agents/agents.xml

DIST.README

@@ -0,0 +1,48 @@
+leafdigital browserstats
+------------------------
+
+Copyright 2010 Samuel Marshall
+
+Released under GNU Public License v3 (see LICENSE)
+
+
+Basics
+------
+
+This system contains four components which can be used to obtain browser
+statistics from web logs.
+
+To run each component, type:
+
+java -jar bs.component.jar
+
+('component' should be the name of the specific component jar file)
+
+This will show a list of command line parameters for each component.
+
+Generally, the components need to be run in the following order:
+
+1. Collate
+2. Identify
+3. Summarise
+4. Graph
+
+
+More information
+----------------
+
+The hosting site for this project is:
+
+http://github.com/quen/browserstats
+
+There you can do the following:
+
+* Read complete documentation (click the Wiki tab).
+* Download the full source code (click the Download Source button or use Git).
+* Download the latest binary version (click the Downloads tab).
+* Report bugs or contribute improvements (click the Issues tab).
+
+
+Thanks for trying out this program, I hope it's useful.
+
+--sam

README

@@ -0,0 +1,33 @@
+leafdigital browserstats
+------------------------
+
+Copyright 2010 Samuel Marshall
+
+Released under GNU Public License v3 (see LICENSE)
+
+This program is now ready for use! Please try it out.
+
+
+Build instructions
+------------------
+
+Once you have downloaded the source, just change to the directory with this
+file and run 'ant'. The default build.xml file will build the project.
+
+Examine build.xml if you want to change where it puts temporary data or the
+resulting output files.
+
+
+Repository information
+----------------------
+
+In case you're not reading it there, the hosting site for this project is:
+
+http://github.com/quen/browserstats
+
+There you can do the following:
+
+* Read complete documentation (click the Wiki tab).
+* Download the full source code (click the Download Source button or use Git).
+* Download the latest binary version (click the Downloads tab).
+* Report bugs or contribute improvements (click the Issues tab).

build.xml

@@ -6,10 +6,16 @@
 
 	<!-- Build folder (will be deleted on run!) -->
 	<property name="build" location="${java.io.tmpdir}/build/browserstats" />
-	
+
 	<!-- Where to put the jar when it's built -->
 	<property name="jarfolder" location="${user.home}/Desktop" />
 
+	<!-- Where to put the zip when it's built -->
+	<property name="zipfolder" location="${jarfolder}" />
+
+	<!-- Version number -->
+	<property name="version" value="1.0.0"/>
+
 	<!-- Get date in format used for build version -->
 	<target name="timestamp">
 		<tstamp>
@@ -37,22 +43,69 @@
 		  	<exclude name="**/*.java" />
 		  </fileset>
 		</copy>
-		<echo message="${build-date}"
+		<echo message="${version} (${build-date})"
 			file="${build}/classes/com/leafdigital/browserstats/shared/version.txt" />
 	</target>
 
 	<!-- Build jar files -->
 	<target name="jar" depends="compile">
 		<mkdir dir="${build}/output" />
-		<jar jarfile="${build}/output/browserstats.jar" basedir="${build}/classes"
-			level="9" />
+		<jar jarfile="${build}/output/bs.collate.jar" basedir="${build}/classes"
+			level="9">
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/collate/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/shared/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/util/xml/**" />
+			<manifest>
+				<attribute name="Main-Class" value="com.leafdigital.browserstats.collate.Collate"/>
+		  </manifest>
+		</jar>
+		<jar jarfile="${build}/output/bs.identify.jar" basedir="${build}/classes"
+			level="9">
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/identify/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/shared/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/util/xml/**" />
+			<manifest>
+				<attribute name="Main-Class" value="com.leafdigital.browserstats.identify.Identify"/>
+		  </manifest>
+		</jar>
+		<jar jarfile="${build}/output/bs.summarise.jar" basedir="${build}/classes"
+			level="9">
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/summarise/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/shared/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/util/xml/**" />
+			<manifest>
+				<attribute name="Main-Class" value="com.leafdigital.browserstats.summarise.Summarise"/>
+		  </manifest>
+		</jar>
+		<jar jarfile="${build}/output/bs.graph.jar" basedir="${build}/classes"
+			level="9">
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/graph/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/browserstats/shared/**" />
+			<fileset dir="${build}/classes" includes="com/leafdigital/util/xml/**" />
+			<manifest>
+				<attribute name="Main-Class" value="com.leafdigital.browserstats.graph.Graph"/>
+		  </manifest>
+		</jar>
 	</target>
 
-	<!-- Run JUnit tests -->
+	<!-- Move jar files to final location and make distribution zip -->
 	<target name="all" depends="jar">
-		<!-- Delete and recopy jar file -->
-		<delete file="${jarfolder}/browserstats.jar"/>
-		<copy file="${build}/output/browserstats.jar" todir="${jarfolder}" />
+		<!-- Make distribution zip file -->
+		<delete file="${zipfolder}/browserstats.${version}.zip"/>
+		<copy file="./LICENSE" todir="${build}/output"/>
+		<copy file="./DIST.README" tofile="${build}/output/README"/>
+		<zip destfile="${zipfolder}/browserstats.${version}.zip"
+			basedir="${build}/output" level="9" />
+
+		<!-- Delete and recopy jar files -->
+		<delete file="${jarfolder}/bs.collate.jar"/>
+		<copy file="${build}/output/bs.collate.jar" todir="${jarfolder}" />
+		<delete file="${jarfolder}/bs.identify.jar"/>
+		<copy file="${build}/output/bs.identify.jar" todir="${jarfolder}" />
+		<delete file="${jarfolder}/bs.summarise.jar"/>
+		<copy file="${build}/output/bs.summarise.jar" todir="${jarfolder}" />
+		<delete file="${jarfolder}/bs.graph.jar"/>
+		<copy file="${build}/output/bs.graph.jar" todir="${jarfolder}" />
 	</target>
 
 </project>