Gentoo Archives: gentoo-commits

From: "Stefan Briesenick (sbriesen)" <sbriesen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/bdsup2sub/files: build-4.0.0.xml bdsup2sub-4.0.0-xdg.diff
Date: Wed, 28 Jul 2010 22:02:47
Message-Id: 20100728215913.30B812CF37@corvid.gentoo.org
1 sbriesen 10/07/28 21:59:13
2
3 Added: build-4.0.0.xml bdsup2sub-4.0.0-xdg.diff
4 Log:
5 initial commit.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-video/bdsup2sub/files/build-4.0.0.xml
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/bdsup2sub/files/build-4.0.0.xml?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/bdsup2sub/files/build-4.0.0.xml?rev=1.1&content-type=text/plain
13
14 Index: build-4.0.0.xml
15 ===================================================================
16 <?xml version="1.0"?>
17
18 <project name="BDSup2Sub" default="jar">
19 <!-- some properties -->
20 <property name="src.dir" value="src" />
21 <property name="build.dir" value="build" />
22 <property name="docs.dir" value="apidocs" />
23 <property name="dist.dir" value="dist" />
24 <property name="resources.dir" value="bin_copy" />
25 <property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
26 <property name="target.jdk" value="1.6" />
27
28 <!-- init -->
29 <target name="init">
30 <mkdir dir="${dist.dir}" />
31 <mkdir dir="${docs.dir}" />
32 <mkdir dir="${build.dir}" />
33 </target>
34
35 <!-- compile everything -->
36 <target name="compile" depends="init">
37 <javac srcdir="${src.dir}"
38 destdir="${build.dir}"
39 source="${target.jdk}"
40 target="${target.jdk}"
41 encoding="ISO-8859-1"/>
42 <copy todir="${build.dir}">
43 <fileset dir="${resources.dir}" />
44 </copy>
45 </target>
46
47 <!-- build the jar files -->
48 <target name="build" depends="compile">
49 <jar jarfile="${project.jar}" basedir="${build.dir}">
50 <manifest>
51 <attribute name="Main-Class" value="${ant.project.name}" />
52 </manifest>
53 </jar>
54 </target>
55
56 <!-- generate javadocs -->
57 <target name="javadoc" depends="init">
58 <javadoc sourcepath="${src.dir}"
59 packagenames="*"
60 destdir="${docs.dir}"
61 author="true"
62 version="true"
63 use="true"
64 charset="UTF-8"
65 encoding="ISO-8859-1"
66 windowtitle="${ant.project.name} API" />
67 </target>
68
69 <!-- clean up -->
70 <target name="clean">
71 <delete dir="${build.dir}" />
72 <delete dir="${docs.dir}" />
73 <delete dir="${dist.dir}" />
74 </target>
75
76 <!-- zip the sources -->
77 <target name="sourcezip">
78 <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
79 <zipfileset dir="${src.dir}" />
80 </zip>
81 </target>
82
83 </project>
84
85
86
87 1.1 media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff
88
89 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff?rev=1.1&view=markup
90 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff?rev=1.1&content-type=text/plain
91
92 Index: bdsup2sub-4.0.0-xdg.diff
93 ===================================================================
94 diff -Naur src.orig/deadbeef/SupTools/Core.java src/deadbeef/SupTools/Core.java
95 --- src.orig/deadbeef/SupTools/Core.java 2010-07-28 22:56:08.319223422 +0200
96 +++ src/deadbeef/SupTools/Core.java 2010-07-28 22:56:08.890223411 +0200
97 @@ -22,6 +22,8 @@
98 import deadbeef.Tools.Props;
99 import deadbeef.Tools.ToolBox;
100
101 +import java.io.File;
102 +
103 /*
104 * Copyright 2009 Volker Oth (0xdeadbeef)
105 *
106 @@ -768,6 +770,11 @@
107 }
108 fnameProps += Core.iniName;
109
110 + // use XDG spec
111 + fnameProps = System.getenv("XDG_CONFIG_HOME");
112 + if (fnameProps == null) fnameProps = System.getProperty("user.home") + "/.config";
113 + fnameProps += "/" + Core.iniName;
114 +
115 // read properties from ini file
116 props = new Props();
117 props.setHeader(Core.progNameVer+" settings - don't modify manually");
118 @@ -905,8 +912,11 @@
119 * Write properties
120 */
121 public static void storeProps() {
122 - if (props != null)
123 + if (props != null) {
124 + File path = new File(ToolBox.getPathName(fnameProps));
125 + path.mkdirs();
126 props.save(fnameProps);
127 + }
128 }
129
130 /**