1 |
betelgeuse 08/07/04 19:57:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: hsqldb-1.8.0.10.ebuild |
5 |
Log: |
6 |
Version bump. Fixes bug #228697. |
7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.46 dev-db/hsqldb/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hsqldb/ChangeLog?rev=1.46&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hsqldb/ChangeLog?rev=1.46&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hsqldb/ChangeLog?r1=1.45&r2=1.46 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v |
19 |
retrieving revision 1.45 |
20 |
retrieving revision 1.46 |
21 |
diff -u -r1.45 -r1.46 |
22 |
--- ChangeLog 30 May 2008 22:19:19 -0000 1.45 |
23 |
+++ ChangeLog 4 Jul 2008 19:57:16 -0000 1.46 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for dev-db/hsqldb |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.45 2008/05/30 22:19:19 betelgeuse Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.46 2008/07/04 19:57:16 betelgeuse Exp $ |
29 |
+ |
30 |
+*hsqldb-1.8.0.10 (04 Jul 2008) |
31 |
+ |
32 |
+ 04 Jul 2008; Petteri Räty <betelgeuse@g.o> |
33 |
+ +files/StringComparator.java, +hsqldb-1.8.0.10.ebuild: |
34 |
+ Version bump. Fixes bug #228697. |
35 |
|
36 |
30 May 2008; Petteri Räty <betelgeuse@g.o> |
37 |
hsqldb-1.8.0.9-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-db/hsqldb/hsqldb-1.8.0.10.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: hsqldb-1.8.0.10.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2008 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild,v 1.1 2008/07/04 19:57:16 betelgeuse Exp $ |
51 |
|
52 |
EAPI=1 |
53 |
JAVA_PKG_IUSE="doc source test" |
54 |
inherit eutils versionator java-pkg-2 java-ant-2 |
55 |
|
56 |
MY_PV=$(replace_all_version_separators _ ) |
57 |
MY_P="${PN}_${MY_PV}" |
58 |
|
59 |
DESCRIPTION="The leading SQL relational database engine written in Java." |
60 |
HOMEPAGE="http://hsqldb.org" |
61 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" |
62 |
|
63 |
LICENSE="BSD" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
66 |
IUSE="java6" |
67 |
|
68 |
CDEPEND="java-virtuals/servlet-api:2.3" |
69 |
RDEPEND="java6? ( >=virtual/jre-1.6 ) |
70 |
!java6? ( >=virtual/jre-1.4 ) |
71 |
${CDEPEND}" |
72 |
DEPEND="java6? ( >=virtual/jdk-1.6 ) |
73 |
!java6? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) |
74 |
test? ( dev-java/junit:0 ) |
75 |
app-arch/unzip |
76 |
${CDEPEND}" |
77 |
|
78 |
S="${WORKDIR}/${PN}" |
79 |
|
80 |
HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar |
81 |
HSQLDB_HOME=/var/lib/hsqldb |
82 |
|
83 |
pkg_setup() { |
84 |
enewgroup hsqldb |
85 |
enewuser hsqldb -1 /bin/sh /dev/null hsqldb |
86 |
|
87 |
java-pkg-2_pkg_setup |
88 |
} |
89 |
|
90 |
src_unpack() { |
91 |
unpack ${A} |
92 |
cd "${S}" |
93 |
|
94 |
rm -v lib/*.jar || die |
95 |
java-pkg_jar-from --virtual --into lib servlet-api-2.3 |
96 |
|
97 |
sed -i -r \ |
98 |
-e "s#etc/sysconfig#etc/conf.d#g" \ |
99 |
bin/hsqldb || die |
100 |
|
101 |
eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null |
102 |
|
103 |
epatch "${FILESDIR}/resolve-config-softlinks.patch" |
104 |
java-pkg_filter-compiler jikes |
105 |
|
106 |
mkdir conf |
107 |
sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${HSQLDB_JAR//\//\\/}/g" \ |
108 |
-e "s/^SERVER_HOME=.*$/SERVER_HOME=\/var\/lib\/hsqldb/g" \ |
109 |
-e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \ |
110 |
-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \ |
111 |
src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die |
112 |
cp "${FILESDIR}/server.properties" conf/ || die |
113 |
cp "${FILESDIR}/sqltool.rc" conf/ || die |
114 |
|
115 |
# Missing source file - needed for tests |
116 |
# http://hsqldb.cvs.sourceforge.net/*checkout*/hsqldb/hsqldb-dev/src/org/hsqldb/lib/StringComparator.java?revision=1.1&pathrev=hsqldb_1_8_0_10 |
117 |
# http://sourceforge.net/tracker/index.php?func=detail&aid=2008754&group_id=23316&atid=378131 |
118 |
cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die |
119 |
} |
120 |
|
121 |
# EANT_BUILD_XML used also in src_unpack |
122 |
EANT_BUILD_XML="build/build.xml" |
123 |
EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil" |
124 |
EANT_DOC_TARGET="javadocdev" |
125 |
|
126 |
src_test() { |
127 |
java-pkg_jar-from --into lib junit |
128 |
eant -f ${EANT_BUILD_XML} jartest |
129 |
cd testrun/hsqldb || die |
130 |
./runTest.sh TestSelf || die "TestSelf hsqldb tests failed" |
131 |
# TODO. These fail. Investigate why. |
132 |
#cd "${S}/testrun/sqltool" || die |
133 |
#CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed" |
134 |
} |
135 |
|
136 |
src_install() { |
137 |
java-pkg_dojar lib/hsql*.jar |
138 |
|
139 |
if use doc; then |
140 |
dodoc doc/*.txt |
141 |
java-pkg_dohtml -r doc/guide |
142 |
java-pkg_dohtml -r doc/src |
143 |
fi |
144 |
use source && java-pkg_dosrc src/* |
145 |
|
146 |
# Install env file for CONFIG_PROTECT support |
147 |
doenvd "${FILESDIR}/35hsqldb" || die |
148 |
|
149 |
# Put init, configuration and authorization files in /etc |
150 |
doinitd "${FILESDIR}/hsqldb" || die |
151 |
doconfd conf/hsqldb || die |
152 |
dodir /etc/hsqldb |
153 |
insinto /etc/hsqldb |
154 |
# Change the ownership of server.properties and sqltool.rc |
155 |
# files to hsqldb:hsqldb. (resolves Bug #111963) |
156 |
insopts -m0600 -o hsqldb -g hsqldb |
157 |
doins conf/server.properties || die |
158 |
insopts -m0600 -o hsqldb -g hsqldb |
159 |
doins conf/sqltool.rc || die |
160 |
|
161 |
# Install init script |
162 |
dodir "${HSQLDB_HOME}/bin" |
163 |
keepdir "${HSQLDB_HOME}" |
164 |
exeinto "${HSQLDB_HOME}/bin" |
165 |
doexe bin/hsqldb || die |
166 |
|
167 |
# Create symlinks to authorization files in the server home dir |
168 |
# (required by the hqldb init script) |
169 |
insinto "${HSQLDB_HOME}" |
170 |
dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties" || die |
171 |
dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc" || die |
172 |
|
173 |
# Make sure that files have correct permissions |
174 |
chown -R hsqldb:hsqldb "${D}${HSQLDB_HOME}" |
175 |
chmod o-rwx "${D}${HSQLDB_HOME}" |
176 |
} |
177 |
|
178 |
pkg_postinst() { |
179 |
ewarn "If you intend to run Hsqldb in Server mode and you want to create" |
180 |
ewarn "additional databases, remember to put correct information in both" |
181 |
ewarn "'server.properties' and 'sqltool.rc' files." |
182 |
ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3." |
183 |
ewarn "UNIX Quick Start' in the Hsqldb docs for more information)" |
184 |
echo |
185 |
elog "Example:" |
186 |
echo |
187 |
elog "/etc/hsqldb/server.properties" |
188 |
elog "=============================" |
189 |
elog "server.database.1=file:xdb/xdb" |
190 |
elog "server.dbname.1=xdb" |
191 |
elog "server.urlid.1=xdb" |
192 |
elog |
193 |
elog "/etc/hsqldb/sqltool.rc" |
194 |
elog "======================" |
195 |
elog "urlid xdb" |
196 |
elog "url jdbc:hsqldb:hsql://localhost/xdb" |
197 |
elog "username sa" |
198 |
elog "password " |
199 |
echo |
200 |
elog "Also note that each hsqldb server can serve only up to 10" |
201 |
elog "different databases simultaneously (with consecutive {0-9}" |
202 |
elog "suffixes in the 'server.properties' file)." |
203 |
echo |
204 |
ewarn "For data manipulation use:" |
205 |
ewarn |
206 |
ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManager" |
207 |
ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing" |
208 |
ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.SqlTool \\" |
209 |
ewarn " --rcFile /var/lib/hsqldb/sqltool.rc <dbname>" |
210 |
echo |
211 |
elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'" |
212 |
elog "and Using Hsqldb' in the Hsqldb docs at:" |
213 |
elog " http://hsqldb.org/web/hsqlDocsFrame.html" |
214 |
elog "If you intend to run it in the Server mode, it is suggested to add the" |
215 |
elog "init script to your start-up scripts, this should be done like this:" |
216 |
elog " \`rc-update add hsqldb default\`" |
217 |
echo |
218 |
|
219 |
# Enable CONFIG_PROTECT for hsqldb |
220 |
env-update |
221 |
elog "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory" |
222 |
elog "is added to the CONFIG_PROTECT list. In order to immediately activate" |
223 |
elog "these settings please do:" |
224 |
elog " \`env-update && source /etc/profile\`" |
225 |
elog "Otherwise the settings will become active next time you login" |
226 |
echo |
227 |
} |
228 |
|
229 |
|
230 |
|
231 |
-- |
232 |
gentoo-commits@l.g.o mailing list |