Gentoo Archives: gentoo-commits

From: "Serkan Kaba (serkan)" <serkan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/statcvs/files: statcvs-0.4.0-build.xml.patch statcvs-0.4.0-external-jtreemap.patch
Date: Fri, 03 Oct 2008 21:39:28
Message-Id: E1KlsMw-0004c6-1F@stork.gentoo.org
1 serkan 08/10/03 21:39:26
2
3 Added: statcvs-0.4.0-build.xml.patch
4 statcvs-0.4.0-external-jtreemap.patch
5 Log:
6 Initial version. Fixes bug #156848.
7 (Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)
8
9 Revision Changes Path
10 1.1 dev-util/statcvs/files/statcvs-0.4.0-build.xml.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/statcvs/files/statcvs-0.4.0-build.xml.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/statcvs/files/statcvs-0.4.0-build.xml.patch?rev=1.1&content-type=text/plain
14
15 Index: statcvs-0.4.0-build.xml.patch
16 ===================================================================
17 diff -Nur statcvs-0.4.0/build.xml statcvs-0.4.0_patched/build.xml
18 --- statcvs-0.4.0/build.xml 2008-04-21 18:33:32.000000000 +0300
19 +++ statcvs-0.4.0_patched/build.xml 2008-09-19 22:22:32.000000000 +0300
20 @@ -148,11 +148,8 @@
21 </classpath>
22 </java>
23 </target>
24 - <target name="jar" depends="test">
25 + <target name="jar">
26 <!-- Creates an executable jar file for the project -->
27 - <unjar src="${lib}/${jfreechart.jar}" dest="${build}" />
28 - <unjar src="${lib}/${jcommon.jar}" dest="${build}" />
29 - <unjar src="${lib}/jdom.jar" dest="${build}" />
30 <mkdir dir="${dist}" />
31 <jar jarfile="${dist}/${project.jar}" basedir="${build}">
32 <manifest>
33
34
35
36 1.1 dev-util/statcvs/files/statcvs-0.4.0-external-jtreemap.patch
37
38 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/statcvs/files/statcvs-0.4.0-external-jtreemap.patch?rev=1.1&view=markup
39 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/statcvs/files/statcvs-0.4.0-external-jtreemap.patch?rev=1.1&content-type=text/plain
40
41 Index: statcvs-0.4.0-external-jtreemap.patch
42 ===================================================================
43 diff -Nur statcvs-0.4.0/src/net/sf/statcvs/output/RepoMapPageMaker.java statcvs-0.4.0_patched/src/net/sf/statcvs/output/RepoMapPageMaker.java
44 --- statcvs-0.4.0/src/net/sf/statcvs/output/RepoMapPageMaker.java 2008-04-14 21:35:00.000000000 +0300
45 +++ statcvs-0.4.0_patched/src/net/sf/statcvs/output/RepoMapPageMaker.java 2008-09-20 20:46:05.000000000 +0300
46 @@ -20,7 +20,8 @@
47 package net.sf.statcvs.output;
48
49 import java.io.BufferedWriter;
50 -import java.io.File;
51 +import java.io.File;
52 +import java.io.FileInputStream;
53 import java.io.FileWriter;
54 import java.io.IOException;
55 import java.io.InputStream;
56 @@ -92,7 +93,7 @@
57 }
58
59 private String getApplet() {
60 - return "<applet archive=\"./" + Messages.getString("JTREEMAP_JAR") + "\" code=\"net.sf.jtreemap.swing.example.JTreeMapAppletExample\""
61 + return "<applet archive=\"./jtreemap.jar\" code=\"net.sf.jtreemap.swing.example.JTreeMapAppletExample\""
62 + " width=\"940\" height=\"600\"><param name=\"dataFile\" value=\"" + REPO_FILE + "\"/>" + "<param name=\"viewTree\" value=\"true\"/>"
63 + "<param name=\"showWeight\" value=\"true\"/>" + "<param name=\"valuePrefix\" value=\"Change:\"/>"
64 + "<param name=\"weightPrefix\" value=\"LOC:\"/>" + "<param name=\"dataFileType\" value=\"xml\"/>"
65 @@ -102,7 +103,7 @@
66 private void buildXmlForJTreeMap() {
67 BufferedWriter out = null;
68 try {
69 - copyJar(Messages.getString("JTREEMAP_JAR"));
70 + copyJar("jtreemap.jar");
71 out = new BufferedWriter(new FileWriter(ConfigurationOptions.getOutputDir() + REPO_FILE));
72 out.write("<?xml version='1.0' encoding='ISO-8859-1'?>\n");
73 // out.append("<!DOCTYPE root SYSTEM \"TreeMap.dtd\" >\n");
74 @@ -129,7 +130,7 @@
75 private void copyJar(final String jtreemapJar) throws IOException {
76 InputStream stream = null;
77 try {
78 - stream = RepoMapPageMaker.class.getResourceAsStream(WEB_FILE_PATH + jtreemapJar);
79 + stream = new FileInputStream("/usr/share/jtreemap/lib/" + jtreemapJar);
80 if (stream != null) {
81 FileUtils.copyFile(stream, new File(ConfigurationOptions.getOutputDir() + jtreemapJar));
82 } else {