Commits

Bryan O'Sullivan committed 60f6e50 Merge

Merge from default

  • Participants
  • Parent commits 0ae9d4e, d4eecdc
  • Branches hashmap

Comments (0)

Files changed (3)

 ^dist$
-benchmarks/Arse
-benchmarks/med.txt
-benchmarks/tiny
+^benchmarks/(?:AesonParse|EncodeFile|JsonParse|json-data)$
+.*\.(?:h[ip]|o|orig|out|pdf|prof|ps|rej)$
 
 syntax: glob
-*.aux
-*.hi
-*.hp
-*.o
-*.orig
-*.out
-*.pdf
-*.prof
-*.ps
-*.rej
 *~
 .*.swp
 .\#*

benchmarks/Makefile

+ghc := ghc
+ghcflags := -O
+
+binaries := AesonParse EncodeFile JsonParse
+
+all: json-data/example.json $(binaries)
+
+AesonParse: AesonParse.hs
+	$(ghc) $(ghcflags) --make -o $@ $^
+
+EncodeFile: EncodeFile.hs
+	$(ghc) $(ghcflags) --make -o $@ $^
+
+JsonParse: JsonParse.hs
+	$(ghc) $(ghcflags) --make -o $@ $^
+
+json-data/example.json: json-data.tar.bz2
+	bzip2 -dc < $^ | tar -m -xf -
+
+clean:
+	-rm -f *.o *.hi $(binaries)

benchmarks/json-data.tar.bz2

Binary file added.