commit 592fe79cc9c520daa0a9c8cbcf8239d6400d73b0 Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Aug 21 15:31:19 2012 +0200

Update .gitignore and build.xml to match what's on yatei. --- .gitignore | 65 ++++++++++++++--------------------------------------------- build.xml | 4 +- 2 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore index 51ae9b7..68b9815 100644 --- a/.gitignore +++ b/.gitignore @@ -1,54 +1,21 @@ -# .jar files -lib/*.jar - -# Input directories for descriptors to parse -archives/ -bridges/ - -# compiled Java class files -classes/ - -# generated R input files -stats/ - -# generated graphs -website/graphs/bridge-users/*.png -website/graphs/descriptors/*.png -website/graphs/direct-users/*.png -website/graphs/exit/*.png -website/graphs/networksize/*.png -website/graphs/new-users/*.png -website/graphs/torperf/*.png - -# generated CSV files -website/csv/*.csv - -# papers and tech reports, not included in Git -website/papers/*.pdf - -# logfiles -log.* - -# Eclipse files .classpath .project - -# Auxiliary LaTeX files -doc/*.aux -doc/*.log - -# Generated websites -website/consensus-health*.html - -# Temporary directory for generating web archive -dist/ - -# Possibly modified config file +assignments +bridge-directories +cacheddesc/ +classes/ config - -# Torperf files -torperf/ - -# Files provided via rsync +data/ +directory-archive/ +doc/manual.aux +doc/manual.log +exitlist/ +lib/ +log.* rsync/ +sanitized-assignments/ +sanitized-bridges/ +stats/ +tarballs/ +torperf/

diff --git a/build.xml b/build.xml index 07d1488..ce3e337 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <path id="classpath"> <pathelement path="${classes}"/> <pathelement location="lib/commons-codec-1.4.jar"/> - <pathelement location="lib/commons-compress-1.0.jar"/> + <pathelement location="lib/commons-compress-1.3.jar"/> <pathelement location="lib/junit-4.8.2.jar"/> <pathelement location="lib/descriptor.jar"/> </path> @@ -26,7 +26,7 @@ </target> <target name="run" depends="compile"> <java fork="true" - maxmemory="1024m" + maxmemory="2048m" classname="org.torproject.ernie.db.Main"> <classpath refid="classpath"/> </java>