parent
dba17041ba
commit
48304827b6
@ -1,3 +1,3 @@
|
|||||||
DIST monit-5.15.tar.gz 1218043 SHA256 deada8153dc7e8755f572bc4d790143a92c7a8668dccb563ae4dbd73af56697c SHA512 7e2b011a89d9b1dc990faf413a38f0c68aea398e25efd5392d6aa1baf50d68ea2db087ea2093c84658a99b7a83d133b23562d5ad11e1197db7a54a2b961177cd WHIRLPOOL e305705583c79b8d861595cae4d000b5832e3288f3d0ec59e69ac811e1f402af489e44c8fe568941781d97c953ff181a8048f0b3dfaeec14a26fd4bbc8cff697
|
|
||||||
DIST monit-5.17.1.tar.gz 1231823 SHA256 f71a22cfb6bd91ff46496e72e1d1b1021ecd651e7748131ce0f995cc37ff0b42 SHA512 e28534ce3a5a95eac70f05c34b5a8545a0eb925ac90f82f71bcea8f3568be45288ddbd196c2352a390820244143511ecf2e0de21cdcab1dd2f3e4788dad71015 WHIRLPOOL 9416020cecb49473299f0603448a79c0f3992bad995dbd78a282cf8440b9957edcefc419a56ed71f583efbce2d0ba50a338d2df5b736d9d32e0116ecc5bf5ef1
|
DIST monit-5.17.1.tar.gz 1231823 SHA256 f71a22cfb6bd91ff46496e72e1d1b1021ecd651e7748131ce0f995cc37ff0b42 SHA512 e28534ce3a5a95eac70f05c34b5a8545a0eb925ac90f82f71bcea8f3568be45288ddbd196c2352a390820244143511ecf2e0de21cdcab1dd2f3e4788dad71015 WHIRLPOOL 9416020cecb49473299f0603448a79c0f3992bad995dbd78a282cf8440b9957edcefc419a56ed71f583efbce2d0ba50a338d2df5b736d9d32e0116ecc5bf5ef1
|
||||||
DIST monit-5.18.tar.gz 1239752 SHA256 75ccb85fa2ac1f44c9c95c5a6b539a254b0a1d64e16a36ec9eeb867484a4fcaf SHA512 448f0d2cb0a18e6b4ead051918677414157f7feac5697888f667db4cf5411b922058a36fc57247c6b8ff9b6f23382305c8c69fc6ec1fcd247b01f4a8bccaa42c WHIRLPOOL 7eaa147be48aa8f38d3e11df6af65c68aa36f20bb868d619e573a13563a2f3e82efc170e5449785f93db1b56261a286422565455676f86e803612d10b8c87d24
|
DIST monit-5.18.tar.gz 1239752 SHA256 75ccb85fa2ac1f44c9c95c5a6b539a254b0a1d64e16a36ec9eeb867484a4fcaf SHA512 448f0d2cb0a18e6b4ead051918677414157f7feac5697888f667db4cf5411b922058a36fc57247c6b8ff9b6f23382305c8c69fc6ec1fcd247b01f4a8bccaa42c WHIRLPOOL 7eaa147be48aa8f38d3e11df6af65c68aa36f20bb868d619e573a13563a2f3e82efc170e5449785f93db1b56261a286422565455676f86e803612d10b8c87d24
|
||||||
|
DIST monit-5.19.0.tar.gz 1260248 SHA256 befcd54365502bce4ffd6d1b0c345d5b689c9f7cb3a35a462ba7dcffcf6f62b8 SHA512 87bd21660c8ef1f1663abe24d5024c2f6d2d6a782a0a37432c5afff45d906ecf12d477569309a6be80c6bb855d04da5ac51818cdcc46542cdac2df88bad91517 WHIRLPOOL 0bd22cef1b42a31393af59284e5a3d08f6974fb6daf557f2dd27d31fecf0f8b1657d7050ce8cfea8d2c423a5a83f7dae8ec1af3f6eb7340abb16253d3d3e9b43
|
||||||
|
@ -1 +1,2 @@
|
|||||||
DIST pixz-1.0.3.tar.gz 27105 SHA256 49f44520b411315ec4b02891eb77ba6060bdfd77ab5112e9c3e21de581c3384d SHA512 e33e038fc760a51b5bbc52c4faca2b165a5e4546438cd1bf9b41b91d6c8aabad43be367750ac1e7a7007c6d2544ce6dd4662fa60c99c763d96d918eeed002fa7 WHIRLPOOL 29ba24955280051d2d7562aca0b908c1228d0345beb7a6b1e330714ac8c39f6e86a87d60581c91a578950a9dfabbc96c59f64e8afecd2100499c64d4007f5477
|
DIST pixz-1.0.3.tar.gz 27105 SHA256 49f44520b411315ec4b02891eb77ba6060bdfd77ab5112e9c3e21de581c3384d SHA512 e33e038fc760a51b5bbc52c4faca2b165a5e4546438cd1bf9b41b91d6c8aabad43be367750ac1e7a7007c6d2544ce6dd4662fa60c99c763d96d918eeed002fa7 WHIRLPOOL 29ba24955280051d2d7562aca0b908c1228d0345beb7a6b1e330714ac8c39f6e86a87d60581c91a578950a9dfabbc96c59f64e8afecd2100499c64d4007f5477
|
||||||
|
DIST pixz-1.0.6.tar.gz 27603 SHA256 ebde85148e927ed96abaeb9ab2166435c78d31e7c6b2847e8c8d6249b17f1b60 SHA512 432b4714501e4de53d5e4a9d91244cdf9b19cd3ef568d750e630cca16c91644073da6ff2ad676004e70a0a09b18dfdb9d6592420da47f0da3de64ec0757da2f7 WHIRLPOOL c796de23e0a0d78e28a03597202aa9730a2d57fa11942f705b726c48a1b42d9c7580c0efb11133fad7e461b937d1af6760f648fbf6d9a0196486753104ad161e
|
||||||
|
@ -0,0 +1,50 @@
|
|||||||
|
# Copyright 1999-2016 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
inherit toolchain-funcs flag-o-matic autotools
|
||||||
|
|
||||||
|
DESCRIPTION="Parallel Indexed XZ compressor"
|
||||||
|
HOMEPAGE="https://github.com/vasi/pixz"
|
||||||
|
LICENSE="BSD-2"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="static"
|
||||||
|
|
||||||
|
LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
|
||||||
|
>=app-arch/xz-utils-5[static-libs(+)]"
|
||||||
|
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? ( ${LIB_DEPEND} )
|
||||||
|
app-text/asciidoc"
|
||||||
|
|
||||||
|
if [[ ${PV} == "9999" ]] ; then
|
||||||
|
EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
|
||||||
|
inherit git-r3
|
||||||
|
KEYWORDS=""
|
||||||
|
else
|
||||||
|
SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
KEYWORDS="~amd64 ~arm ~x86"
|
||||||
|
fi
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
use static && append-ldflags -static
|
||||||
|
append-flags -std=gnu99
|
||||||
|
econf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
emake CC="$(tc-getCC)" OPT=""
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin src/pixz
|
||||||
|
doman src/pixz.1
|
||||||
|
dodoc NEWS README.md TODO
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
DIST virtio-win-0.1.117.iso 56999936 SHA256 79a0721a363d5845b88aab7083986c20647cc3044a442879c4fa7eb601f98005 SHA512 695d4bf0bbe469269ef46735997c33d3bec83bec30b86ffefe6ee3a7142e4c70a5cdb6aeca1bef6b538792faee752296452535c0276a3f7686d8a96bdf9eb6d4 WHIRLPOOL 19285eebf0ff0129b100dbf314dfbf890201ebd709f73785e8e631ec6db51b2492bb495d8b76600011a5393e36e319782b2730df602928ecd11fb6626c4d56ea
|
DIST virtio-win-0.1.117.iso 56999936 SHA256 79a0721a363d5845b88aab7083986c20647cc3044a442879c4fa7eb601f98005 SHA512 695d4bf0bbe469269ef46735997c33d3bec83bec30b86ffefe6ee3a7142e4c70a5cdb6aeca1bef6b538792faee752296452535c0276a3f7686d8a96bdf9eb6d4 WHIRLPOOL 19285eebf0ff0129b100dbf314dfbf890201ebd709f73785e8e631ec6db51b2492bb495d8b76600011a5393e36e319782b2730df602928ecd11fb6626c4d56ea
|
||||||
|
DIST virtio-win-0.1.118.iso 56967168 SHA256 1fcc4013272e7bdc36d074c9ee30f1eba291c7f822b7d04a2db9d1862d2f31bd SHA512 1a1da7bfbecb1cd02eca780583c486caadd5b76b225a469af0e693f08506bf9b582f57df52b670409a1cf0d887c0ab715ecca0f08802c242a93535d2d58134d9 WHIRLPOOL 0b8a12074483922eddee267bc59984f41606737dcb44079284b0e2b6b8ac27a69f74ad90b3e3c5b90f3f071e08704c9a62e161afa5b0e9fce4622749a9bbfee3
|
||||||
DIST virtio-win-0.1.96.iso 160659456 SHA256 438e1a52d3d7cc6847ba7bc828ba0d5f09f97eeb1e39f7042448d656282f870e SHA512 a00311f29937383d0dd538b5156a078fdb0c93d39a91d66376a9567f3d4841eeb0ec2a8bf8b018d089040895c9f720e1b253a5aed8bd337dd8713a47544b2a61 WHIRLPOOL 7093e596b95702c6bb310ff61ad474ca05457dc4df4aed4e52336139119f82e06421ed7c207250f70bd6354e33649de04e66a1618121f447a44732a68f3789aa
|
DIST virtio-win-0.1.96.iso 160659456 SHA256 438e1a52d3d7cc6847ba7bc828ba0d5f09f97eeb1e39f7042448d656282f870e SHA512 a00311f29937383d0dd538b5156a078fdb0c93d39a91d66376a9567f3d4841eeb0ec2a8bf8b018d089040895c9f720e1b253a5aed8bd337dd8713a47544b2a61 WHIRLPOOL 7093e596b95702c6bb310ff61ad474ca05457dc4df4aed4e52336139119f82e06421ed7c207250f70bd6354e33649de04e66a1618121f447a44732a68f3789aa
|
||||||
|
@ -0,0 +1,19 @@
|
|||||||
|
# Copyright 1999-2016 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
|
||||||
|
HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
|
||||||
|
SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-2/${PN}-${PV}.iso"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
S=${WORKDIR}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
insinto /usr/share/drivers/windows
|
||||||
|
doins "${DISTDIR}/${PN}-${PV}.iso"
|
||||||
|
}
|
@ -1,2 +1 @@
|
|||||||
DIST jq-1.4.tar.gz 578317 SHA256 998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d SHA512 02e601b713a3249bcfe5373153dff38a63bf504895181ca3f691dbf033b407373a9c5880001bbd1954123cdf89f4fe75e2a5168e7a7cf13b3f7355dc18f92458 WHIRLPOOL 93c85a40d8aaf36d1f846ee9050aebe32a3a135e89a64647688b447af8733d210a4716d4ee62271a7d33f2e498e8aee7b2e88ed5373d0ec07e810215c1d288ab
|
|
||||||
DIST jq-1.5.tar.gz 739309 SHA256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238 WHIRLPOOL ca45763fb43ba0bc4a97f1a6d34e3c5af0f25f2548d04646f76ac18e95792445eaa42869ce4a7a736b7d6bc09440225e277df79abacf23ef3c8f1b41170e2907
|
DIST jq-1.5.tar.gz 739309 SHA256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238 WHIRLPOOL ca45763fb43ba0bc4a97f1a6d34e3c5af0f25f2548d04646f76ac18e95792445eaa42869ce4a7a736b7d6bc09440225e277df79abacf23ef3c8f1b41170e2907
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
do not statically link libjq since we install it
|
|
||||||
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -53,7 +53,6 @@
|
|
||||||
|
|
||||||
bin_PROGRAMS = jq
|
|
||||||
jq_SOURCES = main.c
|
|
||||||
-jq_LDFLAGS = -static-libtool-libs
|
|
||||||
jq_LDADD = libjq.la -lm
|
|
||||||
|
|
||||||
### Tests (make check)
|
|
@ -1,40 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit autotools eutils
|
|
||||||
|
|
||||||
DESCRIPTION="A lightweight and flexible command-line JSON processor"
|
|
||||||
HOMEPAGE="https://stedolan.github.com/jq/"
|
|
||||||
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="MIT CC-BY-3.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
|
||||||
IUSE="static-libs test"
|
|
||||||
|
|
||||||
DEPEND="sys-devel/bison
|
|
||||||
sys-devel/flex
|
|
||||||
test? ( dev-util/valgrind )"
|
|
||||||
|
|
||||||
DOCS=( AUTHORS README )
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i '/^dist_doc_DATA/d' Makefile.am || die
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.4-dynamic-link.patch
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# don't try to rebuild docs
|
|
||||||
econf \
|
|
||||||
--disable-docs \
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
use static-libs || find "${ED}" -name libjq.la -delete
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit autotools eutils
|
|
||||||
|
|
||||||
DESCRIPTION="A lightweight and flexible command-line JSON processor"
|
|
||||||
HOMEPAGE="https://stedolan.github.com/jq/"
|
|
||||||
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="MIT CC-BY-3.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
IUSE="test"
|
|
||||||
|
|
||||||
DEPEND="sys-devel/bison
|
|
||||||
sys-devel/flex
|
|
||||||
test? ( dev-util/valgrind )"
|
|
||||||
|
|
||||||
DOCS=( AUTHORS README )
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i '/^dist_doc_DATA/d' Makefile.am || die
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# don't try to rebuild docs
|
|
||||||
econf --disable-docs
|
|
||||||
}
|
|
@ -1,53 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit autotools
|
|
||||||
|
|
||||||
DESCRIPTION="A lightweight and flexible command-line JSON processor"
|
|
||||||
HOMEPAGE="https://stedolan.github.com/jq/"
|
|
||||||
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="MIT CC-BY-3.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
|
||||||
IUSE="oniguruma static-libs test"
|
|
||||||
|
|
||||||
DEPEND=">=sys-devel/bison-3.0
|
|
||||||
sys-devel/flex
|
|
||||||
oniguruma? ( dev-libs/oniguruma[static-libs?] )
|
|
||||||
test? ( dev-util/valgrind )"
|
|
||||||
RDEPEND="!static-libs? (
|
|
||||||
oniguruma? ( dev-libs/oniguruma[static-libs?] )
|
|
||||||
)"
|
|
||||||
|
|
||||||
DOCS=( AUTHORS README )
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
|
|
||||||
"${FILESDIR}"/${P}-remove-automagic-dep-on-oniguruma.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i '/^dist_doc_DATA/d' Makefile.am || die
|
|
||||||
sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
|
|
||||||
configure.ac || die
|
|
||||||
|
|
||||||
default
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# don't try to rebuild docs
|
|
||||||
econf \
|
|
||||||
--disable-docs \
|
|
||||||
$(use_enable static-libs static) \
|
|
||||||
$(use_with oniguruma)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
use static-libs || find "${ED}" -name libjq.la -delete
|
|
||||||
}
|
|
@ -0,0 +1,30 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
|
||||||
|
|
||||||
|
inherit python-r1
|
||||||
|
|
||||||
|
DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
|
||||||
|
HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
|
||||||
|
SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||||
|
|
||||||
|
DEPEND="${PYTHON_DEPS}"
|
||||||
|
RDEPEND="${DEPEND}
|
||||||
|
>=app-portage/gentoolkit-0.3.2-r1
|
||||||
|
>=sys-apps/portage-2.2.26[${PYTHON_USEDEP}]"
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
python_foreach_impl python_doscript ${PN}
|
||||||
|
doman *.[0-9]
|
||||||
|
}
|
@ -1,2 +1 @@
|
|||||||
DIST XML-Schema-learner-1.0.0.tar.gz 50690 SHA256 b68fe6c090c3e175e52e0e9f037412eb11725951a54c6a884246fcd2c9465a83 SHA512 aa1b696fbec13d3a345f063e055f77f17832ceb11294a73ac393363684d754f0274ffc59bfc048315bbe2cba8a012cd012ee9ce4f7de12b5695bad60485564bd WHIRLPOOL ddd0afd6056bfa8c617d0a310512d2d4353282f44b8bac140ff299533e689693aa268c189c3c617ecd3e638a00d6994e92e1b6cfa1f8a5c692605f9f12635930
|
|
||||||
DIST XML-Schema-learner-1.0.1.tar.gz 51057 SHA256 79e9416db683fee9463ba895283423661e05aa8de2b15c9ea2372c83110ab011 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d WHIRLPOOL 810a51fa5920d46f96e82d018c95e9524dfc85b433fd1579f90a7ff241e6300dc88f166725e68f58a0aac1658fc92ba374da03e3995ed22ba08da23e6003df43
|
DIST XML-Schema-learner-1.0.1.tar.gz 51057 SHA256 79e9416db683fee9463ba895283423661e05aa8de2b15c9ea2372c83110ab011 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d WHIRLPOOL 810a51fa5920d46f96e82d018c95e9524dfc85b433fd1579f90a7ff241e6300dc88f166725e68f58a0aac1658fc92ba374da03e3995ed22ba08da23e6003df43
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
|
|
||||||
HOMEPAGE="https://github.com/kore/${PN}"
|
|
||||||
SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64"
|
|
||||||
IUSE="test"
|
|
||||||
|
|
||||||
# PHP dependency can be inferred from .travis.yml in the repository.
|
|
||||||
# The necessary USE flags on the other hand were found the hard way.
|
|
||||||
#
|
|
||||||
# The dependencies here aren't as expressive as they should be. What we
|
|
||||||
# really want is for php[...] to apply to everything in PHP_TARGETS, and
|
|
||||||
# for those interpreters (the ones in PHP_TARGETS) to be used to run the
|
|
||||||
# test suite.
|
|
||||||
#
|
|
||||||
# See bug #497606.
|
|
||||||
#
|
|
||||||
RDEPEND="dev-lang/php:*[cli,xml,xmlreader]"
|
|
||||||
DEPEND="test? ( ${RDEPEND}
|
|
||||||
dev-php/phpunit )"
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# Don't run make, the default target is 'check'.
|
|
||||||
:
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" PREFIX="/usr" install
|
|
||||||
dodoc README.rst
|
|
||||||
}
|
|
@ -0,0 +1,55 @@
|
|||||||
|
# Copyright 1999-2016 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit eutils toolchain-funcs
|
||||||
|
|
||||||
|
DESCRIPTION="An OCR (Optical Character Recognition) program"
|
||||||
|
SRC_URI="mirror://gentoo/${P}.tar.gz"
|
||||||
|
HOMEPAGE="http://www.claraocr.org/"
|
||||||
|
|
||||||
|
SLOT="0"
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~sparc-solaris"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="x11-libs/libX11"
|
||||||
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
|
# The test provided by clara doesn't seem to make any sense. It just
|
||||||
|
# calls the binary with an unsupported option, which results in an
|
||||||
|
# error.
|
||||||
|
RESTRICT="test"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
|
||||||
|
epatch "${FILESDIR}/${PN}_open_mode.patch"
|
||||||
|
epatch "${FILESDIR}/${P}-debian-vararg.patch"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
emake CC="$(tc-getCC)" || die
|
||||||
|
emake doc || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin ${PN} selthresh
|
||||||
|
doman doc/${PN}*.1 selthresh.1
|
||||||
|
|
||||||
|
dodoc ANNOUNCE CHANGELOG doc/FAQ
|
||||||
|
insinto /usr/share/doc/${P}
|
||||||
|
doins imre.pbm
|
||||||
|
|
||||||
|
dohtml doc/*.html
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
elog
|
||||||
|
elog "Please note that Clara OCR has to be trained to recognize text,"
|
||||||
|
elog "without a training session it simply won't work. Have a look at"
|
||||||
|
elog "the docs in /usr/share/doc/${P}/html/ to get more "
|
||||||
|
elog "info about the training procedure."
|
||||||
|
elog
|
||||||
|
}
|
@ -0,0 +1,90 @@
|
|||||||
|
--- clara-20031214.orig/clara.c
|
||||||
|
+++ clara-20031214/clara.c
|
||||||
|
@@ -751,11 +751,12 @@
|
||||||
|
s[128] = 0;
|
||||||
|
logmsg(s);
|
||||||
|
|
||||||
|
- if (!trace)
|
||||||
|
- return;
|
||||||
|
- va_start(args,m);
|
||||||
|
- vfprintf(stderr,m,args);
|
||||||
|
- fprintf(stderr,"\n");
|
||||||
|
+ if (trace) {
|
||||||
|
+ vfprintf(stderr,m,args);
|
||||||
|
+ fprintf(stderr,"\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -775,10 +776,12 @@
|
||||||
|
logmsg(s);
|
||||||
|
|
||||||
|
/* send to stderr if requested */
|
||||||
|
- if (!debug)
|
||||||
|
- return;
|
||||||
|
- vfprintf(stderr,m,args);
|
||||||
|
- fprintf(stderr,"\n");
|
||||||
|
+ if (debug) {
|
||||||
|
+ vfprintf(stderr,m,args);
|
||||||
|
+ fprintf(stderr,"\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -797,9 +800,10 @@
|
||||||
|
s[128] = 0;
|
||||||
|
logmsg(s);
|
||||||
|
|
||||||
|
- va_start(args,m);
|
||||||
|
vfprintf(stderr,m,args);
|
||||||
|
fprintf(stderr,"\n");
|
||||||
|
+
|
||||||
|
+ va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* (devel)
|
||||||
|
--- clara-20031214.orig/event.c
|
||||||
|
+++ clara-20031214/event.c
|
||||||
|
@@ -638,6 +638,8 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ va_end(args);
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
printf("request (priority %d, mclip=%d, redraw=%d) to draw the message \"%s\"\n",f,mclip,redraw_stline,s);
|
||||||
|
*/
|
||||||
|
--- clara-20031214.orig/html.c
|
||||||
|
+++ clara-20031214/html.c
|
||||||
|
@@ -1548,11 +1548,12 @@
|
||||||
|
va_list args;
|
||||||
|
int n=0,f;
|
||||||
|
|
||||||
|
- va_start(args, fmt);
|
||||||
|
for (f=0; f==0; ) {
|
||||||
|
|
||||||
|
/* try to write */
|
||||||
|
+ va_start(args, fmt);
|
||||||
|
n = vsnprintf(*t+*top+1,*sz-*top-1,fmt,args);
|
||||||
|
+ va_end(args);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Some implementations of vsnprintf return -1 when
|
||||||
|
@@ -1589,11 +1590,12 @@
|
||||||
|
va_list args;
|
||||||
|
int n=0,f;
|
||||||
|
|
||||||
|
- va_start(args, fmt);
|
||||||
|
for (f=0; f==0; ) {
|
||||||
|
|
||||||
|
/* try to write */
|
||||||
|
+ va_start(args, fmt);
|
||||||
|
n = vsnprintf(text+topt+1,textsz-topt-1,fmt,args);
|
||||||
|
+ va_end(args);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Some implementations of vsnprintf return -1 when
|
@ -1,13 +0,0 @@
|
|||||||
# Copyright 1999-2005 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
inherit vim-plugin
|
|
||||||
|
|
||||||
DESCRIPTION="vim plugin: Syntax for Sam Tregar's HTML::Template"
|
|
||||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=254"
|
|
||||||
LICENSE="vim"
|
|
||||||
KEYWORDS="x86 alpha ia64 sparc amd64 ppc"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
VIM_PLUGIN_HELPURL="http://www.vim.org/scripts/script.php?script_id=254"
|
|
@ -1 +1 @@
|
|||||||
DIST ed25519-0.0.20160420.tar.gz 107323 SHA256 510c71038fc31894d8056f6114c5ea75c12572c3eb67bf4ff02c1495ab3d3705 SHA512 ea93a0919521a6aa83d5c880651bbc9706f34ed3a33c5368f7709a552b89b2e0b098c64721bbd89e84cbaeebbcd050364167a9d5cef72a5395903877ee03ae33 WHIRLPOOL d16d3e652917474394185da92f4ee106ea630f66806be6ae8bcc8acfc060352ca46190836af544e25bc3f44baf5b96b937e483d0191a8ca7f724e4570078a409
|
DIST ed25519-0_pre20160420.tar.gz 107323 SHA256 510c71038fc31894d8056f6114c5ea75c12572c3eb67bf4ff02c1495ab3d3705 SHA512 ea93a0919521a6aa83d5c880651bbc9706f34ed3a33c5368f7709a552b89b2e0b098c64721bbd89e84cbaeebbcd050364167a9d5cef72a5395903877ee03ae33 WHIRLPOOL d16d3e652917474394185da92f4ee106ea630f66806be6ae8bcc8acfc060352ca46190836af544e25bc3f44baf5b96b937e483d0191a8ca7f724e4570078a409
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
package org.objectweb.util.ant;
|
|
||||||
|
|
||||||
import org.apache.tools.ant.BuildException;
|
|
||||||
import org.apache.tools.ant.taskdefs.Copy;
|
|
||||||
|
|
||||||
public class MultipleCopy extends Copy {
|
|
||||||
|
|
||||||
public void execute() throws BuildException {
|
|
||||||
throw new BuildException("MultipleCopy is not compatible with ant >=1.7.0");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,17 +0,0 @@
|
|||||||
diff -ru owanttask-1.1/build.xml owanttask-1.1-patched/build.xml
|
|
||||||
--- owanttask-1.1/build.xml 2004-02-09 03:57:02.000000000 -0500
|
|
||||||
+++ owanttask-1.1-patched/build.xml 2006-08-05 20:06:03.000000000 -0400
|
|
||||||
@@ -3,9 +3,12 @@
|
|
||||||
<property name="out" value="${basedir}/output"/>
|
|
||||||
<property name="out.build" value="${out}/build"/>
|
|
||||||
<property name="out.lib" value="${out}/lib"/>
|
|
||||||
+ <path id="build.classpath">
|
|
||||||
+ <fileset dir="lib" includes="*.jar"/>
|
|
||||||
+ </path>
|
|
||||||
<target name="compile">
|
|
||||||
<mkdir dir="${out.build}"/>
|
|
||||||
- <javac srcdir="${prj.src}" destdir="${out.build}" debug="on">
|
|
||||||
+ <javac srcdir="${prj.src}" destdir="${out.build}" debug="on" classpathref="build.classpath">
|
|
||||||
<include name="**/*.java"/>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
@ -1,11 +0,0 @@
|
|||||||
diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
|
|
||||||
--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100
|
|
||||||
+++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2008-03-19 20:09:21.000000000 +0100
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
|
|
||||||
#include <antlr/config.hpp>
|
|
||||||
|
|
||||||
+#include <cstring>
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
#ifdef HAS_NOT_CCTYPE_H
|
|
@ -1,10 +0,0 @@
|
|||||||
--- lib/cpp/antlr/CharScanner.hpp~ 2008-11-11 21:24:02.000000000 +0000
|
|
||||||
+++ lib/cpp/antlr/CharScanner.hpp 2008-11-11 21:24:33.000000000 +0000
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
|
|
||||||
#include <antlr/config.hpp>
|
|
||||||
|
|
||||||
+#include <cstdio>
|
|
||||||
#include <cstring>
|
|
||||||
#include <map>
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
|||||||
diff -Nur antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in
|
|
||||||
--- antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200
|
|
||||||
+++ antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in 2009-03-30 02:09:28.000000000 +0300
|
|
||||||
@@ -143,7 +143,7 @@
|
|
||||||
@abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.cpp \
|
|
||||||
@abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.hpp \
|
|
||||||
:
|
|
||||||
- @ @MAKE@ -C @abs_this_builddir@/examples/cpp/tinyc
|
|
||||||
+ @ $(MAKE) -C @abs_this_builddir@/examples/cpp/tinyc
|
|
||||||
|
|
||||||
$(objdir)/.subc.g : $(srcdir)/subc.g $(objdir)/TinyCParserTokenTypes.txt @ANTLR_JAR@
|
|
||||||
@ANTLRFLAGS="-glib `@CYGPATH_W@ $(_srcdir)/../tinyc/tinyc.g` -o `@CYGPATH_W@ $(thisdir)`" @ANTLR_COMPILE_CMD@ $(srcdir)/subc.g
|
|
||||||
diff -Nur antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in
|
|
||||||
--- antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200
|
|
||||||
+++ antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in 2009-03-30 02:07:25.000000000 +0300
|
|
||||||
@@ -77,7 +77,7 @@
|
|
||||||
@ @CP@ $< $@
|
|
||||||
|
|
||||||
@abs_this_builddir@/examples/java/tinyc/TinyCParserTokenTypes.txt :
|
|
||||||
- @ @MAKE@ -C @abs_this_builddir@/examples/java/tinyc test
|
|
||||||
+ @ $(MAKE) -C @abs_this_builddir@/examples/java/tinyc test
|
|
||||||
|
|
||||||
|
|
||||||
## How to generated *.java ..
|
|
||||||
diff -Nur antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in
|
|
||||||
--- antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in 2006-11-01 23:37:18.000000000 +0200
|
|
||||||
+++ antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in 2009-03-30 02:09:07.000000000 +0300
|
|
||||||
@@ -61,11 +61,11 @@
|
|
||||||
## file resides. Therefore we are going to "make" the base
|
|
||||||
## grammar first and then copy required vocabulary over ..
|
|
||||||
TinyCTokenTypes.txt :
|
|
||||||
- @MAKE@ -C ../tinyc
|
|
||||||
+ $(MAKE) -C ../tinyc
|
|
||||||
@CP@ ../tinyc/$@ $@
|
|
||||||
|
|
||||||
@abs_this_builddir@/examples/python/tinyc/%.py :
|
|
||||||
- @MAKE@ -C ../tinyc
|
|
||||||
+ $(MAKE) -C ../tinyc
|
|
||||||
|
|
||||||
test :: test1
|
|
||||||
|
|
||||||
diff -Nur antlr-2.7.7/Makefile.in antlr-2.7.7_patched/Makefile.in
|
|
||||||
--- antlr-2.7.7/Makefile.in 2006-11-01 23:37:18.000000000 +0200
|
|
||||||
+++ antlr-2.7.7_patched/Makefile.in 2009-03-30 02:05:41.000000000 +0300
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
|
|
||||||
test clean distclean install ::
|
|
||||||
@ if test -f examples/Makefile ; then \
|
|
||||||
- @MAKE@ -C examples $@ ; \
|
|
||||||
+ $(MAKE) -C examples $@ ; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Rule to remove all objects, cores, ANTLR generated,
|
|
||||||
diff -Nur antlr-2.7.7/scripts/config.make.in antlr-2.7.7_patched/scripts/config.make.in
|
|
||||||
--- antlr-2.7.7/scripts/config.make.in 2006-11-01 23:37:18.000000000 +0200
|
|
||||||
+++ antlr-2.7.7_patched/scripts/config.make.in 2009-03-30 02:04:54.000000000 +0300
|
|
||||||
@@ -47,9 +47,9 @@
|
|
||||||
*) \
|
|
||||||
if test -f "$${d}/Makefile" ; then \
|
|
||||||
echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
|
|
||||||
- echo ">> @MAKE@ -C $(subdir)/$${d} $@ " ; \
|
|
||||||
+ echo ">> $(MAKE) -C $(subdir)/$${d} $@ " ; \
|
|
||||||
echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
|
|
||||||
- @MAKE@ -C "$$d" $@ || exit 1 ;\
|
|
||||||
+ $(MAKE) -C "$$d" $@ || exit 1 ;\
|
|
||||||
fi ; \
|
|
||||||
;; \
|
|
||||||
esac ; \
|
|
@ -1,22 +0,0 @@
|
|||||||
diff --git a/scripts/antlr-config.in.old b/scripts/antlr-config.in
|
|
||||||
index 75b94c6..adab1e6 100755
|
|
||||||
--- a/scripts/antlr-config.in.old
|
|
||||||
+++ b/scripts/antlr-config.in
|
|
||||||
@@ -19,7 +19,7 @@ Options:
|
|
||||||
[--cflags]
|
|
||||||
[--cxxflags]
|
|
||||||
Libraries:
|
|
||||||
- libantlr.a
|
|
||||||
+ libantlr.so
|
|
||||||
EOF
|
|
||||||
exit $1
|
|
||||||
}
|
|
||||||
@@ -58,7 +58,7 @@ while test $# -gt 0; do
|
|
||||||
libs="${libdir}/antlr.lib"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- libs="${libdir}/libantlr.a"
|
|
||||||
+ libs="${libdir}/libantlr.so"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
echo_libs=yes
|
|
@ -1,28 +0,0 @@
|
|||||||
From 126414cf2731a3fe8a42393d0b41ce0060844b34 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sebastian Pipping <sebastian@pipping.org>
|
|
||||||
Date: Sat, 8 Aug 2015 03:46:00 +0200
|
|
||||||
Subject: [PATCH] Fix CompositeGrammer.getIndirectDelegates for JDK 8
|
|
||||||
|
|
||||||
https://github.com/antlr/antlr3/issues/151
|
|
||||||
---
|
|
||||||
tool/src/main/java/org/antlr/tool/CompositeGrammar.java | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
|
|
||||||
index bb15723..fc16f01 100644
|
|
||||||
--- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
|
|
||||||
+++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
|
|
||||||
@@ -219,7 +219,9 @@ public class CompositeGrammar {
|
|
||||||
public List<Grammar> getIndirectDelegates(Grammar g) {
|
|
||||||
List<Grammar> direct = getDirectDelegates(g);
|
|
||||||
List<Grammar> delegates = getDelegates(g);
|
|
||||||
- delegates.removeAll(direct);
|
|
||||||
+ if (direct != null) {
|
|
||||||
+ delegates.removeAll(direct);
|
|
||||||
+ }
|
|
||||||
return delegates;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -uprN src.orig/test/net/sf/cglib/reflect/TestFastClass.java src/test/net/sf/cglib/reflect/TestFastClass.java
|
|
||||||
--- src.orig/test/net/sf/cglib/reflect/TestFastClass.java 2005-01-05 19:33:15.945618576 +0100
|
|
||||||
+++ src/test/net/sf/cglib/reflect/TestFastClass.java 2005-01-05 19:34:21.957583232 +0100
|
|
||||||
@@ -26,7 +26,7 @@ import net.sf.cglib.core.DefaultGenerato
|
|
||||||
import net.sf.cglib.transform.ClassTransformerTee;
|
|
||||||
import net.sf.cglib.transform.NullClassVisitor;
|
|
||||||
import net.sf.cglib.transform.TransformingClassGenerator;
|
|
||||||
-import org.objectweb.asm.util.DumpClassVisitor;
|
|
||||||
+import org.objectweb.asm.util.ASMifierClassVisitor;
|
|
||||||
|
|
||||||
public class TestFastClass extends net.sf.cglib.CodeGenTestCase {
|
|
||||||
public static class Simple {
|
|
@ -1,47 +0,0 @@
|
|||||||
--- build.xml.orig 2009-09-02 16:27:55.000000000 +0200
|
|
||||||
+++ build.xml 2009-09-03 17:24:23.000000000 +0200
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
<target depends="prepare" description="Compile shareable components"
|
|
||||||
name="compile">
|
|
||||||
<javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
|
|
||||||
- target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
|
|
||||||
+ target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
|
|
||||||
<classpath refid="compile.classpath"/>
|
|
||||||
<compilerarg compiler="jikes" value="-nowarn"/>
|
|
||||||
</javac>
|
|
||||||
@@ -122,16 +122,7 @@
|
|
||||||
<jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
|
|
||||||
<include name="**/*"/>
|
|
||||||
<exclude name="samples/**" />
|
|
||||||
- </jar>
|
|
||||||
-
|
|
||||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
|
|
||||||
- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
|
|
||||||
- <zipfileset dir="lib" includes="asm*.txt"/>
|
|
||||||
- <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
|
|
||||||
- <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
|
|
||||||
- <include name="**/*"/>
|
|
||||||
- <exclude name="samples/**"/>
|
|
||||||
- </jarjar>
|
|
||||||
+ </jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
|
|
||||||
@@ -239,16 +230,7 @@
|
|
||||||
failonerror="${test.failonerror}"
|
|
||||||
fork="yes"
|
|
||||||
>
|
|
||||||
-
|
|
||||||
- <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ -->
|
|
||||||
- <!-- <jvmarg value="-verbose:gc"/> -->
|
|
||||||
- <!-- <jvmarg value="-verbose:class"/> -->
|
|
||||||
- <!-- <jvmarg value="-Xprof"/> -->
|
|
||||||
- <!-- <jvmarg value="-server"/> -->
|
|
||||||
- <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
|
|
||||||
- <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
|
|
||||||
- <!-- <jvmarg value="-Djava.security.manager" /> -->
|
|
||||||
-
|
|
||||||
+ <sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
|
|
||||||
<arg value="${test.entry}"/>
|
|
||||||
<classpath>
|
|
||||||
<pathelement path="${build.home}/classes"/>
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/test/net/sf/cglib/CodeGenTestCase.java.orig 2009-11-20 11:49:04.000000000 +0100
|
|
||||||
+++ src/test/net/sf/cglib/CodeGenTestCase.java 2009-11-20 11:49:18.000000000 +0100
|
|
||||||
@@ -135,7 +135,7 @@
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
- return true;
|
|
||||||
+ return false;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
--- cglib.2.2.3/build.xml
|
|
||||||
+++ cglib.2.2.3/build.xml
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
<target depends="prepare" description="Compile shareable components"
|
|
||||||
name="compile">
|
|
||||||
<javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
|
|
||||||
- target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
|
|
||||||
+ target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
|
|
||||||
<classpath refid="compile.classpath"/>
|
|
||||||
<compilerarg compiler="jikes" value="-nowarn"/>
|
|
||||||
</javac>
|
|
||||||
@@ -123,15 +123,6 @@
|
|
||||||
<include name="**/*"/>
|
|
||||||
<exclude name="samples/**" />
|
|
||||||
</jar>
|
|
||||||
-
|
|
||||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
|
|
||||||
- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
|
|
||||||
- <zipfileset dir="lib" includes="asm*.txt"/>
|
|
||||||
- <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
|
|
||||||
- <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
|
|
||||||
- <include name="**/*"/>
|
|
||||||
- <exclude name="samples/**"/>
|
|
||||||
- </jarjar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
|
|
||||||
@@ -240,15 +231,7 @@
|
|
||||||
fork="yes"
|
|
||||||
>
|
|
||||||
|
|
||||||
- <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ -->
|
|
||||||
- <!-- <jvmarg value="-verbose:gc"/> -->
|
|
||||||
- <!-- <jvmarg value="-verbose:class"/> -->
|
|
||||||
- <!-- <jvmarg value="-Xprof"/> -->
|
|
||||||
- <!-- <jvmarg value="-server"/> -->
|
|
||||||
- <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
|
|
||||||
- <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
|
|
||||||
- <!-- <jvmarg value="-Djava.security.manager" /> -->
|
|
||||||
-
|
|
||||||
+ <sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
|
|
||||||
<arg value="${test.entry}"/>
|
|
||||||
<classpath>
|
|
||||||
<pathelement path="${build.home}/classes"/>
|
|
@ -1,36 +0,0 @@
|
|||||||
diff -Nru /tmp/cglib-3.0.orig/build.xml ./build.xml
|
|
||||||
--- /tmp/cglib-3.0.orig/build.xml 2012-08-17 19:21:37.387574672 +0300
|
|
||||||
+++ ./build.xml 2012-08-17 19:26:58.982564260 +0300
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
<target depends="prepare" description="Compile shareable components"
|
|
||||||
name="compile">
|
|
||||||
<javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
|
|
||||||
- target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
|
|
||||||
+ target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
|
|
||||||
<classpath refid="compile.classpath"/>
|
|
||||||
<compilerarg compiler="jikes" value="-nowarn"/>
|
|
||||||
</javac>
|
|
||||||
@@ -124,14 +124,6 @@
|
|
||||||
<exclude name="samples/**" />
|
|
||||||
</jar>
|
|
||||||
|
|
||||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
|
|
||||||
- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
|
|
||||||
- <zipfileset dir="lib" includes="asm*.txt"/>
|
|
||||||
- <zipfileset src="lib/asm-4.0.jar" excludes="META-INF"/>
|
|
||||||
- <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
|
|
||||||
- <include name="**/*"/>
|
|
||||||
- <exclude name="samples/**"/>
|
|
||||||
- </jarjar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
|
|
||||||
@@ -246,7 +238,7 @@
|
|
||||||
<!-- <jvmarg value="-verbose:class"/> -->
|
|
||||||
<!-- <jvmarg value="-Xprof"/> -->
|
|
||||||
<!-- <jvmarg value="-server"/> -->
|
|
||||||
- <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
|
|
||||||
+ <sysproperty key="cglib.debugLocation" value="${cglib.debugLocation}"/>
|
|
||||||
<!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
|
|
||||||
<!-- <jvmarg value="-Djava.security.manager" /> -->
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
|||||||
Casuarinaceae
|
|
||||||
hylomorphic
|
|
||||||
granitize
|
|
||||||
biddably
|
|
||||||
repulsive
|
|
||||||
amphimictical
|
|
||||||
trio
|
|
||||||
toxodont
|
|
||||||
nonreigning
|
|
||||||
dragbar
|
|
||||||
Moronidae
|
|
||||||
unlanguishing
|
|
||||||
metabolizable
|
|
||||||
Osmerus
|
|
||||||
goran
|
|
||||||
spiritfulness
|
|
||||||
tetrachloromethane
|
|
||||||
baobab
|
|
||||||
caroline
|
|
||||||
radioconductor
|
|
||||||
imband
|
|
||||||
crinoline
|
|
||||||
circummundane
|
|
||||||
incontractile
|
|
||||||
forerank
|
|
||||||
modernization
|
|
||||||
meal
|
|
||||||
fishman
|
|
||||||
underbuy
|
|
||||||
pertain
|
|
||||||
equiped
|
|
||||||
cockal
|
|
||||||
unshrined
|
|
||||||
Harb
|
|
||||||
heterotaxis
|
|
||||||
commensurableness
|
|
||||||
baggy
|
|
||||||
sarcophilous
|
|
||||||
tankard
|
|
||||||
acervuline
|
|
||||||
unverifiably
|
|
||||||
premidnight
|
|
||||||
strangles
|
|
||||||
vitellus
|
|
||||||
Socratean
|
|
||||||
flock
|
|
||||||
scourage
|
|
||||||
feverlike
|
|
||||||
citharist
|
|
||||||
harn
|
|
@ -1,27 +0,0 @@
|
|||||||
--- build.xml.orig 2005-03-29 00:13:46.324523008 +0200
|
|
||||||
+++ build.xml 2005-03-29 00:14:15.329113640 +0200
|
|
||||||
@@ -45,7 +45,7 @@
|
|
||||||
</equals>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
- <target name="compile" description="o Compile the code" depends="get-deps">
|
|
||||||
+ <target name="compile" description="o Compile the code">
|
|
||||||
<mkdir dir="${classesdir}">
|
|
||||||
</mkdir>
|
|
||||||
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
|
||||||
@@ -67,7 +67,7 @@
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
- <target name="jar" description="o Create the jar" depends="compile,test">
|
|
||||||
+ <target name="jar" description="o Create the jar" depends="compile">
|
|
||||||
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
@@ -187,4 +187,4 @@
|
|
||||||
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
|
|
||||||
</unjar>
|
|
||||||
</target>
|
|
||||||
-</project>
|
|
||||||
\ No newline at end of file
|
|
||||||
+</project>
|
|
@ -1,25 +0,0 @@
|
|||||||
diff -ru commons-betwixt-0.7-src/build.xml commons-betwixt-0.7-src-patched/build.xml
|
|
||||||
--- commons-betwixt-0.7-src/build.xml 2005-07-25 17:24:03.000000000 -0400
|
|
||||||
+++ commons-betwixt-0.7-src-patched/build.xml 2005-12-14 23:53:30.000000000 -0500
|
|
||||||
@@ -86,11 +86,11 @@
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
- <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
|
|
||||||
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test" unless="notest">
|
|
||||||
<fail message="There were test failures.">
|
|
||||||
</fail>
|
|
||||||
</target>
|
|
||||||
- <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
|
|
||||||
+ <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests" unless="notest">
|
|
||||||
<mkdir dir="${testreportdir}">
|
|
||||||
</mkdir>
|
|
||||||
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
|
|
||||||
@@ -185,4 +185,4 @@
|
|
||||||
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
|
|
||||||
</unjar>
|
|
||||||
</target>
|
|
||||||
-</project>
|
|
||||||
\ No newline at end of file
|
|
||||||
+</project>
|
|
||||||
Only in commons-betwixt-0.7-src-patched: target
|
|
@ -1,26 +0,0 @@
|
|||||||
--- build.xml.orig 2006-10-13 00:00:17.000000000 +0200
|
|
||||||
+++ build.xml 2006-10-13 00:02:37.000000000 +0200
|
|
||||||
@@ -97,13 +97,13 @@
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
- <target name="jar" description="o Create the jar" depends="compile,test">
|
|
||||||
+ <target name="jar" description="o Create the jar" depends="compile">
|
|
||||||
<mkdir dir="${classesdir}/META-INF"/>
|
|
||||||
<copy file="LICENSE.txt" todir="${metadir}"/>
|
|
||||||
<copy file="NOTICE.txt" todir="${metadir}"/>
|
|
||||||
- <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>
|
|
||||||
+ <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>
|
|
||||||
<jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"
|
|
||||||
- manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
|
|
||||||
+ manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
<target name="clean" description="o Clean up the generated directories">
|
|
||||||
@@ -282,4 +282,4 @@
|
|
||||||
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
|
|
||||||
</unjar>
|
|
||||||
</target>
|
|
||||||
-</project>
|
|
||||||
\ Chybí znak konce řádku na konci souboru
|
|
||||||
+</project>
|
|
@ -1,47 +0,0 @@
|
|||||||
--- build.xml.orig 2007-12-26 13:43:35.000000000 +1300
|
|
||||||
+++ build.xml 2007-12-26 13:47:32.000000000 +1300
|
|
||||||
@@ -117,6 +117,7 @@
|
|
||||||
<pathelement location="${jaxp.jaxp.jar}"/>
|
|
||||||
<pathelement location="${jaxp.parser.jar}"/>
|
|
||||||
<pathelement location="${commons-beanutils.jar}"/>
|
|
||||||
+ <pathelement location="${commons-collections.jar}" />
|
|
||||||
<pathelement location="${commons-logging.jar}"/>
|
|
||||||
<pathelement location="${junit.jar}"/>
|
|
||||||
</path>
|
|
||||||
@@ -140,6 +141,7 @@
|
|
||||||
<pathelement location="${junit.jar}"/>
|
|
||||||
<pathelement location="${jaxp.jaxp.jar}"/>
|
|
||||||
<pathelement location="${jaxp.parser.jar}"/>
|
|
||||||
+ <pathelement location="${commons-collections.jar}" />
|
|
||||||
<pathelement location="${commons-beanutils.jar}"/>
|
|
||||||
<pathelement location="${commons-logging.jar}"/>
|
|
||||||
</path>
|
|
||||||
@@ -256,20 +258,22 @@
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
+ <target name="jar" depends="compile"
|
|
||||||
+ description="Create commons-digester.jar">
|
|
||||||
+ <mkdir dir="${dist.home}"/>
|
|
||||||
+ <jar jarfile="${dist.home}/commons-${component.name}.jar"
|
|
||||||
+ basedir="${build.home}/classes"
|
|
||||||
+ manifest="${build.home}/conf/MANIFEST.MF"/>
|
|
||||||
+ </target>
|
|
||||||
|
|
||||||
- <target name="dist" depends="compile,javadoc"
|
|
||||||
+ <target name="dist" depends="jar,javadoc"
|
|
||||||
description="Create binary distribution">
|
|
||||||
- <mkdir dir="${dist.home}"/>
|
|
||||||
<copy file="LICENSE.txt"
|
|
||||||
todir="${dist.home}"/>
|
|
||||||
- <mkdir dir="${build.home}/classes/META-INF"/>
|
|
||||||
<copy file="RELEASE-NOTES.txt"
|
|
||||||
todir="${dist.home}"/>
|
|
||||||
<copy file="NOTICE.txt"
|
|
||||||
todir="${dist.home}"/>
|
|
||||||
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
|
|
||||||
- basedir="${build.home}/classes"
|
|
||||||
- manifest="${build.home}/conf/MANIFEST.MF"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
|||||||
--- build.xml.orig 2008-06-21 20:06:11.000000000 +0200
|
|
||||||
+++ build.xml 2008-06-21 20:07:03.000000000 +0200
|
|
||||||
@@ -14,7 +14,7 @@
|
|
||||||
|
|
||||||
<property name="defaulttargetdir" value="${basedir}/target">
|
|
||||||
</property>
|
|
||||||
- <property name="libdir" value="${user.home}/.maven/repository">
|
|
||||||
+ <property name="libdir" value="target/lib">
|
|
||||||
</property>
|
|
||||||
<property name="classesdir" value="${basedir}/target/classes">
|
|
||||||
</property>
|
|
||||||
@@ -74,7 +74,7 @@
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
- <target name="compile" description="o Compile the code" depends="get-deps">
|
|
||||||
+ <target name="compile" description="o Compile the code" depends="">
|
|
||||||
<mkdir dir="${classesdir}">
|
|
||||||
</mkdir>
|
|
||||||
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
|
||||||
@@ -94,7 +94,7 @@
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
- <target name="jar" description="o Create the jar" depends="compile,test">
|
|
||||||
+ <target name="jar" description="o Create the jar" depends="compile">
|
|
||||||
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
@@ -172,7 +172,7 @@
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
|
|
||||||
+ <target name="javadoc" description="o Generate javadoc" depends="">
|
|
||||||
<mkdir dir="${javadocdir}">
|
|
||||||
</mkdir>
|
|
||||||
<tstamp>
|
|
||||||
@@ -295,4 +295,4 @@
|
|
||||||
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
|
|
||||||
</unjar>
|
|
||||||
</target>
|
|
||||||
-</project>
|
|
||||||
\ Chybí znak konce řádku na konci souboru
|
|
||||||
+</project>
|
|
@ -1,38 +0,0 @@
|
|||||||
--- build.xml.o 2006-10-21 18:12:49.000000000 +0200
|
|
||||||
+++ build.xml 2006-10-21 18:29:18.000000000 +0200
|
|
||||||
@@ -122,11 +122,12 @@
|
|
||||||
|
|
||||||
<!-- Construct compile classpath -->
|
|
||||||
<path id="compile.classpath">
|
|
||||||
- <pathelement location="${build.home}/classes"/>
|
|
||||||
- <pathelement location="${commons-beanutils.jar}"/>
|
|
||||||
- <pathelement location="${commons-digester.jar}"/>
|
|
||||||
- <pathelement location="${commons-logging.jar}"/>
|
|
||||||
- <pathelement location="${oro.jar}"/>
|
|
||||||
+ <pathelement path="${build.home}/classes"/>
|
|
||||||
+ <pathelement path="${commons-beanutils.jar}"/>
|
|
||||||
+ <pathelement path="${commons-digester.jar}"/>
|
|
||||||
+ <pathelement path="${commons-logging.jar}"/>
|
|
||||||
+ <pathelement path="${commons-collections.jar}"/>
|
|
||||||
+ <pathelement path="${oro.jar}"/>
|
|
||||||
<path refid="downloaded.lib.classpath"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
@@ -204,7 +205,7 @@
|
|
||||||
</target>
|
|
||||||
|
|
||||||
|
|
||||||
- <target name="compile" depends="static"
|
|
||||||
+ <target name="compile" depends="prepare"
|
|
||||||
description="Compile shareable components">
|
|
||||||
<javac srcdir="${source.home}"
|
|
||||||
destdir="${build.home}/classes"
|
|
||||||
@@ -278,7 +279,7 @@
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
- <target name="javadoc" depends="compile, javadoc.js"
|
|
||||||
+ <target name="javadoc" depends="compile"
|
|
||||||
description="Create component Javadoc documentation">
|
|
||||||
<javadoc sourcepath="${source.home}"
|
|
||||||
destdir="${dist.home}/docs/apidocs"
|
|
@ -1,27 +0,0 @@
|
|||||||
https://bugs.gentoo.org/attachment.cgi?id=102974
|
|
||||||
https://sourceforge.net/tracker/index.php?func=detail&aid=829906&group_id=36177&atid=416920
|
|
||||||
|
|
||||||
diff -ur cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
|
|
||||||
--- cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2006-11-29 13:05:30.000000000 +0100
|
|
||||||
+++ cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2006-11-29 13:14:00.000000000 +0100
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
private static String[] linkerOptions = new String[]{"-bundle",
|
|
||||||
"-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
|
|
||||||
"-static", "-shared", "-symbolic", "-Xlinker",
|
|
||||||
- "--export-all-symbols", "-static-libgcc",};
|
|
||||||
+ "--export-all-symbols", "-static-libgcc", "-pg", };
|
|
||||||
private static final GccLinker dllLinker = new GccLinker("gcc", objFiles,
|
|
||||||
discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles,
|
|
||||||
discardFiles, "lib", ".so", true, null));
|
|
||||||
diff -ur cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
|
|
||||||
--- cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java 2006-11-29 13:05:30.000000000 +0100
|
|
||||||
+++ cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java 2006-11-29 13:13:21.000000000 +0100
|
|
||||||
@@ -41,7 +41,7 @@
|
|
||||||
".lib", ".dll", ".so", ".sl"};
|
|
||||||
private static String[] linkerOptions = new String[]{"-bundle", "-dylib",
|
|
||||||
"-dynamic", "-dynamiclib", "-nostartfiles", "-nostdlib",
|
|
||||||
- "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker"};
|
|
||||||
+ "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker", "-pg" };
|
|
||||||
private static final GppLinker instance = new GppLinker("gcc", objFiles,
|
|
||||||
discardFiles, "", "", false, null);
|
|
||||||
private static final GppLinker machDllLinker = new GppLinker("gcc",
|
|
@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!--
|
|
||||||
*
|
|
||||||
* Copyright 2004 The Ant-Contrib project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
-->
|
|
||||||
<antlib>
|
|
||||||
<taskdef resource="cpptasks.tasks" />
|
|
||||||
<typedef resource="cpptasks.types" />
|
|
||||||
</antlib>
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
D-Bus Java Implementation
|
|
||||||
Copyright (c) 2005-2006 Matthew Johnson
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
|
||||||
under the terms of either the GNU Lesser General Public License Version 2 or the
|
|
||||||
Academic Free Licence Version 2.1.
|
|
||||||
|
|
||||||
Full licence texts are included in the COPYING file with this program.
|
|
||||||
*/
|
|
||||||
package org.freedesktop.dbus.test;
|
|
||||||
|
|
||||||
import org.freedesktop.DBus.Description;
|
|
||||||
import org.freedesktop.dbus.DBusInterface;
|
|
||||||
import org.freedesktop.dbus.DBusInterfaceName;
|
|
||||||
import org.freedesktop.dbus.DBusMemberName;
|
|
||||||
import org.freedesktop.dbus.DBusSignal;
|
|
||||||
import org.freedesktop.dbus.UInt32;
|
|
||||||
import org.freedesktop.dbus.exceptions.DBusException;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A sample signal with two parameters
|
|
||||||
*/
|
|
||||||
@Description("Test interface containing signals")
|
|
||||||
@DBusInterfaceName("some.other.interface.Name")
|
|
||||||
public interface TestSignalInterface2 extends DBusInterface
|
|
||||||
{
|
|
||||||
@Description("Test basic signal")
|
|
||||||
public static class TestRenamedSignal extends DBusSignal
|
|
||||||
{
|
|
||||||
public final String value;
|
|
||||||
public final UInt32 number;
|
|
||||||
/**
|
|
||||||
* Create a signal.
|
|
||||||
*/
|
|
||||||
public TestRenamedSignal(String path, String value, UInt32 number) throws DBusException
|
|
||||||
{
|
|
||||||
super(path, value, number);
|
|
||||||
this.value = value;
|
|
||||||
this.number = number;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
diff --git a/org/freedesktop/dbus/Error.java b/org/freedesktop/dbus/Error.java
|
|
||||||
index 16e1126..9db1e07 100644
|
|
||||||
--- a/org/freedesktop/dbus/Error.java
|
|
||||||
+++ b/org/freedesktop/dbus/Error.java
|
|
||||||
@@ -17,6 +17,7 @@ import java.util.Vector;
|
|
||||||
import org.freedesktop.dbus.exceptions.DBusException;
|
|
||||||
import org.freedesktop.dbus.exceptions.DBusExecutionException;
|
|
||||||
import org.freedesktop.dbus.exceptions.MessageFormatException;
|
|
||||||
+import org.freedesktop.dbus.exceptions.NotConnected;
|
|
||||||
|
|
||||||
import cx.ath.matthew.debug.Debug;
|
|
||||||
|
|
||||||
@@ -79,6 +80,7 @@ public class Error extends Message
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static Class<? extends DBusExecutionException> createExceptionClass(String name)
|
|
||||||
{
|
|
||||||
+ if (name == "org.freedesktop.DBus.Local.Disconnected") return NotConnected.class;
|
|
||||||
Class<? extends DBusExecutionException> c = null;
|
|
||||||
do {
|
|
||||||
try {
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
|||||||
diff -uprN dtdparser-1.21.old/build.xml dtdparser-1.21/build.xml
|
|
||||||
--- dtdparser-1.21.old/build.xml 2002-07-29 14:06:51.000000000 +0200
|
|
||||||
+++ dtdparser-1.21/build.xml 2004-12-24 13:13:02.626325296 +0100
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
<property name="src" value="source"/>
|
|
||||||
<property file="product.properties"/>
|
|
||||||
<property name="prod.distbase" value="${prod.name}-${prod.version.major}.${prod.version.minor}"/>
|
|
||||||
- <property name="prod.jar" value="${prod.distbase}/${prod.name}${prod.version.major}${prod.version.minor}.jar"/>
|
|
||||||
+ <property name="prod.jar" value="${prod.distbase}/${prod.name}.jar"/>
|
|
||||||
<property name="doc" value="${prod.distbase}/doc"/>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
@@ -40,8 +40,11 @@
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile">
|
|
||||||
- <javac srcdir="${src}" destdir="${lib}"
|
|
||||||
- deprecation="on">
|
|
||||||
+ <javac srcdir="${src}"
|
|
||||||
+ destdir="${lib}"
|
|
||||||
+ deprecation="off"
|
|
||||||
+ source="1.3"
|
|
||||||
+ target="1.3">
|
|
||||||
<classpath refid="default.classpath"/>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
@@ -94,4 +97,9 @@
|
|
||||||
<delete dir="${lib}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
+ <target name="sourcezip">
|
|
||||||
+ <zip destfile="${dist}/dtdparser-src.zip">
|
|
||||||
+ <zipfileset dir="${src}" />
|
|
||||||
+ </zip>
|
|
||||||
+ </target>
|
|
||||||
</project>
|
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/src/org/easymock/internal/MocksControl.java b/src/org/easymock/internal/MocksControl.java
|
|
||||||
index e709dc4..cd9d5a9 100644
|
|
||||||
--- a/src/org/easymock/internal/MocksControl.java
|
|
||||||
+++ b/src/org/easymock/internal/MocksControl.java
|
|
||||||
@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
|
|
||||||
return cached;
|
|
||||||
}
|
|
||||||
|
|
||||||
- // ///CLOVER:OFF
|
|
||||||
- if (AndroidSupport.isAndroid()) {
|
|
||||||
- return classProxyFactory = new AndroidClassProxyFactory();
|
|
||||||
- }
|
|
||||||
- // ///CLOVER:ON
|
|
||||||
-
|
|
||||||
try {
|
|
||||||
return classProxyFactory = new ClassProxyFactory();
|
|
||||||
} catch (final NoClassDefFoundError e) {
|
|
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project name="ehcache" default="jar" basedir=".">
|
|
||||||
<path id="globalClassPath">
|
|
||||||
<fileset dir="lib/" includes="*.jar"/>
|
|
||||||
</path>
|
|
||||||
<target name="compile">
|
|
||||||
<mkdir dir="classes"/>
|
|
||||||
<javac srcdir="src" destdir="classes/" classpathref="globalClassPath"/>
|
|
||||||
<copy todir="classes/">
|
|
||||||
<fileset dir="." includes="ehcache-failsafe.xml"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile">
|
|
||||||
<jar destfile="ehcache.jar">
|
|
||||||
<fileset dir="classes" includes="**/*.class"/>
|
|
||||||
<fileset dir="classes" includes="**/*.xml"/>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project name="fi" default="jar" basedir=".">
|
|
||||||
<target name="compile">
|
|
||||||
<mkdir dir="build"/>
|
|
||||||
<javac debug="false" srcdir="src" destdir="build">
|
|
||||||
<classpath>
|
|
||||||
<fileset dir="lib" includes="**/*.jar"/>
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile">
|
|
||||||
<jar destfile="fi.jar">
|
|
||||||
<fileset dir="build" includes="**/*.class"/>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,32 +0,0 @@
|
|||||||
--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig 2014-03-18 10:35:50.904133661 +0100
|
|
||||||
+++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-03-18 10:37:03.808131298 +0100
|
|
||||||
@@ -42,8 +42,9 @@
|
|
||||||
#include <pango/pango.h>
|
|
||||||
#include <pango/pangoft2.h>
|
|
||||||
#include <pango/pangofc-font.h>
|
|
||||||
-#include <freetype/ftglyph.h>
|
|
||||||
-#include <freetype/ftoutln.h>
|
|
||||||
+#include <ft2build.h>
|
|
||||||
+#include FT_GLYPH_H
|
|
||||||
+#include FT_OUTLINE_H
|
|
||||||
#include "jcl.h"
|
|
||||||
#include "gdkfont.h"
|
|
||||||
#include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
|
|
||||||
--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig 2014-03-18 10:37:12.048131031 +0100
|
|
||||||
+++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2014-03-18 10:37:58.416129528 +0100
|
|
||||||
@@ -39,10 +39,11 @@
|
|
||||||
#include <pango/pango.h>
|
|
||||||
#include <pango/pangoft2.h>
|
|
||||||
#include <pango/pangofc-font.h>
|
|
||||||
-#include <freetype/ftglyph.h>
|
|
||||||
-#include <freetype/ftoutln.h>
|
|
||||||
-#include <freetype/fttypes.h>
|
|
||||||
-#include <freetype/tttables.h>
|
|
||||||
+#include <ft2build.h>
|
|
||||||
+#include FT_GLYPH_H
|
|
||||||
+#include FT_OUTLINE_H
|
|
||||||
+#include FT_TYPES_H
|
|
||||||
+#include FT_TRUETYPE_TABLES_H
|
|
||||||
#include "gdkfont.h"
|
|
||||||
#include "gtkpeer.h"
|
|
||||||
#include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
|
|
@ -1,135 +0,0 @@
|
|||||||
diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
|
|
||||||
index f819d3d..6d4ea63 100644
|
|
||||||
--- a/hamcrest-1.1/build.xml
|
|
||||||
+++ b/hamcrest-1.1/build.xml
|
|
||||||
@@ -23,87 +23,28 @@
|
|
||||||
|
|
||||||
<target name="generator"
|
|
||||||
description="Build code generator tool">
|
|
||||||
- <java-to-jar srcdir="hamcrest-generator/src/main/java"
|
|
||||||
- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
|
|
||||||
- classpath="
|
|
||||||
- lib/generator/qdox-1.6.1.jar;
|
|
||||||
- "/>
|
|
||||||
- <taskdef name="jarjar"
|
|
||||||
- classname="com.tonicsystems.jarjar.JarJarTask"
|
|
||||||
- classpath="lib/generator/jarjar-1.0rc3.jar"/>
|
|
||||||
- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
|
|
||||||
- about it's existence. Uses JarJar to place classes under a different package
|
|
||||||
- to prevent conflict. -->
|
|
||||||
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
|
|
||||||
- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
|
|
||||||
- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
|
|
||||||
- <rule pattern="com.thoughtworks.qdox.**"
|
|
||||||
- result="org.hamcrest.generator.qdox.@1"/>
|
|
||||||
- </jarjar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="core"
|
|
||||||
depends="generator"
|
|
||||||
description="Build core Hamcrest library">
|
|
||||||
- <java-to-jar srcdir="hamcrest-core/src/main/java"
|
|
||||||
- destjar="build/hamcrest-core-${version}.jar"/>
|
|
||||||
- <!-- Generate one class with all static imports -->
|
|
||||||
- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
|
|
||||||
- <java classname="org.hamcrest.generator.config.XmlConfigurator"
|
|
||||||
- fork="yes"
|
|
||||||
- failonerror="yes"
|
|
||||||
- classpath="
|
|
||||||
- build/hamcrest-core-${version}.jar;
|
|
||||||
- build/hamcrest-generator-${version}.jar;
|
|
||||||
- ">
|
|
||||||
- <arg value="core-matchers.xml"/>
|
|
||||||
- <arg value="hamcrest-core/src/main/java"/>
|
|
||||||
- <arg value="org.hamcrest.CoreMatchers"/>
|
|
||||||
- <arg value="build/temp/hamcrest-core/generated-code"/>
|
|
||||||
- </java>
|
|
||||||
- <!-- Append to core jar -->
|
|
||||||
- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
|
|
||||||
- destjar="build/hamcrest-core-${version}.jar"
|
|
||||||
- classpath="build/hamcrest-core-${version}.jar"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="library"
|
|
||||||
depends="core,generator"
|
|
||||||
description="Build library of matchers">
|
|
||||||
- <java-to-jar srcdir="hamcrest-library/src/main/java"
|
|
||||||
- destjar="build/hamcrest-library-${version}.jar"
|
|
||||||
- classpath="build/hamcrest-core-${version}.jar"/>
|
|
||||||
- <!-- Generate one class with all static imports -->
|
|
||||||
- <mkdir dir="build/temp/hamcrest-library/generated-code"/>
|
|
||||||
- <java classname="org.hamcrest.generator.config.XmlConfigurator"
|
|
||||||
- fork="yes"
|
|
||||||
- failonerror="yes"
|
|
||||||
- classpath="
|
|
||||||
- build/hamcrest-core-${version}.jar;
|
|
||||||
- build/hamcrest-generator-${version}.jar;
|
|
||||||
- build/hamcrest-library-${version}.jar;
|
|
||||||
- ">
|
|
||||||
- <arg value="matchers.xml"/>
|
|
||||||
- <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
|
|
||||||
- <arg value="org.hamcrest.Matchers"/>
|
|
||||||
- <arg value="build/temp/hamcrest-library/generated-code"/>
|
|
||||||
- </java>
|
|
||||||
- <!-- Append to library jar -->
|
|
||||||
- <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
|
|
||||||
- destjar="build/hamcrest-library-${version}.jar"
|
|
||||||
- classpath="build/hamcrest-core-${version}.jar"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
- <target name="text"
|
|
||||||
- depends="core, library"
|
|
||||||
- description="Build text pattern matcher">
|
|
||||||
- <java-to-jar srcdir="hamcrest-text/src/main/java"
|
|
||||||
- destjar="build/hamcrest-text-${version}.jar"
|
|
||||||
- classpath="
|
|
||||||
- build/hamcrest-core-${version}.jar;
|
|
||||||
- build/hamcrest-library-${version}.jar"/>
|
|
||||||
- </target>
|
|
||||||
-
|
|
||||||
+ <target name="text"
|
|
||||||
+ depends="core, library"
|
|
||||||
+ description="Build text pattern matcher">
|
|
||||||
+ <java-to-jar srcdir="hamcrest-text/src/main/java"
|
|
||||||
+ destjar="build/hamcrest-text-${version}.jar"
|
|
||||||
+ classpath="
|
|
||||||
+ build/hamcrest-core-${version}.jar;
|
|
||||||
+ build/hamcrest-library-${version}.jar"/>
|
|
||||||
+ </target>
|
|
||||||
+
|
|
||||||
<target name="integration"
|
|
||||||
depends="core, library"
|
|
||||||
description="Build integration with external tools">
|
|
||||||
@@ -121,7 +62,7 @@
|
|
||||||
destjar="build/hamcrest-unit-test-${version}.jar"
|
|
||||||
classpath="
|
|
||||||
build/hamcrest-core-${version}.jar;
|
|
||||||
- build/hamcrest-library-${version}.jar;
|
|
||||||
+ build/hamcrest-library-${version}.jar;
|
|
||||||
build/hamcrest-text-${version}.jar;
|
|
||||||
build/hamcrest-integration-${version}.jar;
|
|
||||||
build/hamcrest-generator-${version}.jar"/>
|
|
||||||
@@ -164,7 +105,7 @@
|
|
||||||
<jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
|
|
||||||
<zipfileset src="build/hamcrest-core-${version}.jar"/>
|
|
||||||
<zipfileset src="build/hamcrest-library-${version}.jar"/>
|
|
||||||
- <zipfileset src="build/hamcrest-text-${version}.jar"/>
|
|
||||||
+ <zipfileset src="build/hamcrest-text-${version}.jar"/>
|
|
||||||
<zipfileset src="build/hamcrest-generator-${version}.jar"/>
|
|
||||||
<zipfileset src="build/hamcrest-integration-${version}.jar"/>
|
|
||||||
</jar>
|
|
||||||
@@ -221,7 +162,7 @@
|
|
||||||
|
|
||||||
<packageset dir="hamcrest-core/src/main/java"/>
|
|
||||||
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
|
|
||||||
- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
|
|
||||||
+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
|
|
||||||
<packageset dir="hamcrest-integration/src/main/java"/>
|
|
||||||
<packageset dir="build/generated-code"/>
|
|
||||||
|
|
||||||
@@ -261,4 +202,4 @@
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
-</project>
|
|
||||||
+</project>
|
|
@ -1,80 +0,0 @@
|
|||||||
diff --git a/hamcrest-1.2/build.xml b/hamcrest-1.2/build.xml
|
|
||||||
index bf7e50c..f552ae1 100644
|
|
||||||
--- a/hamcrest-1.2/build.xml
|
|
||||||
+++ b/hamcrest-1.2/build.xml
|
|
||||||
@@ -23,75 +23,16 @@
|
|
||||||
|
|
||||||
<target name="generator"
|
|
||||||
description="Build code generator tool">
|
|
||||||
- <java-to-jar srcdir="hamcrest-generator/src/main/java"
|
|
||||||
- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
|
|
||||||
- classpath="
|
|
||||||
- lib/generator/qdox-1.6.1.jar;
|
|
||||||
- "/>
|
|
||||||
- <taskdef name="jarjar"
|
|
||||||
- classname="com.tonicsystems.jarjar.JarJarTask"
|
|
||||||
- classpath="lib/generator/jarjar-1.0rc3.jar"/>
|
|
||||||
- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
|
|
||||||
- about it's existence. Uses JarJar to place classes under a different package
|
|
||||||
- to prevent conflict. -->
|
|
||||||
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
|
|
||||||
- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
|
|
||||||
- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
|
|
||||||
- <rule pattern="com.thoughtworks.qdox.**"
|
|
||||||
- result="org.hamcrest.generator.qdox.@1"/>
|
|
||||||
- </jarjar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="core"
|
|
||||||
depends="generator"
|
|
||||||
description="Build core Hamcrest library">
|
|
||||||
- <java-to-jar srcdir="hamcrest-core/src/main/java"
|
|
||||||
- destjar="build/hamcrest-core-${version}.jar"/>
|
|
||||||
- <!-- Generate one class with all static imports -->
|
|
||||||
- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
|
|
||||||
- <java classname="org.hamcrest.generator.config.XmlConfigurator"
|
|
||||||
- fork="yes"
|
|
||||||
- failonerror="yes"
|
|
||||||
- classpath="
|
|
||||||
- build/hamcrest-core-${version}.jar;
|
|
||||||
- build/hamcrest-generator-${version}.jar;
|
|
||||||
- ">
|
|
||||||
- <arg value="core-matchers.xml"/>
|
|
||||||
- <arg value="hamcrest-core/src/main/java"/>
|
|
||||||
- <arg value="org.hamcrest.CoreMatchers"/>
|
|
||||||
- <arg value="build/temp/hamcrest-core/generated-code"/>
|
|
||||||
- </java>
|
|
||||||
- <!-- Append to core jar -->
|
|
||||||
- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
|
|
||||||
- destjar="build/hamcrest-core-${version}.jar"
|
|
||||||
- classpath="build/hamcrest-core-${version}.jar"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="library"
|
|
||||||
depends="core,generator"
|
|
||||||
description="Build library of matchers">
|
|
||||||
- <mkdir dir="build/temp/hamcrest-library/generated-code"/>
|
|
||||||
- <java-to-jar srcdir="hamcrest-library/src/main/java"
|
|
||||||
- destjar="build/hamcrest-library-${version}.jar"
|
|
||||||
- classpath="build/hamcrest-core-${version}.jar"/>
|
|
||||||
- <!-- Generate one class with all static imports -->
|
|
||||||
- <java classname="org.hamcrest.generator.config.XmlConfigurator"
|
|
||||||
- fork="yes"
|
|
||||||
- failonerror="yes"
|
|
||||||
- classpath="
|
|
||||||
- build/hamcrest-core-${version}.jar;
|
|
||||||
- build/hamcrest-generator-${version}.jar;
|
|
||||||
- build/hamcrest-library-${version}.jar;
|
|
||||||
- ">
|
|
||||||
- <arg value="matchers.xml"/>
|
|
||||||
- <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
|
|
||||||
- <arg value="org.hamcrest.Matchers"/>
|
|
||||||
- <arg value="build/temp/hamcrest-library/generated-code"/>
|
|
||||||
- </java>
|
|
||||||
- <!-- Append to library jar -->
|
|
||||||
- <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
|
|
||||||
- destjar="build/hamcrest-library-${version}.jar"
|
|
||||||
- classpath="build/hamcrest-core-${version}.jar"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="integration"
|
|
@ -1,231 +0,0 @@
|
|||||||
# Bazaar merge directive format 2 (Bazaar 0.90)
|
|
||||||
# revision_id: serkan@gentoo.org-20110131175810-2wn3gvabeesq0b3x
|
|
||||||
# target_branch: ../mainline
|
|
||||||
# testament_sha1: dd22e2db4f450dde1d4a5128da7833d50c34ab69
|
|
||||||
# timestamp: 2011-01-31 20:04:36 +0200
|
|
||||||
# base_revision_id: andrew@operationaldynamics.com-20101224023849-\
|
|
||||||
# u859g3kgg2y9ybx4
|
|
||||||
#
|
|
||||||
# Begin patch
|
|
||||||
=== modified file 'configure'
|
|
||||||
--- configure 2010-12-22 11:23:13 +0000
|
|
||||||
+++ configure 2011-01-31 17:58:10 +0000
|
|
||||||
@@ -787,7 +787,7 @@
|
|
||||||
"gtkspell");
|
|
||||||
|
|
||||||
check_system_library(@gnomedev_libs,
|
|
||||||
- "libnotify >= 0.4.5",
|
|
||||||
+ "libnotify >= 0.7.0",
|
|
||||||
"LibNotify",
|
|
||||||
"libnotify");
|
|
||||||
|
|
||||||
@@ -835,7 +835,7 @@
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
check_system_library(@gnomedev_libs,
|
|
||||||
- "libnotify >= 0.4.5",
|
|
||||||
+ "libnotify >= 0.7.0",
|
|
||||||
"LibNotify",
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
@@ -897,7 +897,7 @@
|
|
||||||
"libgtksourceview2.0-dev");
|
|
||||||
|
|
||||||
check_system_library(@gnomedev_libs,
|
|
||||||
- "libnotify >= 0.4.5",
|
|
||||||
+ "libnotify >= 0.7.0",
|
|
||||||
"LibNotify",
|
|
||||||
"libnotify-dev");
|
|
||||||
|
|
||||||
@@ -943,7 +943,7 @@
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
check_system_library(@gnomedev_libs,
|
|
||||||
- "libnotify >= 0.4.5",
|
|
||||||
+ "libnotify >= 0.7.0",
|
|
||||||
"LibNotify",
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
@@ -989,7 +989,7 @@
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
check_system_library(@gnomedev_libs,
|
|
||||||
- "libnotify >= 0.4.5",
|
|
||||||
+ "libnotify >= 0.7.0",
|
|
||||||
"LibNotify",
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
@@ -1050,7 +1050,7 @@
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
check_system_library(@gnomedev_libs,
|
|
||||||
- "libnotify >= 0.4.5",
|
|
||||||
+ "libnotify >= 0.7.0",
|
|
||||||
"LibNotify",
|
|
||||||
"FIXME");
|
|
||||||
|
|
||||||
|
|
||||||
=== modified file 'src/bindings/org/gnome/notify/Notification.java'
|
|
||||||
--- src/bindings/org/gnome/notify/Notification.java 2010-01-06 06:28:28 +0000
|
|
||||||
+++ src/bindings/org/gnome/notify/Notification.java 2011-01-31 17:58:10 +0000
|
|
||||||
@@ -71,8 +71,7 @@
|
|
||||||
* <p>
|
|
||||||
* The summary appears on the titlebar of notification and body appears as
|
|
||||||
* its text. Icon may be a string defining a theme icon or the filename
|
|
||||||
- * identifying the icon that appears next to text. Attach identifies the
|
|
||||||
- * widget that the notification relates to.
|
|
||||||
+ * identifying the icon that appears next to text.
|
|
||||||
*
|
|
||||||
* <p>
|
|
||||||
* Note that all but summary can be <code>null</code>.
|
|
||||||
@@ -80,19 +79,8 @@
|
|
||||||
* @since 4.0.12
|
|
||||||
*/
|
|
||||||
|
|
||||||
- public Notification(String summary, String body, String icon, Widget attach) {
|
|
||||||
- super(NotifyNotification.createNotification(summary, body, icon, attach));
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
- * Create a new notification attached to a {@link StatusIcon}. See
|
|
||||||
- * {@link #Notification(String,String,String,Widget) Notification()} for
|
|
||||||
- * other parameters.
|
|
||||||
- *
|
|
||||||
- * @since 4.0.12
|
|
||||||
- */
|
|
||||||
- public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
|
|
||||||
- super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
|
|
||||||
+ public Notification(String summary, String body, String icon) {
|
|
||||||
+ super(NotifyNotification.createNotification(summary, body, icon));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -109,34 +97,6 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
- * Attaches Notification to a Widget setting hints to its location.
|
|
||||||
- *
|
|
||||||
- * @since 4.0.12
|
|
||||||
- */
|
|
||||||
- public void attach(Widget attach) {
|
|
||||||
- NotifyNotification.attachToWidget(this, attach);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
- * Attaches Notification to a {@link StatusIcon} setting hints to its
|
|
||||||
- * location.
|
|
||||||
- *
|
|
||||||
- * @since 4.0.12
|
|
||||||
- */
|
|
||||||
- public void attach(StatusIcon statusIcon) {
|
|
||||||
- NotifyNotification.attachToStatusIcon(this, statusIcon);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
- * Sets the position of the notification to display on screen.
|
|
||||||
- *
|
|
||||||
- * @since 4.0.12
|
|
||||||
- */
|
|
||||||
- public void setGeometryHints(Screen screen, int x, int y) {
|
|
||||||
- NotifyNotification.setGeometryHints(this, screen, x, y);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
* Display the notification on screen.
|
|
||||||
*
|
|
||||||
* @since 4.0.12
|
|
||||||
|
|
||||||
=== modified file 'src/defs/NotifyNotification.defs'
|
|
||||||
--- src/defs/NotifyNotification.defs 2009-05-16 05:46:28 +0000
|
|
||||||
+++ src/defs/NotifyNotification.defs 2011-01-31 17:58:10 +0000
|
|
||||||
@@ -15,19 +15,6 @@
|
|
||||||
'("const-gchar*" "summary")
|
|
||||||
'("const-gchar*" "body" (null-ok))
|
|
||||||
'("const-gchar*" "icon" (null-ok))
|
|
||||||
- '("GtkWidget*" "attach" (null-ok))
|
|
||||||
- )
|
|
||||||
-)
|
|
||||||
-
|
|
||||||
-(define-function notify_notification_new_with_status_icon
|
|
||||||
- (is-constructor-of "NotifyNotification")
|
|
||||||
- (c-name "notify_notification_new_with_status_icon")
|
|
||||||
- (return-type "NotifyNotification*")
|
|
||||||
- (parameters
|
|
||||||
- '("const-gchar*" "summary")
|
|
||||||
- '("const-gchar*" "body" (null-ok))
|
|
||||||
- '("const-gchar*" "icon" (null-ok))
|
|
||||||
- '("GtkStatusIcon*" "status_icon")
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
@@ -42,35 +29,6 @@
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
-(define-method attach_to_widget
|
|
||||||
- (of-object "NotifyNotification")
|
|
||||||
- (c-name "notify_notification_attach_to_widget")
|
|
||||||
- (return-type "none")
|
|
||||||
- (parameters
|
|
||||||
- '("GtkWidget*" "attach")
|
|
||||||
- )
|
|
||||||
-)
|
|
||||||
-
|
|
||||||
-(define-method attach_to_status_icon
|
|
||||||
- (of-object "NotifyNotification")
|
|
||||||
- (c-name "notify_notification_attach_to_status_icon")
|
|
||||||
- (return-type "none")
|
|
||||||
- (parameters
|
|
||||||
- '("GtkStatusIcon*" "status_icon")
|
|
||||||
- )
|
|
||||||
-)
|
|
||||||
-
|
|
||||||
-(define-method set_geometry_hints
|
|
||||||
- (of-object "NotifyNotification")
|
|
||||||
- (c-name "notify_notification_set_geometry_hints")
|
|
||||||
- (return-type "none")
|
|
||||||
- (parameters
|
|
||||||
- '("GdkScreen*" "screen")
|
|
||||||
- '("gint" "x")
|
|
||||||
- '("gint" "y")
|
|
||||||
- )
|
|
||||||
-)
|
|
||||||
-
|
|
||||||
(define-method show
|
|
||||||
(of-object "NotifyNotification")
|
|
||||||
(c-name "notify_notification_show")
|
|
||||||
|
|
||||||
# Begin bundle
|
|
||||||
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQgyxQcAA4nfgGQwUH///3//
|
|
||||||
/3C////4YAbX3jt9D0BVPeHnM9ju2qPbPDJQ9Sm1PQnlT2KejJpqaj/VTeJNE09Rsnqj1NDT0PSQ
|
|
||||||
00waKYTJM0ZJk00mhoAAAGgAGgAaHDTTBDIaaZGTCAaaAMJo0yYAEDQYkI1JtGpiAxMmgBpo0AaN
|
|
||||||
AGmmgaAIpRomSbRNqmPVNH6mKPUZGTIaZD1MQNAAyGEkQQEwjQJiBNpGmQjymT1A00DQGQaUhcxG
|
|
||||||
ZHGCjAJ4K8Z2XsMDKmIDAeRljvwm1XFLy9VGBIe6dXM9es72qSm02uYSqri2Z4c5z2sUSaql6JYN
|
|
||||||
sQHmSFk9xiUAkUgkDk2QcRIyfUkVMp2ad7nCV1R1VQlamrTlBOZCsgE5jBCWRvL9B3anDWWAP6jc
|
|
||||||
GdjZ9vTQh7TY3xjefYhQOXKxZATTZg23g1XPwbWlZ1aLW7E767+2nKw771bgLAVQnnBQAVY5GkVj
|
|
||||||
Qirkxg0gdAIFp7VAxPhwHNvSS5Dm6RMC1gqO0Y3PoLII59n9a83SE2Cke9iUy2wGJdIt79dxtoxz
|
|
||||||
PNLtcUVKbEFlsyQw7Bx8BMCZ48HEzkc4BPkcFTFIPKGkcyYpFvGcuuMfVHMpWTRlLrJivHLkRVB/
|
|
||||||
YK8nMaifJq12nxw1ClqdF+LrBonk4Arhdt4KNJ7Skmcxt8IIW+iyvMChRTQiWcrWaPdr0VsWVTBX
|
|
||||||
zKjWiEoH9zJDCCs51pCCRCQAt9UenE9Vkk8UqQgm4xWEC82a/O9mDnQS/1kGDCCU6HuQ7a2GE5AH
|
|
||||||
MsYbLc1I03qa9zKSIpfJETAzlEMcAV/YGcugah4StijQ+u8hAFoqRjovMBsxRRwYyib7IhGZIbeX
|
|
||||||
yHPIC0BnPMdCOqYLYSrqNZBwgloadzGBxqDInq3mRLcZQcpNIUG3nssLwsZiFpWbOnyhXhSaaMSF
|
|
||||||
peMhjIwzMVoweswKzD3yJAtF1loZGEKKN48wwvbEseTsp0ZYUSxRnL/jYjXC2GRbdEzmFmSO3I0E
|
|
||||||
iuhOVFToUuQjERJCw0gpWlG8xSaQoAkumWv1MKC4QCsxjvLKzHGfyRc982ZqqDEFVdIio35xiokD
|
|
||||||
GklArZKanh8zTFuF+jcWGCFSZ/RTZyYKxdz6A+VMEMY6oLzVqLEaWpJkSBEeNcqZVFJvoJUpolOa
|
|
||||||
objYTtKM5XUXF4dwauWumi61RIIauBZYNO0cIuJsaGlEgESYuXNxgVfAG/sCikhOkGRqFOltYjQB
|
|
||||||
uygmVhGyq67f5W/PV+RssyRRoERCETaHh/eDQ29v8vunm+0qaQ//tfDE935+JQp/inNTzZIbsDZx
|
|
||||||
CWB29q1sdcvaIBwiFAs/xFUSbZt942vHQzcJ/D0a+vLG8A5iVsQ4YXRKy+Jtj7tnnI5qyIiJIhPh
|
|
||||||
9HAex426xtDpAzhjcA6bG8GkX231fHA2Oz0v947dcHL9/ga+x0r+IuTjhqhI31ZbqZN3uFgmLWOe
|
|
||||||
L4njaQwpZ0p9mvm3N6NBBmIzFRebYOTQfMnNRVs4N6gMIgvY3fn5QOQ3+sKxBGnixaOffp3TQT3Z
|
|
||||||
t0b294rnXq+powRoRtUCgx44hI4FPDluRSLEc8XJgZgMwlPFCsGgTgPkXKh3EcqH32Txbg0EKKfZ
|
|
||||||
QuMZ6GYaVy4uQ6TWcKjMeYIjZfJojxxcl0smWPDDS9VGk1YBWYZzpJzhkiHBNfMBtYIrpIBVJtvu
|
|
||||||
SQ1cZgiyo28Uk4BOkYgCr6WigyRL0nR2HHqY0cnB7H5r6g34oU1/y7lnUGXS2JUQKBKSMkLeGcH7
|
|
||||||
O47QPkJeAfO9eLLaC8/V0OyDlMWfSCc0PZh3INiB9Ota0es9qUH89uYIVMeFuhCcwXLksdPRqz7N
|
|
||||||
NZiIWBhN9a7eJTHR0kajgkImFtjMBJpAnJrq9ucCEmFoQIKAVBpZd4uTmjLdSWHusMPMln3EFUFt
|
|
||||||
2ZtBFE7SrAjSHPTPQrtegG2cJC3TDY1JkorWEoq28Hik0hKIqPp12gM7fbbgkilhanDr8lolsPZt
|
|
||||||
zGh+YCoYYEckzWLLhSM866RbA1uOTj6HhIIUgg0GhIv52TCtIBVKkT54T+FAKrTTvPR1dk7NzMp0
|
|
||||||
JPyMjPcGyrPUIwOsgHpRYJV9li8YJKIQ2y1WT6pFEG/JpDHCyUzBGFuyWJxWPEHUPVc6wbLQqX8i
|
|
||||||
xYIrMLFqUESYkxv/zoCYKxdvBm4IOLgbOeGD6UwAuBCm+vNAJhgsJC0yFwrDbqZqoHxy8NV6dsKc
|
|
||||||
92WlKOUzHsQx3KddeHf6L7VSCyKFpS8WRuQ3EFRBBuZdPWE4VI2/fERpFA1szpyxDniHW/nmhzYe
|
|
||||||
FSKBdAits/xdyRThQkAgyxQc
|
|
@ -1,154 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Any modifications will be overwritten. -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Generated by Maven Ant Plugin on 5/29/13 1:21 PM -->
|
|
||||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<project name="javax.inject-from-maven" default="package" basedir=".">
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Build environment properties -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<property file="${user.home}/.m2/maven.properties"/>
|
|
||||||
<property file="maven-build.properties"/>
|
|
||||||
|
|
||||||
<property name="maven.build.finalName" value="javax.inject-1"/>
|
|
||||||
<property name="maven.build.dir" value="target"/>
|
|
||||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
|
||||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
|
||||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
|
||||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
|
||||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
|
||||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
|
||||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
|
||||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
|
||||||
|
|
||||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
|
||||||
<property name="maven.settings.offline" value="false"/>
|
|
||||||
<property name="maven.settings.interactiveMode" value="true"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Defining classpaths -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<path id="build.classpath"/>
|
|
||||||
<path id="build.test.classpath"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Cleaning up target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="clean" description="Clean the output directory">
|
|
||||||
<delete dir="${maven.build.dir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile" depends="get-deps" description="Compile the code">
|
|
||||||
<mkdir dir="${maven.build.outputDir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Test-compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile-tests"
|
|
||||||
depends="compile"
|
|
||||||
description="Compile the test code"
|
|
||||||
unless="maven.test.skip">
|
|
||||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Run all tests -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test"
|
|
||||||
depends="compile-tests, junit-missing"
|
|
||||||
unless="junit.skipped"
|
|
||||||
description="Run the test cases"/>
|
|
||||||
|
|
||||||
<target name="test-junit-present">
|
|
||||||
<available classname="junit.framework.Test" property="junit.present"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-status"
|
|
||||||
depends="test-junit-present">
|
|
||||||
<condition property="junit.missing">
|
|
||||||
<and>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<isfalse value="${maven.test.skip}"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<condition property="junit.skipped">
|
|
||||||
<or>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<istrue value="${maven.test.skip}"/>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="junit-missing"
|
|
||||||
depends="test-junit-status"
|
|
||||||
if="junit.missing">
|
|
||||||
<echo>=================================== WARNING ===================================</echo>
|
|
||||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>===============================================================================</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Javadoc target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="javadoc" description="Generates the Javadoc of the application"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Package target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="package" depends="compile,test" description="Package the application">
|
|
||||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
|
||||||
compress="true"
|
|
||||||
index="false"
|
|
||||||
basedir="${maven.build.outputDir}"
|
|
||||||
excludes="**/package.html"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- A dummy target for the package named after the type it creates -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Download dependencies target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test-offline">
|
|
||||||
<condition property="maven.mode.offline">
|
|
||||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="get-deps"
|
|
||||||
depends="test-offline"
|
|
||||||
description="Download all dependencies"
|
|
||||||
unless="maven.mode.offline">
|
|
||||||
<mkdir dir="${maven.repo.local}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
@ -1,36 +0,0 @@
|
|||||||
--- ws-jaxme-0.3.1/buildjm.xml.orig 2006-07-30 18:46:21.000000000 +0200
|
|
||||||
+++ ws-jaxme-0.3.1/buildjm.xml 2006-07-30 19:04:24.000000000 +0200
|
|
||||||
@@ -54,6 +54,7 @@
|
|
||||||
<pathelement location="${preqs}/ant.jar"/>
|
|
||||||
<pathelement location="${preqs}/xml-apis.jar"/>
|
|
||||||
<pathelement location="${preqs}/xercesImpl.jar"/>
|
|
||||||
+ <pathelement location="${preqs}/gnu-crypto.jar"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<path id="jaxme.runtime.path">
|
|
||||||
--- ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java.orig 2006-07-30 18:49:11.000000000 +0200
|
|
||||||
+++ ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java 2006-07-30 19:02:54.000000000 +0200
|
|
||||||
@@ -18,8 +18,7 @@
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
-import sun.misc.BASE64Decoder;
|
|
||||||
-import sun.misc.BASE64Encoder;
|
|
||||||
+import gnu.crypto.util.Base64;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -33,11 +32,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
public static byte[] decode(String pValue) throws IOException {
|
|
||||||
- return (new BASE64Decoder()).decodeBuffer(pValue);
|
|
||||||
+ return Base64.decode(pValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String encode(byte[] pValue) {
|
|
||||||
- return (new BASE64Encoder()).encode(pValue);
|
|
||||||
+ return Base64.encode(pValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
|
@ -1,41 +0,0 @@
|
|||||||
diff -ru ws-jaxme-0.3.1/build.xml ws-jaxme-0.3.1-patched/build.xml
|
|
||||||
--- ws-jaxme-0.3.1/build.xml 2004-09-02 18:41:58.000000000 -0400
|
|
||||||
+++ ws-jaxme-0.3.1-patched/build.xml 2005-06-26 22:59:39.000000000 -0400
|
|
||||||
@@ -157,9 +157,8 @@
|
|
||||||
<target name="doc" depends="javadoc,docbook.html,forrest,replace"
|
|
||||||
description="Generates the documentation"/>
|
|
||||||
|
|
||||||
- <target name="javadoc" depends="init,all"
|
|
||||||
+ <target name="javadoc" depends="init"
|
|
||||||
description="Generates the API documentation">
|
|
||||||
- <delete dir="${build.apidocs}"/>
|
|
||||||
<mkdir dir="${build.apidocs}"/>
|
|
||||||
<javadoc
|
|
||||||
access="protected"
|
|
||||||
@@ -189,8 +188,8 @@
|
|
||||||
<pathelement location="${src.js}"/>
|
|
||||||
<pathelement location="${src.jm}"/>
|
|
||||||
<pathelement location="${src.pm}"/>
|
|
||||||
- <pathelement location="${build.js.src}"/>
|
|
||||||
- <pathelement location="${build.jm.src}"/>
|
|
||||||
+ <!--pathelement location="${build.js.src}"/>
|
|
||||||
+ <pathelement location="${build.jm.src}"/-->
|
|
||||||
</sourcepath>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
@@ -245,6 +244,15 @@
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
+ <target name="jar">
|
|
||||||
+
|
|
||||||
+ <ant antfile="buildapi.xml" target="jar" inheritall="false" inheritrefs="false"/>
|
|
||||||
+ <ant antfile="buildxs.xml" target="jar" inheritall="false" inheritrefs="false"/>
|
|
||||||
+ <ant antfile="buildjs.xml" target="jar" inheritall="false" inheritrefs="false"/>
|
|
||||||
+ <ant antfile="buildjm.xml" target="compile" inheritall="false" inheritrefs="false"/>
|
|
||||||
+ <ant antfile="buildpm.xml" target="compile" inheritall="false" inheritrefs="false"/>
|
|
||||||
+ </target>
|
|
||||||
+
|
|
||||||
<target name="all">
|
|
||||||
<ant antfile="buildapi.xml" target="all" inheritall="false" inheritrefs="false"/>
|
|
||||||
<ant antfile="buildxs.xml" target="all" inheritall="false" inheritrefs="false"/>
|
|
@ -1,224 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Any modifications will be overwritten. -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Generated by Maven Ant Plugin on 5/8/14 3:59 PM -->
|
|
||||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<project name="jboss-logging-from-maven" default="package" basedir=".">
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Build environment properties -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<property file="${user.home}/.m2/maven.properties"/>
|
|
||||||
<property file="maven-build.properties"/>
|
|
||||||
|
|
||||||
<property name="maven.build.finalName" value="jboss-logging-3.1.3.GA"/>
|
|
||||||
<property name="maven.build.dir" value="target"/>
|
|
||||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
|
||||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
|
||||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
|
||||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
|
||||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
|
||||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
|
||||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
|
||||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
|
||||||
|
|
||||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
|
||||||
<property name="maven.settings.offline" value="false"/>
|
|
||||||
<property name="maven.settings.interactiveMode" value="true"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Defining classpaths -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<path id="build.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
|
|
||||||
</path>
|
|
||||||
<path id="build.test.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Cleaning up target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="clean" description="Clean the output directory">
|
|
||||||
<delete dir="${maven.build.dir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile" depends="get-deps" description="Compile the code">
|
|
||||||
<mkdir dir="${maven.build.outputDir}"/>
|
|
||||||
<javac destdir="${maven.build.outputDir}"
|
|
||||||
nowarn="true"
|
|
||||||
debug="true"
|
|
||||||
optimize="false"
|
|
||||||
deprecation="true"
|
|
||||||
target="1.1"
|
|
||||||
verbose="false"
|
|
||||||
fork="false"
|
|
||||||
source="1.3">
|
|
||||||
<src>
|
|
||||||
<pathelement location="${maven.build.srcDir.0}"/>
|
|
||||||
</src>
|
|
||||||
<classpath refid="build.classpath"/>
|
|
||||||
</javac>
|
|
||||||
<copy todir="${maven.build.outputDir}">
|
|
||||||
<fileset dir="${maven.build.resourceDir.0}"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Test-compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile-tests"
|
|
||||||
depends="compile"
|
|
||||||
description="Compile the test code"
|
|
||||||
unless="maven.test.skip">
|
|
||||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Run all tests -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test"
|
|
||||||
depends="compile-tests, junit-missing"
|
|
||||||
unless="junit.skipped"
|
|
||||||
description="Run the test cases"/>
|
|
||||||
|
|
||||||
<target name="test-junit-present">
|
|
||||||
<available classname="junit.framework.Test" property="junit.present"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-status"
|
|
||||||
depends="test-junit-present">
|
|
||||||
<condition property="junit.missing">
|
|
||||||
<and>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<isfalse value="${maven.test.skip}"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<condition property="junit.skipped">
|
|
||||||
<or>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<istrue value="${maven.test.skip}"/>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="junit-missing"
|
|
||||||
depends="test-junit-status"
|
|
||||||
if="junit.missing">
|
|
||||||
<echo>=================================== WARNING ===================================</echo>
|
|
||||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>===============================================================================</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Javadoc target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
|
||||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
|
||||||
packagenames="*"
|
|
||||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
|
||||||
access="protected"
|
|
||||||
old="false"
|
|
||||||
verbose="false"
|
|
||||||
version="true"
|
|
||||||
use="true"
|
|
||||||
author="true"
|
|
||||||
splitindex="false"
|
|
||||||
nodeprecated="false"
|
|
||||||
nodeprecatedlist="false"
|
|
||||||
notree="false"
|
|
||||||
noindex="false"
|
|
||||||
nohelp="false"
|
|
||||||
nonavbar="false"
|
|
||||||
serialwarn="false"
|
|
||||||
charset="ISO-8859-1"
|
|
||||||
linksource="false"
|
|
||||||
breakiterator="false">
|
|
||||||
<doctitle><![CDATA[JBoss Logging 3.1.3.GA]]></doctitle>
|
|
||||||
<header><![CDATA[JBoss Logging 3.1.3.GA]]></header>
|
|
||||||
<footer><![CDATA[JBoss Logging 3.1.3.GA]]></footer>
|
|
||||||
<bottom><![CDATA[<i>Copyright &#169; 2012 Red Hat, Inc.</i>]]></bottom>
|
|
||||||
<link href="http://java.sun.com/javase/6/docs/api/"/>
|
|
||||||
<doclet name="net.gleamynode.apiviz.APIviz"
|
|
||||||
path="${maven.repo.local}/org/jboss/apiviz/apiviz/1.2.5.GA/apiviz-1.2.5.GA.jar"/>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Package target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="package" depends="compile,test" description="Package the application">
|
|
||||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
|
||||||
compress="true"
|
|
||||||
index="true"
|
|
||||||
basedir="${maven.build.outputDir}"
|
|
||||||
excludes="**/package.html">
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- A dummy target for the package named after the type it creates -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Download dependencies target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test-offline">
|
|
||||||
<condition property="maven.mode.offline">
|
|
||||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="get-deps"
|
|
||||||
depends="test-offline"
|
|
||||||
description="Download all dependencies"
|
|
||||||
unless="maven.mode.offline">
|
|
||||||
<mkdir dir="${maven.repo.local}"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"
|
|
||||||
dest="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/log4j/log4j/1.2.16"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar"
|
|
||||||
dest="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"
|
|
||||||
dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
@ -1,40 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<project name="Gentoo_Builder" default="jar" basedir=".">
|
|
||||||
<property name="src" value="src/java"/>
|
|
||||||
<property name="build" value="build"/>
|
|
||||||
<property name="dist" value="dist"/>
|
|
||||||
<property name="pkg" value="${package.name}"/>
|
|
||||||
<property name="jar" value="${project.name}.jar"/>
|
|
||||||
<property file="build.properties"/>
|
|
||||||
<target name="init">
|
|
||||||
<tstamp/>
|
|
||||||
<mkdir dir="${build}"/>
|
|
||||||
<mkdir dir="${dist}"/>
|
|
||||||
<mkdir dir="${dist}/doc"/>
|
|
||||||
</target>
|
|
||||||
<target name="compile" depends="init">
|
|
||||||
<javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
|
|
||||||
</target>
|
|
||||||
<target name="manifest" depends="init">
|
|
||||||
<manifest file="${build}/MANIFEST.MF" mode="update">
|
|
||||||
<attribute name="Built-By" value="Gentoo Portage"/>
|
|
||||||
</manifest>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile,manifest">
|
|
||||||
<jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
|
|
||||||
<fileset dir="${build}"/>
|
|
||||||
<fileset dir="${src}">
|
|
||||||
<include name="**/*.vm"/>
|
|
||||||
</fileset>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
<target name="javadoc" depends="compile">
|
|
||||||
<javadoc destdir="${dist}/doc/api">
|
|
||||||
<fileset dir="${src}"/>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
<target name="clean">
|
|
||||||
<delete dir="${build}"/>
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,40 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<project name="Gentoo_Builder" default="jar" basedir=".">
|
|
||||||
<property name="src" value="src/java"/>
|
|
||||||
<property name="build" value="build"/>
|
|
||||||
<property name="dist" value="dist"/>
|
|
||||||
<property name="pkg" value="${package.name}"/>
|
|
||||||
<property name="jar" value="${project.name}.jar"/>
|
|
||||||
<property file="build.properties"/>
|
|
||||||
<target name="init">
|
|
||||||
<tstamp/>
|
|
||||||
<mkdir dir="${build}"/>
|
|
||||||
<mkdir dir="${dist}"/>
|
|
||||||
<mkdir dir="${dist}/doc"/>
|
|
||||||
</target>
|
|
||||||
<target name="compile" depends="init">
|
|
||||||
<javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
|
|
||||||
</target>
|
|
||||||
<target name="manifest" depends="init">
|
|
||||||
<manifest file="${build}/MANIFEST.MF" mode="update">
|
|
||||||
<attribute name="Built-By" value="Gentoo Portage"/>
|
|
||||||
</manifest>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile,manifest">
|
|
||||||
<jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
|
|
||||||
<fileset dir="${build}"/>
|
|
||||||
<fileset dir="${src}">
|
|
||||||
<include name="**/*.vm"/>
|
|
||||||
</fileset>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
<target name="javadoc" depends="compile">
|
|
||||||
<javadoc destdir="${dist}/doc/api">
|
|
||||||
<fileset dir="${src}"/>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
<target name="clean">
|
|
||||||
<delete dir="${build}"/>
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,38 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<project name="Gentoo_Builder" default="jar" basedir=".">
|
|
||||||
<property name="src" value="src/java"/>
|
|
||||||
<property name="build" value="build"/>
|
|
||||||
<property name="dist" value="dist"/>
|
|
||||||
<property name="pkg" value="${package.name}"/>
|
|
||||||
<property name="jar" value="${project.name}.jar"/>
|
|
||||||
<property file="build.properties"/>
|
|
||||||
<target name="init">
|
|
||||||
<tstamp/>
|
|
||||||
<mkdir dir="${build}"/>
|
|
||||||
<mkdir dir="${dist}"/>
|
|
||||||
<mkdir dir="${dist}/doc"/>
|
|
||||||
</target>
|
|
||||||
<target name="compile" depends="init">
|
|
||||||
<javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
|
|
||||||
</target>
|
|
||||||
<target name="manifest" depends="init">
|
|
||||||
<manifest file="${build}/MANIFEST.MF" mode="update">
|
|
||||||
<attribute name="Built-By" value="Gentoo Portage"/>
|
|
||||||
</manifest>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile,manifest">
|
|
||||||
<jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
|
|
||||||
<fileset dir="${build}"/>
|
|
||||||
<fileset dir="${src}">
|
|
||||||
<include name="**/*.vm"/>
|
|
||||||
</fileset>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
<target name="javadoc" depends="compile">
|
|
||||||
<javadoc destdir="${dist}/doc/api" sourcepath="${src}" />
|
|
||||||
</target>
|
|
||||||
<target name="clean">
|
|
||||||
<delete dir="${build}"/>
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,14 +0,0 @@
|
|||||||
diff --git a/jni/GNUmakefile b/jni/GNUmakefile
|
|
||||||
index 7a027af..eaba319 100755
|
|
||||||
--- a/jni/GNUmakefile
|
|
||||||
+++ b/jni/GNUmakefile
|
|
||||||
@@ -188,9 +188,6 @@ endif
|
|
||||||
|
|
||||||
ifeq ($(CPU), i386)
|
|
||||||
MODEL = 32
|
|
||||||
- ifeq ($(findstring $(OS), openbsd darwin mingw32 win32),)
|
|
||||||
- CFLAGS += -march=i586 -mtune=generic
|
|
||||||
- endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CPU), amd64)
|
|
@ -1,82 +0,0 @@
|
|||||||
--- jni/GNUmakefile 2010-03-12 12:06:39.000000000 +1300
|
|
||||||
+++ jni/GNUmakefile 2010-03-12 12:13:44.000000000 +1300
|
|
||||||
@@ -65,7 +65,7 @@
|
|
||||||
|
|
||||||
# MacOS headers aren't completely warning free, so turn them off
|
|
||||||
ifneq ($(OS),darwin)
|
|
||||||
- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
|
|
||||||
+ WFLAGS = -W -Wall -Wno-unused -Wno-parentheses -Wundef
|
|
||||||
endif
|
|
||||||
PICFLAGS = -fPIC
|
|
||||||
SOFLAGS = # Filled in for each OS specifically
|
|
||||||
@@ -78,9 +78,9 @@
|
|
||||||
|
|
||||||
JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
|
|
||||||
IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
|
|
||||||
-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
|
|
||||||
+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
|
|
||||||
CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
|
|
||||||
-CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
|
|
||||||
+CXXFLAGS += $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
|
|
||||||
|
|
||||||
ifeq ($(OS), win64)
|
|
||||||
override CPU = x86_64
|
|
||||||
@@ -258,58 +258,6 @@
|
|
||||||
@mkdir -p $(@D)
|
|
||||||
$(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
-
|
|
||||||
-ifeq ($(OS), darwin)
|
|
||||||
-build_ffi = \
|
|
||||||
- mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
|
|
||||||
- (if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
|
|
||||||
- echo "Configuring libffi for $(1)"; \
|
|
||||||
- cd $(BUILD_DIR)/libffi-darwin-$(1) && \
|
|
||||||
- env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
|
|
||||||
- $(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
|
|
||||||
- fi); \
|
|
||||||
- env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
|
|
||||||
-
|
|
||||||
-$(LIBFFI):
|
|
||||||
- @mkdir -p $(@D)
|
|
||||||
- @for arch in $(ARCHES); do $(call build_ffi,$$arch);done
|
|
||||||
-
|
|
||||||
- # Assemble into a FAT (i386, x86_64, ppc) library
|
|
||||||
- @mkdir -p $(BUILD_DIR)/libffi/.libs
|
|
||||||
- @env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
|
|
||||||
- $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
|
|
||||||
- @mkdir -p $(LIBFFI_BUILD_DIR)/include
|
|
||||||
- $(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
|
|
||||||
- @( \
|
|
||||||
- printf "#if defined(__i386__)\n"; \
|
|
||||||
- printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
|
|
||||||
- printf "#elif defined(__x86_64__)\n"; \
|
|
||||||
- printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
|
|
||||||
- printf "#elif defined(__ppc__)\n"; \
|
|
||||||
- printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
|
|
||||||
- printf "#endif\n";\
|
|
||||||
- ) > $(LIBFFI_BUILD_DIR)/include/ffi.h
|
|
||||||
- @( \
|
|
||||||
- printf "#if defined(__i386__)\n"; \
|
|
||||||
- printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
|
|
||||||
- printf "#elif defined(__x86_64__)\n"; \
|
|
||||||
- printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
|
|
||||||
- printf "#elif defined(__ppc__)\n"; \
|
|
||||||
- printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
|
|
||||||
- printf "#endif\n";\
|
|
||||||
- ) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
|
|
||||||
-else
|
|
||||||
-$(LIBFFI):
|
|
||||||
- @mkdir -p $(LIBFFI_BUILD_DIR)
|
|
||||||
- @if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
|
|
||||||
- echo "Configuring libffi for $(PLATFORM)"; \
|
|
||||||
- cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
|
|
||||||
- $(LIBFFI_CONFIGURE) > /dev/null; \
|
|
||||||
- fi
|
|
||||||
- $(MAKE) -C $(LIBFFI_BUILD_DIR)
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
-
|
|
||||||
clean::
|
|
||||||
# nothing to do - ant will delete the build dir
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/jni/GNUmakefile b/jni/GNUmakefile
|
|
||||||
index efe6230..25053c7 100755
|
|
||||||
--- a/jni/GNUmakefile
|
|
||||||
+++ b/jni/GNUmakefile
|
|
||||||
@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
|
|
||||||
OFLAGS = -O2 $(JFLAGS)
|
|
||||||
|
|
||||||
# MacOS headers aren't completely warning free, so turn them off
|
|
||||||
-WERROR = -Werror
|
|
||||||
+WERROR =
|
|
||||||
ifneq ($(OS),darwin)
|
|
||||||
WFLAGS += -Wundef $(WERROR)
|
|
||||||
endif
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/jni/GNUmakefile b/jni/GNUmakefile
|
|
||||||
index efe6230..25053c7 100755
|
|
||||||
--- a/jni/GNUmakefile
|
|
||||||
+++ b/jni/GNUmakefile
|
|
||||||
@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
|
|
||||||
OFLAGS = -O2 $(JFLAGS)
|
|
||||||
|
|
||||||
# MacOS headers aren't completely warning free, so turn them off
|
|
||||||
-WERROR = -Werror
|
|
||||||
+WERROR =
|
|
||||||
ifneq ($(OS),darwin)
|
|
||||||
WFLAGS += -Wundef $(WERROR)
|
|
||||||
endif
|
|
@ -1,14 +0,0 @@
|
|||||||
--- a/src/test/java/com/kenai/jffi/NumberTest.java
|
|
||||||
+++ b/src/test/java/com/kenai/jffi/NumberTest.java
|
|
||||||
@@ -234,9 +234,8 @@
|
|
||||||
private void returnF32(InvokerType type) {
|
|
||||||
LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
|
|
||||||
float[] values = { 0f, 1.0f, -2.0f };
|
|
||||||
- for (int i = 0; i < values.length; ++i) {
|
|
||||||
- assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f);
|
|
||||||
- }
|
|
||||||
+ float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) };
|
|
||||||
+ assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test public void returnDefaultF64() {
|
|
@ -1,62 +0,0 @@
|
|||||||
diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
|
|
||||||
index 27737be..2e709d9 100755
|
|
||||||
--- a/jffi-1.2.7/jni/GNUmakefile
|
|
||||||
+++ b/jffi-1.2.7/jni/GNUmakefile
|
|
||||||
@@ -47,7 +47,6 @@ else
|
|
||||||
LIBFFI_SRC_DIR = $(SRC_DIR)/libffi
|
|
||||||
LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(PLATFORM)
|
|
||||||
LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.a
|
|
||||||
- LIBFFI_LIBS = $(LIBFFI)
|
|
||||||
LIBFFI_CFLAGS = -I"$(LIBFFI_BUILD_DIR)"/include
|
|
||||||
endif
|
|
||||||
|
|
||||||
@@ -64,11 +63,11 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
|
|
||||||
OFLAGS = -O2 $(JFLAGS)
|
|
||||||
|
|
||||||
# MacOS headers aren't completely warning free, so turn them off
|
|
||||||
-WERROR = -Werror
|
|
||||||
+WERROR =
|
|
||||||
ifneq ($(OS),darwin)
|
|
||||||
WFLAGS += -Wundef $(WERROR)
|
|
||||||
endif
|
|
||||||
-WFLAGS += -W -Wall -Wno-unused -Wno-parentheses
|
|
||||||
+WFLAGS += -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
|
|
||||||
PICFLAGS = -fPIC
|
|
||||||
SOFLAGS = # Filled in for each OS specifically
|
|
||||||
FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
|
|
||||||
@@ -279,7 +278,7 @@ debug:
|
|
||||||
@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
|
|
||||||
@echo "OBJS=$(OBJS)"
|
|
||||||
|
|
||||||
-$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
|
|
||||||
+$(LIBJFFI): $(OBJS)
|
|
||||||
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
|
|
||||||
$(STRIP) $@
|
|
||||||
|
|
||||||
@@ -291,7 +290,7 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
|
|
||||||
@mkdir -p $(@D)
|
|
||||||
@$(CC) $(CFLAGS) -o $@ -c $<
|
|
||||||
|
|
||||||
-$(OBJS) : $(LIBFFI_LIBS)
|
|
||||||
+$(OBJS) :
|
|
||||||
|
|
||||||
ifeq ($(OS), darwin)
|
|
||||||
build_ffi = \
|
|
||||||
diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
|
|
||||||
index 9e70664..3e279a3 100644
|
|
||||||
--- a/jffi-1.2.7/libtest/GNUmakefile
|
|
||||||
+++ b/jffi-1.2.7/libtest/GNUmakefile
|
|
||||||
@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
|
|
||||||
# Compiler/linker flags from:
|
|
||||||
# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
|
|
||||||
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
|
|
||||||
-OFLAGS = -O2 $(JFLAGS)
|
|
||||||
-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
|
|
||||||
+OFLAGS = $(JFLAGS)
|
|
||||||
+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
|
|
||||||
PICFLAGS = -fPIC
|
|
||||||
-SOFLAGS = -shared -Wl,-O1
|
|
||||||
+SOFLAGS = -shared
|
|
||||||
LDFLAGS += $(SOFLAGS)
|
|
||||||
|
|
||||||
IFLAGS = -I"$(BUILD_DIR)"
|
|
@ -1,31 +0,0 @@
|
|||||||
diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
|
|
||||||
index 27737be..98f147e 100755
|
|
||||||
--- a/jffi-1.2.7/jni/GNUmakefile
|
|
||||||
+++ b/jffi-1.2.7/jni/GNUmakefile
|
|
||||||
@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
|
|
||||||
OFLAGS = -O2 $(JFLAGS)
|
|
||||||
|
|
||||||
# MacOS headers aren't completely warning free, so turn them off
|
|
||||||
-WERROR = -Werror
|
|
||||||
+WERROR =
|
|
||||||
ifneq ($(OS),darwin)
|
|
||||||
WFLAGS += -Wundef $(WERROR)
|
|
||||||
endif
|
|
||||||
diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
|
|
||||||
index 9e70664..72e4cc9 100644
|
|
||||||
--- a/jffi-1.2.7/libtest/GNUmakefile
|
|
||||||
+++ b/jffi-1.2.7/libtest/GNUmakefile
|
|
||||||
@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
|
|
||||||
# Compiler/linker flags from:
|
|
||||||
# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
|
|
||||||
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
|
|
||||||
-OFLAGS = -O2 $(JFLAGS)
|
|
||||||
-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
|
|
||||||
+OFLAGS = $(JFLAGS)
|
|
||||||
+WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
|
|
||||||
PICFLAGS = -fPIC
|
|
||||||
-SOFLAGS = -shared -Wl,-O1
|
|
||||||
+SOFLAGS = -shared
|
|
||||||
LDFLAGS += $(SOFLAGS)
|
|
||||||
|
|
||||||
IFLAGS = -I"$(BUILD_DIR)"
|
|
@ -1,55 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!---
|
|
||||||
@author: Saleem Abdulrasool <compnerd@gentoo.org>
|
|
||||||
@date: 5/9/2005
|
|
||||||
@revision: 1.0_alpha
|
|
||||||
|
|
||||||
@notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
|
|
||||||
-->
|
|
||||||
|
|
||||||
<project name="Gentoo_Builder" default="jar" basedir=".">
|
|
||||||
<property name="src" value="src"/>
|
|
||||||
<property name="build" value="build"/>
|
|
||||||
<property name="dist" value="dist"/>
|
|
||||||
|
|
||||||
<property name="pkg" value="${package.name}"/>
|
|
||||||
<property name="jar" value="${project.name}.jar"/>
|
|
||||||
|
|
||||||
<!-- Override any defined properties -->
|
|
||||||
<property file="build.properties"/>
|
|
||||||
|
|
||||||
<target name="init">
|
|
||||||
<tstamp/>
|
|
||||||
<mkdir dir="${build}"/>
|
|
||||||
<mkdir dir="${dist}"/>
|
|
||||||
<mkdir dir="${dist}/doc"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile" depends="init">
|
|
||||||
<javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="manifest" depends="init">
|
|
||||||
<manifest file="${build}/MANIFEST.MF" mode="update">
|
|
||||||
<attribute name="Built-By" value="Gentoo Portage"/>
|
|
||||||
</manifest>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="jar" depends="compile,manifest">
|
|
||||||
<jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
|
|
||||||
<fileset dir="${build}"/>
|
|
||||||
<fileset dir="." includes="svfl.txt"/>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="javadoc" depends="compile">
|
|
||||||
<javadoc destdir="${dist}/doc/api">
|
|
||||||
<fileset dir="${src}"/>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="clean">
|
|
||||||
<delete dir="${build}"/>
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,30 +0,0 @@
|
|||||||
diff --git a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
|
|
||||||
index 6dbc020..0dce41c 100644
|
|
||||||
--- a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
|
|
||||||
+++ b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
|
|
||||||
@@ -110,21 +110,21 @@ public class DeterministicScheduler implements ScheduledExecutorService {
|
|
||||||
throw blockingOperationsNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
- public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks) throws InterruptedException {
|
|
||||||
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
|
|
||||||
throw blockingOperationsNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
- public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
|
|
||||||
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
|
|
||||||
throw blockingOperationsNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
- public <T> T invokeAny(Collection<Callable<T>> tasks)
|
|
||||||
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
|
|
||||||
throws InterruptedException, ExecutionException
|
|
||||||
{
|
|
||||||
throw blockingOperationsNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
- public <T> T invokeAny(Collection<Callable<T>> tasks, long timeout, TimeUnit unit)
|
|
||||||
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
|
|
||||||
throws InterruptedException, ExecutionException, TimeoutException
|
|
||||||
{
|
|
||||||
throw blockingOperationsNotSupported();
|
|
@ -1,62 +0,0 @@
|
|||||||
diff --git a/native/Makefile b/native/Makefile
|
|
||||||
index 75246a8..a1c3e66 100644
|
|
||||||
--- a/native/Makefile
|
|
||||||
+++ b/native/Makefile
|
|
||||||
@@ -70,7 +70,7 @@ LIBPFX=lib
|
|
||||||
LIBSFX=.so
|
|
||||||
ARSFX=.a
|
|
||||||
JNISFX=$(LIBSFX)
|
|
||||||
-CC=gcc
|
|
||||||
+CC?=gcc
|
|
||||||
LD=$(CC)
|
|
||||||
LIBS=
|
|
||||||
# Default to Sun recommendations for JNI compilation
|
|
||||||
@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
|
|
||||||
COUT=-o $@
|
|
||||||
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
|
|
||||||
CDEFINES=-D_REENTRANT
|
|
||||||
-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
|
|
||||||
-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
|
||||||
+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
|
|
||||||
+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
|
||||||
-DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
|
|
||||||
-LDFLAGS=-o $@ -shared
|
|
||||||
+LDFLAGS+=-o $@ -shared
|
|
||||||
ifeq ($(DYNAMIC_LIBFFI),true)
|
|
||||||
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
|
|
||||||
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
|
|
||||||
@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
|
|
||||||
CDEFINES=-DPSAPI_VERSION=1
|
|
||||||
CC = $(MINGW) -m64 -mno-cygwin
|
|
||||||
LD = $(CC)
|
|
||||||
-LDFLAGS=-o $@ -shared
|
|
||||||
+LDFLAGS+=-o $@ -shared
|
|
||||||
LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt
|
|
||||||
FFI_CONFIG += --host=x86_64-pc-mingw32
|
|
||||||
else
|
|
||||||
@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
|
|
||||||
ARCH=$(shell uname -m | sed 's/i.86/i386/g')
|
|
||||||
PCFLAGS+=-fPIC
|
|
||||||
CDEFINES+=-DHAVE_PROTECTION
|
|
||||||
-LDFLAGS+=-Wl,-soname,$@
|
|
||||||
+LDFLAGS+= -Wl,-soname,$(shell basename $@)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (,$(findstring bsd,$(OS)))
|
|
||||||
ARCH=$(shell uname -m | sed 's/i.86/i386/g')
|
|
||||||
PCFLAGS+=-fPIC
|
|
||||||
CINCLUDES+=-I/usr/X11R6/include
|
|
||||||
-LDFLAGS=-o $@ -shared
|
|
||||||
+LDFLAGS+= -o $@ -shared
|
|
||||||
CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
|
|
||||||
endif
|
|
||||||
|
|
||||||
@@ -239,7 +239,7 @@ endif
|
|
||||||
|
|
||||||
PCFLAGS+=$(ISYSROOT) -x objective-c
|
|
||||||
CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
|
|
||||||
-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
|
|
||||||
+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
|
|
||||||
-compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
|
|
||||||
-current_version $(JNA_JNI_VERSION) \
|
|
||||||
-mmacosx-version-min=10.3 \
|
|
@ -1,321 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Any modifications will be overwritten. -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Generated by Maven Ant Plugin on 6/6/13 12:11 PM -->
|
|
||||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<project name="jnr-unixsocket-from-maven" default="package" basedir=".">
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Build environment properties -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<property file="${user.home}/.m2/maven.properties"/>
|
|
||||||
<property file="maven-build.properties"/>
|
|
||||||
|
|
||||||
<property name="maven.build.finalName" value="jnr-unixsocket-0.3"/>
|
|
||||||
<property name="maven.build.dir" value="target"/>
|
|
||||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
|
||||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
|
||||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
|
||||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
|
||||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
|
||||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
|
||||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
|
||||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
|
||||||
|
|
||||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
|
||||||
<property name="maven.settings.offline" value="false"/>
|
|
||||||
<property name="maven.settings.interactiveMode" value="true"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Defining classpaths -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<path id="build.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
|
|
||||||
</path>
|
|
||||||
<path id="build.test.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Cleaning up target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="clean" description="Clean the output directory">
|
|
||||||
<delete dir="${maven.build.dir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile" depends="get-deps" description="Compile the code">
|
|
||||||
<mkdir dir="${maven.build.outputDir}"/>
|
|
||||||
<javac destdir="${maven.build.outputDir}"
|
|
||||||
nowarn="false"
|
|
||||||
debug="true"
|
|
||||||
optimize="false"
|
|
||||||
deprecation="true"
|
|
||||||
target="1.5"
|
|
||||||
verbose="false"
|
|
||||||
fork="false"
|
|
||||||
source="1.5">
|
|
||||||
<src>
|
|
||||||
<pathelement location="${maven.build.srcDir.0}"/>
|
|
||||||
</src>
|
|
||||||
<classpath refid="build.classpath"/>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Test-compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile-tests"
|
|
||||||
depends="compile"
|
|
||||||
description="Compile the test code"
|
|
||||||
unless="maven.test.skip">
|
|
||||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Run all tests -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test"
|
|
||||||
depends="compile-tests, junit-missing"
|
|
||||||
unless="junit.skipped"
|
|
||||||
description="Run the test cases"/>
|
|
||||||
|
|
||||||
<target name="test-junit-present">
|
|
||||||
<available classname="junit.framework.Test" property="junit.present"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-status"
|
|
||||||
depends="test-junit-present">
|
|
||||||
<condition property="junit.missing">
|
|
||||||
<and>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<isfalse value="${maven.test.skip}"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<condition property="junit.skipped">
|
|
||||||
<or>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<istrue value="${maven.test.skip}"/>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="junit-missing"
|
|
||||||
depends="test-junit-status"
|
|
||||||
if="junit.missing">
|
|
||||||
<echo>=================================== WARNING ===================================</echo>
|
|
||||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>===============================================================================</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Javadoc target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
|
||||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
|
||||||
packagenames="*"
|
|
||||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
|
||||||
access="protected"
|
|
||||||
old="false"
|
|
||||||
verbose="false"
|
|
||||||
version="true"
|
|
||||||
use="true"
|
|
||||||
author="true"
|
|
||||||
splitindex="false"
|
|
||||||
nodeprecated="false"
|
|
||||||
nodeprecatedlist="false"
|
|
||||||
notree="false"
|
|
||||||
noindex="false"
|
|
||||||
nohelp="false"
|
|
||||||
nonavbar="false"
|
|
||||||
serialwarn="false"
|
|
||||||
charset="ISO-8859-1"
|
|
||||||
linksource="false"
|
|
||||||
breakiterator="false"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Package target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="package" depends="compile,test" description="Package the application">
|
|
||||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
|
||||||
compress="true"
|
|
||||||
index="false"
|
|
||||||
basedir="${maven.build.outputDir}"
|
|
||||||
excludes="**/package.html"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- A dummy target for the package named after the type it creates -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Download dependencies target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test-offline">
|
|
||||||
<condition property="maven.mode.offline">
|
|
||||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="get-deps"
|
|
||||||
depends="test-offline"
|
|
||||||
description="Download all dependencies"
|
|
||||||
unless="maven.mode.offline">
|
|
||||||
<mkdir dir="${maven.repo.local}"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar"
|
|
||||||
dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
|
|
||||||
dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
|
|
||||||
dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4"/>
|
|
||||||
<get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
|
|
||||||
dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
@ -1 +0,0 @@
|
|||||||
JRUBY_OPTS="-rgentoo"
|
|
@ -1,79 +0,0 @@
|
|||||||
diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ftype.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.rb
|
|
||||||
--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ftype.rb 2009-04-26 12:01:41.912584566 +0100
|
|
||||||
+++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.rb 2009-04-26 12:03:56.000210377 +0100
|
|
||||||
@@ -26,28 +26,13 @@
|
|
||||||
else
|
|
||||||
@char = Pathname.new('/dev/null').realpath
|
|
||||||
@fifo = "test_fifo"
|
|
||||||
+ @link = "test_link"
|
|
||||||
|
|
||||||
system("mkfifo #{@fifo}")
|
|
||||||
+ system("ln -snf . #{@link}")
|
|
||||||
|
|
||||||
- if File.exists?("/dev/fd0")
|
|
||||||
- @block = Pathname.new("/dev/fd0").realpath
|
|
||||||
- @link = "/dev/fd0" if File.symlink?("/dev/fd0")
|
|
||||||
- elsif File.exists?("/dev/diskette")
|
|
||||||
- @block = Pathname.new("/dev/diskette").realpath
|
|
||||||
- @link = "/dev/diskette" if File.symlink?("/dev/diskette")
|
|
||||||
- elsif File.exists?("/dev/cdrom")
|
|
||||||
- @block = Pathname.new("/dev/cdrom").realpath
|
|
||||||
- @link = "/dev/cdrom" if File.symlink?("/dev/cdrom")
|
|
||||||
- elsif File.exists?("/dev/sr0") # CDROM
|
|
||||||
- @block = Pathname.new("/dev/sr0").realpath
|
|
||||||
- @link = "/dev/sr0" if File.symlink?("/dev/sr0")
|
|
||||||
- elsif File.exists?("/dev/disk0")
|
|
||||||
- @block = "/dev/disk0"
|
|
||||||
- @link = "/tmp"
|
|
||||||
- else
|
|
||||||
- @block = nil
|
|
||||||
- @link = nil
|
|
||||||
- end
|
|
||||||
+ @block = %w( /dev/fd0 /dev/diskette /dev/cdrom /dev/sr0 /dev/disk0 ).find { |dev| File.exists?(dev) }
|
|
||||||
+ @block = Pathname.new(@block).realpath if @block
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@@ -66,22 +51,21 @@
|
|
||||||
end
|
|
||||||
|
|
||||||
# TODO: Find appropriate tests for MS Windows
|
|
||||||
- unless WINDOWS
|
|
||||||
- def test_ftype_char
|
|
||||||
- assert_equal('characterSpecial', File.ftype(@char))
|
|
||||||
- end
|
|
||||||
+
|
|
||||||
+ def test_ftype_char
|
|
||||||
+ assert_equal('characterSpecial', File.ftype(@char)) if @char
|
|
||||||
+ end
|
|
||||||
|
|
||||||
- def test_ftype_block
|
|
||||||
- assert_equal('blockSpecial', File.ftype(@block), "BLOCK WAS: #{@block}")
|
|
||||||
- end
|
|
||||||
+ def test_ftype_block
|
|
||||||
+ assert_equal('blockSpecial', File.ftype(@block), "BLOCK WAS: #{@block}") if @block
|
|
||||||
+ end
|
|
||||||
|
|
||||||
- def test_ftype_link
|
|
||||||
- assert_equal('link', File.ftype(@link))
|
|
||||||
- end
|
|
||||||
+ def test_ftype_link
|
|
||||||
+ assert_equal('link', File.ftype(@link)) if @link
|
|
||||||
+ end
|
|
||||||
|
|
||||||
- def test_ftype_fifo
|
|
||||||
- assert_equal('fifo', File.ftype(@fifo))
|
|
||||||
- end
|
|
||||||
+ def test_ftype_fifo
|
|
||||||
+ assert_equal('fifo', File.ftype(@fifo)) if @fifo
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_ftype_expected_errors
|
|
||||||
@@ -91,6 +75,7 @@
|
|
||||||
|
|
||||||
def teardown
|
|
||||||
remove_file(@fifo)
|
|
||||||
+ remove_file(@link)
|
|
||||||
|
|
||||||
@file = nil
|
|
||||||
@dir = nil
|
|
@ -1,8 +0,0 @@
|
|||||||
# Autoload rubygems as with regular Ruby.
|
|
||||||
begin
|
|
||||||
require 'rubygems'
|
|
||||||
rescue LoadError
|
|
||||||
end
|
|
||||||
|
|
||||||
# Append regular site_ruby to $LOAD_PATH. Unfortunately the -I option prepends instead.
|
|
||||||
$LOAD_PATH.insert(-2, '/usr/lib/ruby/site_ruby/1.8', '/usr/lib/ruby/site_ruby')
|
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
export JRUBY_CP=`java-config -d -p jruby`
|
|
||||||
exec bash /usr/share/jruby/bin/jruby "${@}"
|
|
@ -1,180 +0,0 @@
|
|||||||
Author: Ralph Sennhauser <sera@gentoo.org>
|
|
||||||
|
|
||||||
Set JRUBY_HOME, JRUBY_CP, CP and JAVACMD as appropriate for Gentoo.
|
|
||||||
Remove JFFI_OPTS as the system jar knows where to look for the native lib.
|
|
||||||
|
|
||||||
diff --git a/bin/jruby.bash b/bin/jruby.bash
|
|
||||||
index 731f85e..8299557 100755
|
|
||||||
--- a/bin/jruby.bash
|
|
||||||
+++ b/bin/jruby.bash
|
|
||||||
@@ -25,31 +25,7 @@ if [ -z "$JAVA_VM" ]; then
|
|
||||||
JAVA_VM=-client
|
|
||||||
fi
|
|
||||||
|
|
||||||
-## resolve links - $0 may be a link to home
|
|
||||||
-PRG=$0
|
|
||||||
-progname=`basename "$0"`
|
|
||||||
-
|
|
||||||
-while [ -h "$PRG" ] ; do
|
|
||||||
- ls=`ls -ld "$PRG"`
|
|
||||||
- link=`expr "$ls" : '.*-> \(.*\)$'`
|
|
||||||
- if expr "$link" : '.*/.*' > /dev/null; then
|
|
||||||
- if expr "$link" : '/' > /dev/null; then
|
|
||||||
- PRG="$link"
|
|
||||||
- else
|
|
||||||
- PRG="`dirname ${PRG}`/${link}"
|
|
||||||
- fi
|
|
||||||
- else
|
|
||||||
- PRG="`dirname $PRG`/$link"
|
|
||||||
- fi
|
|
||||||
-done
|
|
||||||
-
|
|
||||||
-JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir
|
|
||||||
-if [ "$JRUBY_HOME_1" = '.' ] ; then
|
|
||||||
- cwd=`pwd`
|
|
||||||
- JRUBY_HOME=`dirname $cwd` # JRUBY-2699
|
|
||||||
-else
|
|
||||||
- JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir
|
|
||||||
-fi
|
|
||||||
+JRUBY_HOME="${JRUBY_HOME:-/usr/share/jruby}"
|
|
||||||
|
|
||||||
if [ -z "$JRUBY_OPTS" ] ; then
|
|
||||||
JRUBY_OPTS=""
|
|
||||||
@@ -81,17 +57,7 @@ for opt in ${JRUBY_OPTS[@]}; do
|
|
||||||
done
|
|
||||||
JRUBY_OPTS=${JRUBY_OPTS_TEMP}
|
|
||||||
|
|
||||||
-if [ -z "$JAVACMD" ] ; then
|
|
||||||
- if [ -z "$JAVA_HOME" ] ; then
|
|
||||||
- JAVACMD='java'
|
|
||||||
- else
|
|
||||||
- if $cygwin; then
|
|
||||||
- JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/java"
|
|
||||||
- else
|
|
||||||
- JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
- fi
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
+JAVACMD=java
|
|
||||||
|
|
||||||
if [ -z "$JAVA_MEM" ] ; then
|
|
||||||
JAVA_MEM=-Xmx500m
|
|
||||||
@@ -132,21 +98,7 @@ JRUBY_SHELL=/bin/sh
|
|
||||||
|
|
||||||
CP_DELIMITER=":"
|
|
||||||
|
|
||||||
-# add main jruby jar to the bootclasspath
|
|
||||||
-for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
|
|
||||||
- if [ ! -e "$j" ]; then
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
- if [ "$JRUBY_CP" ]; then
|
|
||||||
- JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
|
|
||||||
- else
|
|
||||||
- JRUBY_CP="$j"
|
|
||||||
- fi
|
|
||||||
- if [ $JRUBY_ALREADY_ADDED ]; then
|
|
||||||
- echo "WARNING: more than one JRuby JAR found in lib directory"
|
|
||||||
- fi
|
|
||||||
- JRUBY_ALREADY_ADDED=true
|
|
||||||
-done
|
|
||||||
+JRUBY_CP="$(java-config-2 -d -p jruby)"
|
|
||||||
|
|
||||||
if $cygwin; then
|
|
||||||
JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
|
|
||||||
@@ -154,29 +106,7 @@ fi
|
|
||||||
|
|
||||||
# ----- Set Up The System Classpath -------------------------------------------
|
|
||||||
|
|
||||||
-if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
|
|
||||||
- # Use same classpath propagated from parent jruby
|
|
||||||
- CP=$JRUBY_PARENT_CLASSPATH
|
|
||||||
-else
|
|
||||||
- # add other jars in lib to CP for command-line execution
|
|
||||||
- for j in "$JRUBY_HOME"/lib/*.jar; do
|
|
||||||
- if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
- if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
- if [ "$CP" ]; then
|
|
||||||
- CP="$CP$CP_DELIMITER$j"
|
|
||||||
- else
|
|
||||||
- CP="$j"
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
-
|
|
||||||
- if $cygwin; then
|
|
||||||
- CP=`cygpath -p -w "$CP"`
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
+CP="${JRUBY_PARENT_CLASSPATH}"
|
|
||||||
|
|
||||||
if $cygwin; then
|
|
||||||
# switch delimiter only after building Unix style classpaths
|
|
||||||
@@ -254,15 +184,7 @@ do
|
|
||||||
java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
|
|
||||||
# Run under JDB
|
|
||||||
--jdb)
|
|
||||||
- if [ -z "$JAVA_HOME" ] ; then
|
|
||||||
- JAVACMD='jdb'
|
|
||||||
- else
|
|
||||||
- if $cygwin; then
|
|
||||||
- JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/jdb"
|
|
||||||
- else
|
|
||||||
- JAVACMD="$JAVA_HOME/bin/jdb"
|
|
||||||
- fi
|
|
||||||
- fi
|
|
||||||
+ JAVACMD='jdb'
|
|
||||||
java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
|
|
||||||
JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
|
|
||||||
--client)
|
|
||||||
@@ -310,18 +232,6 @@ set -- "${ruby_args[@]}"
|
|
||||||
|
|
||||||
JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
|
|
||||||
|
|
||||||
-JFFI_BOOT=""
|
|
||||||
-if [ -d "$JRUBY_HOME/lib/native/" ]; then
|
|
||||||
- for d in $JRUBY_HOME/lib/native/*`uname -s`; do
|
|
||||||
- if [ -z "$JFFI_BOOT" ]; then
|
|
||||||
- JFFI_BOOT="$d"
|
|
||||||
- else
|
|
||||||
- JFFI_BOOT="$JFFI_BOOT:$d"
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
-fi
|
|
||||||
-JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT"
|
|
||||||
-
|
|
||||||
if $cygwin; then
|
|
||||||
JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
|
|
||||||
JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
|
|
||||||
@@ -354,7 +264,8 @@ if [ "$VERIFY_JRUBY" != "" ]; then
|
|
||||||
echo "Running with instrumented profiler"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
|
|
||||||
+ "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
|
|
||||||
"-Djruby.home=$JRUBY_HOME" \
|
|
||||||
+ "-Djruby.bindir=/usr/bin" \
|
|
||||||
"-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
|
|
||||||
"-Djruby.shell=$JRUBY_SHELL" \
|
|
||||||
@@ -377,7 +287,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then
|
|
||||||
else
|
|
||||||
if $cygwin; then
|
|
||||||
# exec doed not work correctly with cygwin bash
|
|
||||||
- "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
|
|
||||||
+ "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
|
|
||||||
"-Djruby.home=$JRUBY_HOME" \
|
|
||||||
"-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
|
|
||||||
"-Djruby.shell=$JRUBY_SHELL" \
|
|
||||||
@@ -390,7 +300,8 @@ else
|
|
||||||
|
|
||||||
exit $JRUBY_STATUS
|
|
||||||
else
|
|
||||||
- exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
|
|
||||||
+ exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
|
|
||||||
"-Djruby.home=$JRUBY_HOME" \
|
|
||||||
+ "-Djruby.bindir=/usr/bin" \
|
|
||||||
"-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
|
|
||||||
"-Djruby.shell=$JRUBY_SHELL" \
|
|
@ -1,124 +0,0 @@
|
|||||||
diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/lib/test/helper.rb jruby-1.2.0/test/externals/ruby_test/lib/test/helper.rb
|
|
||||||
--- jruby-1.2.0.orig/test/externals/ruby_test/lib/test/helper.rb 2009-03-16 15:16:02.000000000 +0000
|
|
||||||
+++ jruby-1.2.0/test/externals/ruby_test/lib/test/helper.rb 2009-04-18 00:34:02.198853097 +0100
|
|
||||||
@@ -235,31 +235,34 @@
|
|
||||||
# Get the user of the current process.
|
|
||||||
#
|
|
||||||
def get_user
|
|
||||||
- user = ENV['USERNAME'] || ENV['USER']
|
|
||||||
if WINDOWS
|
|
||||||
- if user.nil?
|
|
||||||
- buf = 0.chr * MAX_PATH
|
|
||||||
- if GetUserName.call(buf, buf.length) == 0
|
|
||||||
- raise "Unable to get user name"
|
|
||||||
- end
|
|
||||||
- user = buf.unpack("A*")
|
|
||||||
+ buf = 0.chr * MAX_PATH
|
|
||||||
+ if GetUserName.call(buf, buf.length) != 0
|
|
||||||
+ buf.unpack("A*")
|
|
||||||
+ elsif user = ENV['USERNAME'] || ENV['USER']
|
|
||||||
+ user
|
|
||||||
+ else
|
|
||||||
+ raise "Unable to get user name"
|
|
||||||
end
|
|
||||||
else
|
|
||||||
- user ||= Etc.getpwuid(Process.uid).name
|
|
||||||
+ Etc.getpwuid(Process.uid).name
|
|
||||||
end
|
|
||||||
- user
|
|
||||||
end
|
|
||||||
|
|
||||||
- # Returns the home directory of the current process owner.
|
|
||||||
- #
|
|
||||||
+ # Returns the home directory of the current process owner
|
|
||||||
+ # according to the HOME/USERPROFILE variable.
|
|
||||||
def get_home
|
|
||||||
- home = ENV['HOME'] || ENV['USERPROFILE']
|
|
||||||
+ ENV['HOME'] || ENV['USERPROFILE'] || get_real_home
|
|
||||||
+ end
|
|
||||||
+
|
|
||||||
+ # Returns the home directory of the current process owner
|
|
||||||
+ # according to the system.
|
|
||||||
+ def get_real_home
|
|
||||||
if WINDOWS
|
|
||||||
- home ||= "C:\\Documents and Settings\\" + get_user
|
|
||||||
+ "C:\\Documents and Settings\\" + get_user
|
|
||||||
else
|
|
||||||
- home ||= Etc.getpwuid(Process.uid).dir
|
|
||||||
+ Etc.getpwuid(Process.uid).dir
|
|
||||||
end
|
|
||||||
- home
|
|
||||||
end
|
|
||||||
|
|
||||||
# Returns the current umask of the process.
|
|
||||||
diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb
|
|
||||||
--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb 2009-03-16 15:15:49.000000000 +0000
|
|
||||||
+++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb 2009-04-18 00:20:58.966617568 +0100
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
def setup
|
|
||||||
@user = get_user
|
|
||||||
@home = get_home
|
|
||||||
+ @real_home = get_real_home
|
|
||||||
@pwd = Dir.pwd
|
|
||||||
ENV['HOME'] = ENV['USERPROFILE'] if WINDOWS
|
|
||||||
end
|
|
||||||
@@ -88,17 +89,21 @@
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_expand_path_with_tilde
|
|
||||||
- assert_equal(@home, File.expand_path("~#{@user}"))
|
|
||||||
- assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}/bin"))
|
|
||||||
+ { "~" => @home, "~#{@user}" => @real_home }.each do |tilde,path|
|
|
||||||
+ assert_equal(path, File.expand_path(tilde))
|
|
||||||
+ assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde}/bin"))
|
|
||||||
+ end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Second argument ignored if tilde is present and it's at position 0.
|
|
||||||
def test_expand_path_with_tilde_and_dir
|
|
||||||
- assert_equal(@home, File.expand_path("~#{@user}", '.'))
|
|
||||||
- assert_equal(@home, File.expand_path("~#{@user}", '..'))
|
|
||||||
- assert_equal(@home, File.expand_path("~#{@user}", '/tmp'))
|
|
||||||
- assert_equal(@home, File.expand_path("~#{@user}", '../tmp'))
|
|
||||||
- assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}/bin", '/tmp'))
|
|
||||||
+ { "~" => @home, "~#{@user}" => @real_home }.each do |tilde,path|
|
|
||||||
+ assert_equal(path, File.expand_path(tilde, '.'))
|
|
||||||
+ assert_equal(path, File.expand_path(tilde, '..'))
|
|
||||||
+ assert_equal(path, File.expand_path(tilde, '/tmp'))
|
|
||||||
+ assert_equal(path, File.expand_path(tilde, '../tmp'))
|
|
||||||
+ assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde}/bin", '/tmp'))
|
|
||||||
+ end
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_expand_path_returns_tainted_string
|
|
||||||
@@ -120,5 +126,6 @@
|
|
||||||
@pwd = nil
|
|
||||||
@user = nil
|
|
||||||
@home = nil
|
|
||||||
+ @real_home = nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb
|
|
||||||
--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb 2009-03-16 15:16:00.000000000 +0000
|
|
||||||
+++ jruby-1.2.0/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb 2009-04-18 21:24:02.653686353 +0100
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
|
|
||||||
def setup
|
|
||||||
unless WINDOWS
|
|
||||||
- @gid = Etc.getpwnam(Etc.getlogin).gid
|
|
||||||
+ @gid = `id -g`.to_i
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb
|
|
||||||
--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb 2009-03-16 15:15:50.000000000 +0000
|
|
||||||
+++ jruby-1.2.0/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb 2009-04-18 21:30:26.748686198 +0100
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
|
|
||||||
def setup
|
|
||||||
unless WINDOWS
|
|
||||||
- @uid = Etc.getpwnam(Etc.getlogin).uid
|
|
||||||
+ @uid = `id -u`.to_i
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
|||||||
<project name="TimingFramework" default="dist" basedir=".">
|
|
||||||
<description>
|
|
||||||
simple example build file
|
|
||||||
</description>
|
|
||||||
<!-- set global properties for this build -->
|
|
||||||
<property name="src" location="src"/>
|
|
||||||
<property name="build" location="build"/>
|
|
||||||
<property name="dist" location="dist"/>
|
|
||||||
<property name="javadoc" location="javadoc"/>
|
|
||||||
|
|
||||||
<target name="init">
|
|
||||||
<!-- Create the time stamp -->
|
|
||||||
<tstamp/>
|
|
||||||
<!-- Create the build directory structure used by compile -->
|
|
||||||
<mkdir dir="${build}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile" depends="init"
|
|
||||||
description="compile the source " >
|
|
||||||
<!-- Compile the java code from ${src} into ${build} -->
|
|
||||||
<javac srcdir="${src}" destdir="${build}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="dist" depends="compile"
|
|
||||||
description="generate the distribution" >
|
|
||||||
<!-- Create the distribution directory -->
|
|
||||||
<mkdir dir="${dist}/lib"/>
|
|
||||||
|
|
||||||
<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
|
|
||||||
<jar jarfile="${dist}/lib/json-simple.jar" basedir="${build}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="clean"
|
|
||||||
description="clean up" >
|
|
||||||
<!-- Delete the ${build} and ${dist} directory trees -->
|
|
||||||
<delete dir="${build}"/>
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
<delete dir="${javadoc}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="javadoc" description="Produce package javadoc">
|
|
||||||
<javadoc destdir="${javadoc}" >
|
|
||||||
<fileset dir="src" defaultexcludes="yes">
|
|
||||||
<include name="org/json/**"/>
|
|
||||||
</fileset>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
@ -1,61 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!---
|
|
||||||
@author: Saleem Abdulrasool <compnerd@gentoo.org>
|
|
||||||
@date: 5/9/2005
|
|
||||||
@revision: 1.0_alpha
|
|
||||||
|
|
||||||
@notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
|
|
||||||
-->
|
|
||||||
|
|
||||||
<project name="Gentoo_Builder" default="jar" basedir=".">
|
|
||||||
<property name="src" value="src"/>
|
|
||||||
<property name="build" value="build"/>
|
|
||||||
<property name="dist" value="dist"/>
|
|
||||||
<property name="dist.docs" value="${dist}/doc/api"/>
|
|
||||||
|
|
||||||
<property name="libdir" value="lib"/>
|
|
||||||
|
|
||||||
<property name="pkg" value="${package.name}"/>
|
|
||||||
<property name="jar" value="${project.name}.jar"/>
|
|
||||||
|
|
||||||
<path id="lib.classpath">
|
|
||||||
<fileset dir="${libdir}">
|
|
||||||
<include name="**/*.jar"/>
|
|
||||||
</fileset>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- Override any defined properties -->
|
|
||||||
<property file="build.properties"/>
|
|
||||||
|
|
||||||
<target name="init">
|
|
||||||
<tstamp/>
|
|
||||||
<mkdir dir="${build}"/>
|
|
||||||
<mkdir dir="${dist}"/>
|
|
||||||
<mkdir dir="${dist}/doc"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile" depends="init">
|
|
||||||
<javac srcdir="${src}" destdir="${build}" classpathref="lib.classpath"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="manifest" depends="init">
|
|
||||||
<manifest file="${build}/MANIFEST.MF" mode="update">
|
|
||||||
<attribute name="Built-By" value="Gentoo Portage"/>
|
|
||||||
</manifest>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="jar" depends="compile,manifest">
|
|
||||||
<jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
|
|
||||||
<fileset dir="${build}"/>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="javadoc" depends="compile">
|
|
||||||
<javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="clean">
|
|
||||||
<delete dir="${build}"/>
|
|
||||||
<delete dir="${dist}"/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,14 +0,0 @@
|
|||||||
https://bugzilla.mozilla.org/show_bug.cgi?id=583666
|
|
||||||
https://bugs.gentoo.org/show_bug.cgi?id=327619
|
|
||||||
|
|
||||||
--- security/coreconf/Linux.mk
|
|
||||||
+++ security/coreconf/Linux.mk
|
|
||||||
@@ -174,7 +174,7 @@
|
|
||||||
ARCH = linux
|
|
||||||
|
|
||||||
DSO_CFLAGS = -fPIC
|
|
||||||
-DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-z,defs
|
|
||||||
+DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG) -Wl,-z,defs
|
|
||||||
DSO_LDFLAGS =
|
|
||||||
LDFLAGS += $(ARCHFLAG)
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -Nur libreadline-java-0.8.0/src/native/Makefile libreadline-java-0.8.0_patched/src/native/Makefile
|
|
||||||
--- libreadline-java-0.8.0/src/native/Makefile 2003-01-07 12:14:35.000000000 +0200
|
|
||||||
+++ libreadline-java-0.8.0_patched/src/native/Makefile 2010-09-13 20:31:56.000000000 +0300
|
|
||||||
@@ -97,7 +97,7 @@
|
|
||||||
$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
|
|
||||||
$(OBJECTS) -W1,-e,_readline_init@12
|
|
||||||
else
|
|
||||||
- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
|
|
||||||
+ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
Only in nekohtml-0.9.5-patched/: .build-html.xml.swp
|
|
||||||
diff -ru nekohtml-0.9.5/src/html/org/cyberneko/html/HTMLScanner.java nekohtml-0.9.5-patched/src/html/org/cyberneko/html/HTMLScanner.java
|
|
||||||
--- nekohtml-0.9.5/src/html/org/cyberneko/html/HTMLScanner.java 2005-06-19 00:04:02.000000000 -0400
|
|
||||||
+++ nekohtml-0.9.5-patched/src/html/org/cyberneko/html/HTMLScanner.java 2006-10-12 00:42:08.000000000 -0400
|
|
||||||
@@ -3274,4 +3274,11 @@
|
|
||||||
|
|
||||||
} // class LocationItem
|
|
||||||
|
|
||||||
+ public String getXMLVersion() {
|
|
||||||
+ throw new UnsupportedOperationException("Not implemented yet.");
|
|
||||||
+ }
|
|
||||||
+ public int getCharacterOffset() {
|
|
||||||
+ throw new UnsupportedOperationException("Not implemented yet.");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
} // class HTMLScanner
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -ur piccolo-1.2.1.old/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java piccolo-1.2.1/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java
|
|
||||||
--- piccolo-1.2.1.old/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java 2008-07-27 23:35:16.000000000 +0300
|
|
||||||
+++ piccolo-1.2.1/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java 2008-07-27 23:36:09.000000000 +0300
|
|
||||||
@@ -238,7 +238,7 @@
|
|
||||||
style = style | SWT.ITALIC;
|
|
||||||
}
|
|
||||||
|
|
||||||
- return new Font(fd[0].getName(),style,fd[0].height);
|
|
||||||
+ return new Font(fd[0].getName(),style,fd[0].getHeight());
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
@ -1,120 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!--build.xml generated by maven from project.xml version 1.0
|
|
||||||
on date September 19 2006, time 1721-->
|
|
||||||
|
|
||||||
<project default="jar" name="portlet-api" basedir=".">
|
|
||||||
<property name="defaulttargetdir" value="target">
|
|
||||||
</property>
|
|
||||||
<property name="libdir" value="target/lib">
|
|
||||||
</property>
|
|
||||||
<property name="classesdir" value="target/classes">
|
|
||||||
</property>
|
|
||||||
<property name="testclassesdir" value="target/test-classes">
|
|
||||||
</property>
|
|
||||||
<property name="distdir" value="dist">
|
|
||||||
</property>
|
|
||||||
<property name="javadocdir" value="dist/docs/api">
|
|
||||||
</property>
|
|
||||||
<property name="final.name" value="portletapi">
|
|
||||||
</property>
|
|
||||||
<path id="build.classpath">
|
|
||||||
<fileset dir="${libdir}">
|
|
||||||
<include name="**/*.jar">
|
|
||||||
</include>
|
|
||||||
</fileset>
|
|
||||||
</path>
|
|
||||||
<target name="init" description="o Initializes some properties">
|
|
||||||
<mkdir dir="${libdir}">
|
|
||||||
</mkdir>
|
|
||||||
<condition property="noget">
|
|
||||||
<equals arg2="only" arg1="${build.sysclasspath}">
|
|
||||||
</equals>
|
|
||||||
</condition>
|
|
||||||
<!--Test if JUNIT is present in ANT classpath-->
|
|
||||||
|
|
||||||
<available property="Junit.present" classname="junit.framework.Test">
|
|
||||||
</available>
|
|
||||||
</target>
|
|
||||||
<target name="compile" description="o Compile the code" depends="get-deps">
|
|
||||||
<mkdir dir="${classesdir}">
|
|
||||||
</mkdir>
|
|
||||||
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
|
||||||
<src>
|
|
||||||
<pathelement location="src/java">
|
|
||||||
</pathelement>
|
|
||||||
</src>
|
|
||||||
<classpath refid="build.classpath">
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
<copy todir="${classesdir}">
|
|
||||||
<fileset dir="src/java">
|
|
||||||
<exclude name="**/*.java">
|
|
||||||
</exclude>
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
<target name="jar" description="o Create the jar" depends="compile,test">
|
|
||||||
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
<target name="clean" description="o Clean up the generated directories">
|
|
||||||
<delete dir="${defaulttargetdir}">
|
|
||||||
</delete>
|
|
||||||
<delete dir="${distdir}">
|
|
||||||
</delete>
|
|
||||||
</target>
|
|
||||||
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
|
|
||||||
<mkdir dir="dist">
|
|
||||||
</mkdir>
|
|
||||||
<copy todir="dist">
|
|
||||||
<fileset dir="${defaulttargetdir}" includes="*.jar">
|
|
||||||
</fileset>
|
|
||||||
<fileset dir="${basedir}" includes="LICENSE*, README*">
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
|
|
||||||
<fail message="There were test failures.">
|
|
||||||
</fail>
|
|
||||||
</target>
|
|
||||||
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
|
|
||||||
</target>
|
|
||||||
<target name="junit-present" unless="Junit.present" depends="init">
|
|
||||||
<echo>================================= WARNING ================================</echo>
|
|
||||||
<echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>==========================================================================</echo>
|
|
||||||
</target>
|
|
||||||
<target name="compile-tests" if="Junit.present" depends="junit-present,compile">
|
|
||||||
</target>
|
|
||||||
<target name="javadoc" description="o Generate javadoc" depends="get-deps">
|
|
||||||
<mkdir dir="${javadocdir}">
|
|
||||||
</mkdir>
|
|
||||||
<tstamp>
|
|
||||||
<format pattern="1999-yyyy" property="year">
|
|
||||||
</format>
|
|
||||||
</tstamp>
|
|
||||||
<property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
|
|
||||||
</property>
|
|
||||||
<property name="title" value="Java Portlet API 1.0 API">
|
|
||||||
</property>
|
|
||||||
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="javax.portlet.*">
|
|
||||||
<classpath>
|
|
||||||
<path refid="build.classpath">
|
|
||||||
</path>
|
|
||||||
</classpath>
|
|
||||||
</javadoc>
|
|
||||||
</target>
|
|
||||||
<target name="get-deps" unless="noget" depends="init">
|
|
||||||
<!--Proxy settings works only with a JDK 1.2 and higher.-->
|
|
||||||
|
|
||||||
<setproxy>
|
|
||||||
</setproxy>
|
|
||||||
</target>
|
|
||||||
<target name="install-maven">
|
|
||||||
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
|
|
||||||
</get>
|
|
||||||
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
|
|
||||||
</unjar>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project name="saaj" default="jar" basedir=".">
|
|
||||||
<target name="compile">
|
|
||||||
<mkdir dir="build"/>
|
|
||||||
<javac debug="false" srcdir="src" destdir="build">
|
|
||||||
<classpath>
|
|
||||||
<fileset dir="lib" includes="**/*.jar"/>
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile">
|
|
||||||
<jar destfile="saaj.jar">
|
|
||||||
<fileset dir="build" includes="**/*.class"/>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -ru saxon/src/net/sf/saxon/expr/UserFunctionCall.java saxon-patched/src/net/sf/saxon/expr/UserFunctionCall.java
|
|
||||||
--- saxon/src/net/sf/saxon/expr/UserFunctionCall.java 2005-03-21 13:46:38.000000000 -0500
|
|
||||||
+++ saxon-patched/src/net/sf/saxon/expr/UserFunctionCall.java 2005-06-29 20:13:47.000000000 -0400
|
|
||||||
@@ -401,8 +401,8 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
public Object map(Item item, XPathContext context) throws XPathException {
|
|
||||||
- if (item instanceof FunctionCallPackage) {
|
|
||||||
- return (((FunctionCallPackage)item).iterateResults(context));
|
|
||||||
+ if (item instanceof UserFunctionCall.FunctionCallPackage) {
|
|
||||||
+ return (((UserFunctionCall.FunctionCallPackage)item).iterateResults(context));
|
|
||||||
} else {
|
|
||||||
return item;
|
|
||||||
}
|
|
@ -1,299 +0,0 @@
|
|||||||
<!DOCTYPE project [
|
|
||||||
<!ENTITY build-COMMON SYSTEM "common.xml">
|
|
||||||
<!ENTITY build-COMMONDEVJAVANET SYSTEM "common-devjavanet.xml">
|
|
||||||
]>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Skin Look And Feel Build
|
|
||||||
-->
|
|
||||||
<project name="skinlf" default="compile.java" basedir=".">
|
|
||||||
|
|
||||||
<!-- Allow user to override settings -->
|
|
||||||
<property file="${user.home}/skinlf-ant.properties" />
|
|
||||||
<property file="build.properties" />
|
|
||||||
|
|
||||||
<!-- Project Identification -->
|
|
||||||
<property name="project" value="skinlf"/>
|
|
||||||
<property name="version" value="1.2.12"/>
|
|
||||||
<property name="year" value="2000-2005"/>
|
|
||||||
<property name="project.fullname" value="Skin Look And Feel"/>
|
|
||||||
<property name="project.nativeskin" value="nativeskin"/>
|
|
||||||
|
|
||||||
<property name="javadoc.packagenames" value="com.l2fprod.gui,com.l2fprod.gui.plaf.skin,com.l2fprod.gui.region,com.l2fprod.gui.nativeskin"/>
|
|
||||||
|
|
||||||
<path id="classpath">
|
|
||||||
<pathelement location="lib/imageconversion.jar"/>
|
|
||||||
<pathelement location="lib/JimiProClasses.zip"/>
|
|
||||||
<pathelement location="lib/xalan.jar"/>
|
|
||||||
<pathelement location="lib/xercesImpl.jar"/>
|
|
||||||
<pathelement location="lib/xml-apis.jar"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<property name="classpath.asprop" refid="classpath"/>
|
|
||||||
|
|
||||||
&build-COMMON;
|
|
||||||
&build-COMMONDEVJAVANET;
|
|
||||||
|
|
||||||
<!-- get some of the dependant jars from maven repository -->
|
|
||||||
<target name="init.jars">
|
|
||||||
<get src="http://www.ibiblio.org/maven/javacc/jars/JavaCC.zip"
|
|
||||||
dest="lib/JavaCC.zip"
|
|
||||||
verbose="true"
|
|
||||||
usetimestamp="true"/>
|
|
||||||
<get src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.5.1.jar"
|
|
||||||
dest="lib/xalan.jar"
|
|
||||||
verbose="true"
|
|
||||||
usetimestamp="true"/>
|
|
||||||
<get src="http://www.ibiblio.org/maven/xerces/jars/xercesImpl-2.4.0.jar"
|
|
||||||
dest="lib/xercesImpl.jar"
|
|
||||||
verbose="true"
|
|
||||||
usetimestamp="true"/>
|
|
||||||
<get src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"
|
|
||||||
dest="lib/xml-apis.jar"
|
|
||||||
verbose="true"
|
|
||||||
usetimestamp="true"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile.javacc" depends="init">
|
|
||||||
<javacc target="src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj"
|
|
||||||
outputdirectory="src/com/l2fprod/gui/plaf/skin/impl/gtk/parser"
|
|
||||||
javacchome="lib"
|
|
||||||
static="false"
|
|
||||||
javaunicodeescape="true" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile" depends="init">
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Utility targets to use the style converters
|
|
||||||
-->
|
|
||||||
<target name="convert.msstyles">
|
|
||||||
<fail unless="msstyle" message="Specify path to msstyle xml -Dmsstyle=pathtoxml"/>
|
|
||||||
<fail unless="skin" message="Specify themepack folder -Dskin=pathtothemepackdir"/>
|
|
||||||
<java classname="com.l2fprod.tools.msstyles.MsStylesToSkinLF"
|
|
||||||
classpath="${classpath.asprop}:${java.src.dir}:${build.classes}"
|
|
||||||
fork="yes">
|
|
||||||
<arg value="${msstyle}" />
|
|
||||||
<arg value="${msstyle}.xml" />
|
|
||||||
<arg value="${skin}" />
|
|
||||||
</java>
|
|
||||||
<copy todir="${skin}">
|
|
||||||
<fileset dir="src/themepacks/skeletonthemepack" includes="**"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Start Demos
|
|
||||||
-->
|
|
||||||
<target name="demo">
|
|
||||||
<java classname="examples.demo"
|
|
||||||
classpath="${classpath.asprop}:${java.src.dir}:${build.classes}"
|
|
||||||
fork="yes">
|
|
||||||
<arg value="${skin}" />
|
|
||||||
</java>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Dist targets -->
|
|
||||||
<target name="jar" depends="compile.java">
|
|
||||||
<jar destfile="${build.dir}/${project}.jar">
|
|
||||||
<fileset dir="${build.classes}" includes="*.class,com/**/*.class" excludes="**/region/**,**/nativeskin/**"/>
|
|
||||||
<fileset dir="${java.src.dir}" includes="com/**/*.properties"/>
|
|
||||||
<fileset dir="${java.src.dir}" includes="com/**/*.template"/>
|
|
||||||
<fileset dir="${java.src.dir}" includes="com/**/*.gif"/>
|
|
||||||
<manifest>
|
|
||||||
<attribute name="Built-by" value="${user.name}"/>
|
|
||||||
<attribute name="Main-Class" value="com.l2fprod.gui.plaf.skin.Skinit"/>
|
|
||||||
<section name="com/l2fprod/gui/plaf/skin">
|
|
||||||
<attribute name="Specification-Title" value="${project.fullname}"/>
|
|
||||||
<attribute name="Specification-Version" value="${version}"/>
|
|
||||||
<attribute name="Specification-Vendor" value="L2FProd.com"/>
|
|
||||||
<attribute name="Implementation-Title" value="${project.fullname}"/>
|
|
||||||
<attribute name="Implementation-Version" value="${version}"/>
|
|
||||||
<attribute name="Implementation-Vendor" value="L2FProd.com"/>
|
|
||||||
</section>
|
|
||||||
</manifest>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="obfuscate" depends="jar">
|
|
||||||
<taskdef name="proguard"
|
|
||||||
classname="proguard.ant.ProGuardTask"
|
|
||||||
classpath="lib/proguard.jar"/>
|
|
||||||
<move file="${build.dir}/${project}.jar"
|
|
||||||
tofile="${build.dir}/${project}-toobfuscate.jar"/>
|
|
||||||
<proguard
|
|
||||||
outjar="${build.dir}/${project}.jar"
|
|
||||||
obfuscate="yes"
|
|
||||||
usemixedclassnames="no"
|
|
||||||
overloadaggressively="yes"
|
|
||||||
printmapping="obfuscatemapping.txt"
|
|
||||||
printusage="obfuscateusage.txt">
|
|
||||||
<libraryjar name="${java.home}/lib/rt.jar"/>
|
|
||||||
<injar name="${build.dir}/${project}-toobfuscate.jar"/>
|
|
||||||
<keep access="public" type="class" name="Skinit">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.SkinApplet">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.SkinChooser">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.WindowSnapping">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.nativeskin.**">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.CompoundSkin">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.IncorrectVersionException">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.LinuxLookAndFeel">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.Skin">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinButton">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinFrame">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.Skinit">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinLookAndFeel">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinPersonality">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinPreviewWindow">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinProgress">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinScrollbar">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSeparator">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSlider">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinSplitPane">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.SkinTab">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.*">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.gtk.GtkSkin">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.plaf.skin.impl.kde.KdeSkin">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.gui.region.*">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep access="public" type="class" name="com.l2fprod.tools.**">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
<keep type="class" name="com.l2fprod.util.**">
|
|
||||||
<method name="*"/>
|
|
||||||
</keep>
|
|
||||||
</proguard>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="dist.pre" depends="jar">
|
|
||||||
<!-- examples.jar -->
|
|
||||||
<jar destfile="${build.dist.lib}/examples.jar">
|
|
||||||
<fileset dir="${build.classes}" includes="examples/**.class"/>
|
|
||||||
<fileset dir="${java.src.dir}" includes="examples/**.properties,examples/**.gif,examples/**.jpg"/>
|
|
||||||
</jar>
|
|
||||||
<!-- nativeskin.jar -->
|
|
||||||
<jar jarfile="${build.dist.lib}/nativeskin.jar">
|
|
||||||
<fileset dir="${build.classes}"
|
|
||||||
includes="com/l2fprod/gui/region/**,com/l2fprod/gui/nativeskin/**,com/l2fprod/util/OS**,,com/l2fprod/util/Access**"
|
|
||||||
excludes="**/*.html"/>
|
|
||||||
</jar>
|
|
||||||
<!-- batch files -->
|
|
||||||
<copy todir="${build.dist.bin}"
|
|
||||||
flatten="yes"
|
|
||||||
preservelastmodified="yes">
|
|
||||||
<fileset dir="src" includes="**/*.bat"/>
|
|
||||||
</copy>
|
|
||||||
<!-- dlls -->
|
|
||||||
<copy todir="${build.dist.lib}">
|
|
||||||
<fileset dir="src/native/win32" includes="*.dll"/>
|
|
||||||
</copy>
|
|
||||||
<!-- default theme -->
|
|
||||||
<zip destfile="${build.dist.lib}/themepack.zip">
|
|
||||||
<zipfileset dir="src/themepacks/whistlerthemepack"/>
|
|
||||||
</zip>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Publish the new version of SKinLF
|
|
||||||
-->
|
|
||||||
<target name="publish" depends="init">
|
|
||||||
<!-- copy zip to dist folder -->
|
|
||||||
<copy todir="${publish.download.dir}"
|
|
||||||
file="${project}-${version}-${build.version}.zip"/>
|
|
||||||
|
|
||||||
<filter token="WEB" value="${publish.web.url}"/>
|
|
||||||
<!-- update the jnlp website with the new release -->
|
|
||||||
<!-- put skinlf.jar in jnlp folder -->
|
|
||||||
<copy todir="${publish.skinlf.home}/jnlp/" filtering="on" overwrite="yes">
|
|
||||||
<fileset dir="src/jnlp" includes="*.jnlp"/>
|
|
||||||
</copy>
|
|
||||||
<copy file="${build.dist.lib}/${project}.jar" todir="${publish.skinlf.home}/jnlp/"/>
|
|
||||||
<copy file="${build.dist.lib}/examples.jar" todir="${publish.skinlf.home}/jnlp/"/>
|
|
||||||
<copy file="${build.dist.lib}/themepack.zip" todir="${publish.skinlf.home}/jnlp/"/>
|
|
||||||
<copy file="${build.dist.lib}/nativeskin.jar" todir="${publish.skinlf.home}/jnlp"/>
|
|
||||||
<jar destfile="${publish.skinlf.home}/jnlp/nativeskinlibs.jar"
|
|
||||||
basedir="${build.dist.lib}" includes="*.dll"/>
|
|
||||||
|
|
||||||
<!-- copy the documentation
|
|
||||||
<copy todir="${web.skinlf.home}/documentation">
|
|
||||||
<fileset dir="${javadoc.destdir}"/>
|
|
||||||
</copy>
|
|
||||||
-->
|
|
||||||
<!-- Sign all Jars -->
|
|
||||||
<signjar keystore="../common/keystore" alias="L2FProd.com" storepass="L2FProd.com">
|
|
||||||
<fileset dir="${publish.skinlf.home}/jnlp" includes="*.jar"/>
|
|
||||||
</signjar>
|
|
||||||
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="themes">
|
|
||||||
<zip destfile="${build.www.themedir}/cellshadedthemepack.zip"
|
|
||||||
basedir="src/themepacks/cellshadedthemepack"/>
|
|
||||||
<zip destfile="${build.www.themedir}/whistlerthemepack.zip"
|
|
||||||
basedir="src/themepacks/whistlerthemepack"/>
|
|
||||||
<zip destfile="${build.www.themedir}/xplunathemepack.zip"
|
|
||||||
basedir="src/themepacks/xplunathemepack"/>
|
|
||||||
<zip destfile="${build.www.themedir}/toxicthemepack.zip"
|
|
||||||
basedir="src/themepacks/toxicthemepack"/>
|
|
||||||
<zip destfile="${build.www.themedir}/beigeazulthemepack.zip"
|
|
||||||
basedir="src/themepacks/beigeazulthemepack"/>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- png for these themepacks are not in cvs -->
|
|
||||||
<zip destfile="${build.www.themedir}/aquathemepack.zip"
|
|
||||||
basedir="src/themepacks/aquathemepack"/>
|
|
||||||
<zip destfile="${build.www.themedir}/alloythemepack.zip"
|
|
||||||
basedir="src/themepacks/alloythemepack"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
@ -1,38 +0,0 @@
|
|||||||
<!--
|
|
||||||
Common targets dealing with dev.java.net
|
|
||||||
-->
|
|
||||||
|
|
||||||
<target name="devjavanet.setup">
|
|
||||||
<property name="cvsroot" value=":pserver:${cvs.user.name}@cvs.dev.java.net:/shared/data/ccvs/repository"/>
|
|
||||||
<property name="cvsweb" value="https://skinlf.dev.java.net/unbranded-source/browse/"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="cvs.tagdiff" depends="devjavanet.setup">
|
|
||||||
<property name="filename" value="${build.dir}/${startTag}-${endTag}-diff.xml"/>
|
|
||||||
<cvstagdiff cvsroot="${cvsroot}"
|
|
||||||
destfile="${filename}"
|
|
||||||
package="${project}"
|
|
||||||
startTag="${startTag}"
|
|
||||||
endTag="${endTag}"/>
|
|
||||||
<xslt in="${filename}"
|
|
||||||
out="${filename}.html"
|
|
||||||
style="${ant.home}/etc/tagdiff.xsl">
|
|
||||||
<param name="title" expression="${project} diff between ${startTag} and ${endTag}"/>
|
|
||||||
<param name="module" expression="${project}"/>
|
|
||||||
<param name="cvsweb" expression="${cvsweb}"/>
|
|
||||||
</xslt>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="cvs.changelog" depends="devjavanet.setup">
|
|
||||||
<property name="filename" value="${build.dir}/${startDate}-clog.xml"/>
|
|
||||||
<cvschangelog
|
|
||||||
start="${startDate}"
|
|
||||||
destfile="${filename}"/>
|
|
||||||
<xslt in="${filename}"
|
|
||||||
out="${filename}.html"
|
|
||||||
style="${ant.home}/etc/changelog.xsl">
|
|
||||||
<param name="title" expression="${project} changelog since ${startDate}"/>
|
|
||||||
<param name="module" expression="${project}"/>
|
|
||||||
<param name="cvsweb" expression="${cvsweb}"/>
|
|
||||||
</xslt>
|
|
||||||
</target>
|
|
@ -1,171 +0,0 @@
|
|||||||
<!--
|
|
||||||
Common Target which could be reused by other projects later.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- COMMON PROPERTIES -->
|
|
||||||
|
|
||||||
<property name="debug" value="true"/>
|
|
||||||
<property name="optimize" value="false"/>
|
|
||||||
|
|
||||||
<!-- Java Related -->
|
|
||||||
<property name="java.src.dir" value="src"/>
|
|
||||||
<property name="javac.compiler" value="modern"/>
|
|
||||||
|
|
||||||
<!-- Destination Directory for the build -->
|
|
||||||
<property name="build.dir" value="build"/>
|
|
||||||
<property name="build.classes" value="${build.dir}/classes"/>
|
|
||||||
<property name="build.src" value="${build.dir}/src"/>
|
|
||||||
<property name="build.dist.dir" value="${project}-${version}"/>
|
|
||||||
<property name="build.dist.src" value="${build.dist.dir}/src"/>
|
|
||||||
<property name="build.dist.lib" value="${build.dist.dir}/lib"/>
|
|
||||||
<property name="build.dist.bin" value="${build.dist.dir}/bin"/>
|
|
||||||
<property name="build.www.dir" value="${build.dir}/www"/>
|
|
||||||
|
|
||||||
<!-- COMMON TARGETS -->
|
|
||||||
|
|
||||||
<target name="init.properties">
|
|
||||||
<tstamp>
|
|
||||||
<format property="build.time" pattern="MM/dd/yyyy hh:mm aa" locale="en"/>
|
|
||||||
<format property="build.version" pattern="yyyyMMdd" locale="en"/>
|
|
||||||
</tstamp>
|
|
||||||
<filter token="VERSION" value="${version}"/>
|
|
||||||
<filter token="PROJECT.FULLNAME" value="${project.fullname}"/>
|
|
||||||
<filter token="DATE" value="${build.time}"/>
|
|
||||||
<filter token="YEAR" value="${year}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="init.directories">
|
|
||||||
<mkdir dir="${build.dir}"/>
|
|
||||||
<mkdir dir="${build.classes}"/>
|
|
||||||
<mkdir dir="${build.dist.dir}"/>
|
|
||||||
<mkdir dir="${build.dist.src}"/>
|
|
||||||
<mkdir dir="${build.dist.lib}"/>
|
|
||||||
<mkdir dir="${build.dist.bin}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="init" depends="init.properties,init.directories">
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="clean">
|
|
||||||
<delete dir="${build.dir}"/>
|
|
||||||
<delete dir="${build.dist.dir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="fixcrlf">
|
|
||||||
<fixcrlf srcdir="${basedir}" eol="cr">
|
|
||||||
<include name="AUTHORS,LICENSE*,README,THANKS" />
|
|
||||||
<include name="**/*.java" />
|
|
||||||
</fixcrlf>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Java Related Targets -->
|
|
||||||
|
|
||||||
<target name="compile.java" depends="init">
|
|
||||||
<depend srcdir="${java.src.dir}"
|
|
||||||
destdir="${build.classes}"
|
|
||||||
cache="${build.dir}/dependcache"
|
|
||||||
closure="yes"/>
|
|
||||||
|
|
||||||
<copy todir="${build.src}" filtering="yes">
|
|
||||||
<fileset dir="${java.src.dir}">
|
|
||||||
<include name="**/*.java"/>
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
<javac srcdir="${build.src}"
|
|
||||||
destdir="${build.classes}"
|
|
||||||
classpathref="classpath"
|
|
||||||
compiler="${javac.compiler}"
|
|
||||||
includeAntRuntime="false"
|
|
||||||
includeJavaRuntime="false"
|
|
||||||
debug="${debug}"
|
|
||||||
optimize="${optimize}"
|
|
||||||
target="1.3" source="1.3">
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Distribution Target -->
|
|
||||||
|
|
||||||
<target name="dist" depends="jar,dist.pre">
|
|
||||||
<!-- project.jar -->
|
|
||||||
<copy todir="${build.dist.lib}"
|
|
||||||
file="${build.dir}/${project}.jar"
|
|
||||||
preservelastmodified="yes"/>
|
|
||||||
<!-- source code -->
|
|
||||||
<copy todir="${build.dist.src}"
|
|
||||||
preservelastmodified="yes">
|
|
||||||
<fileset dir="${build.src}" includes="**/*.java"/>
|
|
||||||
<fileset dir="${java.src.dir}" includes="**/*.properties"/>
|
|
||||||
</copy>
|
|
||||||
<!-- regular files -->
|
|
||||||
<copy todir="${build.dist.dir}"
|
|
||||||
filtering="yes"
|
|
||||||
preservelastmodified="yes">
|
|
||||||
<fileset dir="${basedir}">
|
|
||||||
<include name="AUTHORS"/>
|
|
||||||
<include name="INSTALL"/>
|
|
||||||
<include name="README"/>
|
|
||||||
<include name="THANKS"/>
|
|
||||||
<include name="LICENSE"/>
|
|
||||||
<include name="LICENSE_*"/>
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
<xslt in="xdocs/CHANGES.xml"
|
|
||||||
out="${build.dist.dir}/CHANGES"
|
|
||||||
style="xdocs/xsl/text.xsl"/>
|
|
||||||
<!-- zip file -->
|
|
||||||
<zip destfile="${project}-${version}-${build.version}.zip">
|
|
||||||
<zipfileset dir="${build.dist.dir}"
|
|
||||||
prefix="${project}-${version}" />
|
|
||||||
</zip>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Source code formatting -->
|
|
||||||
|
|
||||||
<target name="jalopy" depends="init">
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Project Web Documentation -->
|
|
||||||
|
|
||||||
<target name="www" depends="init">
|
|
||||||
<mkdir dir="${build.www.dir}"/>
|
|
||||||
<xslt in="xdocs/www.xml"
|
|
||||||
out="${build.www.dir}/empty.html"
|
|
||||||
style="xdocs/xsl/tohtml.xsl">
|
|
||||||
<param name="output.dir" expression="${build.www.dir}"/>
|
|
||||||
<param name="timestamp" expression="${build.time}"/>
|
|
||||||
</xslt>
|
|
||||||
<copy todir="${build.www.dir}">
|
|
||||||
<fileset dir="xdocs">
|
|
||||||
<include name="images/**"/>
|
|
||||||
<include name="**.java"/>
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
|
||||||
<mkdir dir="${build.www.dir}/javadoc"/>
|
|
||||||
<javadoc sourcepath="${java.src.dir}"
|
|
||||||
classpath="${classpath}"
|
|
||||||
destdir="${build.www.dir}/javadoc"
|
|
||||||
packagenames="${javadoc.packagenames}"
|
|
||||||
private="false" protected="true"
|
|
||||||
windowtitle="${project.fullname} ${version} API"
|
|
||||||
doctitle="${project.fullname} ${version}"
|
|
||||||
version="false" author="false" use="false"
|
|
||||||
stylesheetfile="xdocs/javadoc.css"
|
|
||||||
splitindex="true"
|
|
||||||
bottom="Copyright © ${year} L2FProd.com. All Rights Reserved."/>
|
|
||||||
<delete file="${build.www.dir}/empty.html"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="www.sync" depends="init">
|
|
||||||
<ftp server="${build.www.server}"
|
|
||||||
userid="${build.www.userid}"
|
|
||||||
password="${build.www.password}"
|
|
||||||
remotedir="${build.www.remotedir}"
|
|
||||||
action="put"
|
|
||||||
verbose="yes"
|
|
||||||
depends="yes">
|
|
||||||
<fileset dir="${build.www.dir}">
|
|
||||||
<include name="**/**"/>
|
|
||||||
</fileset>
|
|
||||||
</ftp>
|
|
||||||
</target>
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
|||||||
diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
|
|
||||||
--- skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:09:36.000000000 +0100
|
|
||||||
+++ skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:19:19.000000000 +0100
|
|
||||||
@@ -6,15 +6,12 @@
|
|
||||||
|
|
||||||
import javax.swing.ImageIcon;
|
|
||||||
|
|
||||||
-import com.ibm.imageconversion.*;
|
|
||||||
-import com.sun.jimi.core.*;
|
|
||||||
+import javax.imageio.*;
|
|
||||||
|
|
||||||
public class ImageUtils {
|
|
||||||
|
|
||||||
public static Component bitmapCreator = new javax.swing.JLabel();
|
|
||||||
|
|
||||||
- static BMPDecoder decoder = new BMPDecoder();
|
|
||||||
- static BMPEncoder encoder = new BMPEncoder();
|
|
||||||
|
|
||||||
public static Image loadPng(String pathToImage) throws Exception {
|
|
||||||
ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
|
|
||||||
@@ -22,29 +19,33 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void savePng(Image image, String pathToImage) throws Exception {
|
|
||||||
- Jimi.putImage(image, pathToImage);
|
|
||||||
+ ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
|
|
||||||
}
|
|
||||||
|
|
||||||
+ private static String getFileFmt(String pathToImage) throws Exception {
|
|
||||||
+ String fmt;
|
|
||||||
+ if (pathToImage.toLowerCase().endsWith(".png")) {
|
|
||||||
+ return "png";
|
|
||||||
+ }
|
|
||||||
+ if (pathToImage.toLowerCase().endsWith(".gif")) {
|
|
||||||
+ return "gif";
|
|
||||||
+ }
|
|
||||||
+ if (pathToImage.toLowerCase().endsWith(".bmp")) {
|
|
||||||
+ return "bmp";
|
|
||||||
+ }
|
|
||||||
+ return "";
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public static void createPicture(String pathToImage, int index, int maxParts,
|
|
||||||
String filename, boolean horizontal) {
|
|
||||||
try {
|
|
||||||
System.out.println("working with " + pathToImage);
|
|
||||||
Image image = null;
|
|
||||||
-
|
|
||||||
- if (pathToImage.toLowerCase().endsWith(".png") ||
|
|
||||||
- pathToImage.toLowerCase().endsWith(".gif")) {
|
|
||||||
- image = loadPng(pathToImage);
|
|
||||||
- } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
|
|
||||||
- decoder.setInputFilename(pathToImage);
|
|
||||||
- decoder.triggerAction();
|
|
||||||
- image = decoder.getResult();
|
|
||||||
- } else {
|
|
||||||
- throw new Error("do not know how to load " + pathToImage);
|
|
||||||
- }
|
|
||||||
+ image = Toolkit.getDefaultToolkit().getImage(pathToImage);
|
|
||||||
|
|
||||||
// if only one image, dump it as it
|
|
||||||
- if (index == 0 && maxParts == 1) {
|
|
||||||
- Jimi.putImage(image, filename);
|
|
||||||
+ if (index == 0 && maxParts == 1) {
|
|
||||||
+ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
|
|
||||||
} else {
|
|
||||||
if (horizontal) {
|
|
||||||
int partHeight = image.getHeight(bitmapCreator) / maxParts;
|
|
||||||
@@ -55,7 +56,7 @@
|
|
||||||
image = grab(image, partWidth * index, 0,
|
|
||||||
partWidth, image.getHeight(bitmapCreator));
|
|
||||||
}
|
|
||||||
- Jimi.putImage(image, filename);
|
|
||||||
+ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
System.out.println("error while working with " + pathToImage);
|
|
@ -1,38 +0,0 @@
|
|||||||
diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
|
|
||||||
--- skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java 2006-01-22 13:14:39.000000000 +0100
|
|
||||||
+++ skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java 2006-01-22 13:19:13.000000000 +0100
|
|
||||||
@@ -6,15 +6,12 @@
|
|
||||||
|
|
||||||
import javax.swing.ImageIcon;
|
|
||||||
|
|
||||||
-import com.ibm.imageconversion.*;
|
|
||||||
import com.sun.jimi.core.*;
|
|
||||||
|
|
||||||
public class ImageUtils {
|
|
||||||
|
|
||||||
public static Component bitmapCreator = new javax.swing.JLabel();
|
|
||||||
|
|
||||||
- static BMPDecoder decoder = new BMPDecoder();
|
|
||||||
- static BMPEncoder encoder = new BMPEncoder();
|
|
||||||
|
|
||||||
public static Image loadPng(String pathToImage) throws Exception {
|
|
||||||
ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
|
|
||||||
@@ -30,17 +27,7 @@
|
|
||||||
try {
|
|
||||||
System.out.println("working with " + pathToImage);
|
|
||||||
Image image = null;
|
|
||||||
-
|
|
||||||
- if (pathToImage.toLowerCase().endsWith(".png") ||
|
|
||||||
- pathToImage.toLowerCase().endsWith(".gif")) {
|
|
||||||
- image = loadPng(pathToImage);
|
|
||||||
- } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
|
|
||||||
- decoder.setInputFilename(pathToImage);
|
|
||||||
- decoder.triggerAction();
|
|
||||||
- image = decoder.getResult();
|
|
||||||
- } else {
|
|
||||||
- throw new Error("do not know how to load " + pathToImage);
|
|
||||||
- }
|
|
||||||
+ image = Toolkit.getDefaultToolkit().getImage(pathToImage);
|
|
||||||
|
|
||||||
// if only one image, dump it as it
|
|
||||||
if (index == 0 && maxParts == 1) {
|
|
@ -1,269 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Any modifications will be overwritten. -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Generated by Maven Ant Plugin on 2/3/14 11:52 PM -->
|
|
||||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<project name="slf4j-log4j12-from-maven" default="package" basedir=".">
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Build environment properties -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<property file="${user.home}/.m2/maven.properties"/>
|
|
||||||
<property file="maven-build.properties"/>
|
|
||||||
|
|
||||||
<property name="maven.build.finalName" value="slf4j-log4j12-1.7.5"/>
|
|
||||||
<property name="maven.build.dir" value="target"/>
|
|
||||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
|
||||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
|
||||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
|
||||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
|
||||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
|
||||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
|
||||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
|
||||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
|
||||||
|
|
||||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
|
||||||
<property name="maven.settings.offline" value="false"/>
|
|
||||||
<property name="maven.settings.interactiveMode" value="true"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Defining classpaths -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<path id="build.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
|
|
||||||
</path>
|
|
||||||
<path id="build.test.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Cleaning up target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="clean" description="Clean the output directory">
|
|
||||||
<delete dir="${maven.build.dir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile" depends="get-deps" description="Compile the code">
|
|
||||||
<mkdir dir="${maven.build.outputDir}"/>
|
|
||||||
<javac destdir="${maven.build.outputDir}"
|
|
||||||
nowarn="false"
|
|
||||||
debug="true"
|
|
||||||
optimize="false"
|
|
||||||
deprecation="true"
|
|
||||||
target="1.5"
|
|
||||||
verbose="false"
|
|
||||||
fork="false"
|
|
||||||
source="1.5">
|
|
||||||
<src>
|
|
||||||
<pathelement location="${maven.build.srcDir.0}"/>
|
|
||||||
</src>
|
|
||||||
<classpath refid="build.classpath"/>
|
|
||||||
</javac>
|
|
||||||
<copy todir="${maven.build.outputDir}">
|
|
||||||
<fileset dir="${maven.build.resourceDir.0}"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Test-compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile-tests"
|
|
||||||
depends="compile"
|
|
||||||
description="Compile the test code"
|
|
||||||
unless="maven.test.skip">
|
|
||||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
|
||||||
<javac destdir="${maven.build.testOutputDir}"
|
|
||||||
nowarn="false"
|
|
||||||
debug="true"
|
|
||||||
optimize="false"
|
|
||||||
deprecation="true"
|
|
||||||
target="1.5"
|
|
||||||
verbose="false"
|
|
||||||
fork="false"
|
|
||||||
source="1.5">
|
|
||||||
<src>
|
|
||||||
<pathelement location="${maven.build.testDir.0}"/>
|
|
||||||
</src>
|
|
||||||
<classpath>
|
|
||||||
<path refid="build.test.classpath"/>
|
|
||||||
<pathelement location="${maven.build.outputDir}"/>
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
<copy todir="${maven.build.testOutputDir}">
|
|
||||||
<fileset dir="${maven.build.testResourceDir.0}"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Run all tests -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test"
|
|
||||||
depends="compile-tests, junit-missing"
|
|
||||||
unless="junit.skipped"
|
|
||||||
description="Run the test cases">
|
|
||||||
<mkdir dir="${maven.test.reports}"/>
|
|
||||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
|
||||||
<sysproperty key="basedir" value="."/>
|
|
||||||
<formatter type="xml"/>
|
|
||||||
<formatter type="plain" usefile="false"/>
|
|
||||||
<classpath>
|
|
||||||
<path refid="build.test.classpath"/>
|
|
||||||
<pathelement location="${maven.build.outputDir}"/>
|
|
||||||
<pathelement location="${maven.build.testOutputDir}"/>
|
|
||||||
</classpath>
|
|
||||||
<batchtest todir="${maven.test.reports}" unless="test">
|
|
||||||
<fileset dir="${maven.build.testDir.0}">
|
|
||||||
<include name="**/Test*.java"/>
|
|
||||||
<include name="**/*Test.java"/>
|
|
||||||
<include name="**/*TestCase.java"/>
|
|
||||||
<exclude name="**/AllTest.java"/>
|
|
||||||
<exclude name="**/PackageTest.java"/>
|
|
||||||
</fileset>
|
|
||||||
</batchtest>
|
|
||||||
<batchtest todir="${maven.test.reports}" if="test">
|
|
||||||
<fileset dir="${maven.build.testDir.0}">
|
|
||||||
<include name="**/${test}.java"/>
|
|
||||||
<exclude name="**/AllTest.java"/>
|
|
||||||
<exclude name="**/PackageTest.java"/>
|
|
||||||
</fileset>
|
|
||||||
</batchtest>
|
|
||||||
</junit>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-present">
|
|
||||||
<available classname="junit.framework.Test" property="junit.present"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-status"
|
|
||||||
depends="test-junit-present">
|
|
||||||
<condition property="junit.missing">
|
|
||||||
<and>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<isfalse value="${maven.test.skip}"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<condition property="junit.skipped">
|
|
||||||
<or>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<istrue value="${maven.test.skip}"/>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="junit-missing"
|
|
||||||
depends="test-junit-status"
|
|
||||||
if="junit.missing">
|
|
||||||
<echo>=================================== WARNING ===================================</echo>
|
|
||||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>===============================================================================</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Javadoc target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
|
||||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
|
||||||
packagenames="*"
|
|
||||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
|
||||||
access="protected"
|
|
||||||
old="false"
|
|
||||||
verbose="false"
|
|
||||||
version="true"
|
|
||||||
use="true"
|
|
||||||
author="true"
|
|
||||||
splitindex="false"
|
|
||||||
nodeprecated="false"
|
|
||||||
nodeprecatedlist="false"
|
|
||||||
notree="false"
|
|
||||||
noindex="false"
|
|
||||||
nohelp="false"
|
|
||||||
nonavbar="false"
|
|
||||||
serialwarn="false"
|
|
||||||
charset="ISO-8859-1"
|
|
||||||
linksource="false"
|
|
||||||
breakiterator="false"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Package target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="package" depends="compile,test" description="Package the application">
|
|
||||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
|
||||||
compress="true"
|
|
||||||
index="false"
|
|
||||||
manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF"
|
|
||||||
basedir="${maven.build.outputDir}"
|
|
||||||
excludes="**/package.html"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- A dummy target for the package named after the type it creates -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Download dependencies target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test-offline">
|
|
||||||
<condition property="maven.mode.offline">
|
|
||||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="get-deps"
|
|
||||||
depends="test-offline"
|
|
||||||
description="Download all dependencies"
|
|
||||||
unless="maven.mode.offline">
|
|
||||||
<mkdir dir="${maven.repo.local}"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"
|
|
||||||
dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"
|
|
||||||
dest="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar"
|
|
||||||
dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
<mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
|
|
||||||
<get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"
|
|
||||||
dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"
|
|
||||||
usetimestamp="false"
|
|
||||||
ignoreerrors="true"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
@ -1,241 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Any modifications will be overwritten. -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- Generated by Maven Ant Plugin on 3/12/14 1:54 AM -->
|
|
||||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<project name="slf4j-log4j12-from-maven" default="package" basedir=".">
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Build environment properties -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<property file="${user.home}/.m2/maven.properties"/>
|
|
||||||
<property file="maven-build.properties"/>
|
|
||||||
|
|
||||||
<property name="maven.build.finalName" value="slf4j-log4j12-1.7.6"/>
|
|
||||||
<property name="maven.build.dir" value="target"/>
|
|
||||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
|
||||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
|
||||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
|
||||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
|
||||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
|
||||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
|
||||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
|
||||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
|
||||||
|
|
||||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
|
||||||
<property name="maven.settings.offline" value="false"/>
|
|
||||||
<property name="maven.settings.interactiveMode" value="true"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Defining classpaths -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<path id="build.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
|
|
||||||
</path>
|
|
||||||
<path id="build.test.classpath">
|
|
||||||
<pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
|
|
||||||
<pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Cleaning up target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="clean" description="Clean the output directory">
|
|
||||||
<delete dir="${maven.build.dir}"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile" description="Compile the code">
|
|
||||||
<mkdir dir="${maven.build.outputDir}"/>
|
|
||||||
<javac destdir="${maven.build.outputDir}"
|
|
||||||
nowarn="false"
|
|
||||||
debug="true"
|
|
||||||
optimize="false"
|
|
||||||
deprecation="true"
|
|
||||||
target="1.5"
|
|
||||||
verbose="false"
|
|
||||||
fork="false"
|
|
||||||
source="1.5">
|
|
||||||
<src>
|
|
||||||
<pathelement location="${maven.build.srcDir.0}"/>
|
|
||||||
</src>
|
|
||||||
<classpath refid="build.classpath"/>
|
|
||||||
</javac>
|
|
||||||
<copy todir="${maven.build.outputDir}">
|
|
||||||
<fileset dir="${maven.build.resourceDir.0}"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Test-compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile-tests"
|
|
||||||
depends="compile"
|
|
||||||
description="Compile the test code"
|
|
||||||
unless="maven.test.skip">
|
|
||||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
|
||||||
<javac destdir="${maven.build.testOutputDir}"
|
|
||||||
nowarn="false"
|
|
||||||
debug="true"
|
|
||||||
optimize="false"
|
|
||||||
deprecation="true"
|
|
||||||
target="1.5"
|
|
||||||
verbose="false"
|
|
||||||
fork="false"
|
|
||||||
source="1.5">
|
|
||||||
<src>
|
|
||||||
<pathelement location="${maven.build.testDir.0}"/>
|
|
||||||
</src>
|
|
||||||
<classpath>
|
|
||||||
<path refid="build.test.classpath"/>
|
|
||||||
<pathelement location="${maven.build.outputDir}"/>
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
<copy todir="${maven.build.testOutputDir}">
|
|
||||||
<fileset dir="${maven.build.testResourceDir.0}"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Run all tests -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test"
|
|
||||||
depends="compile-tests, junit-missing"
|
|
||||||
unless="junit.skipped"
|
|
||||||
description="Run the test cases">
|
|
||||||
<mkdir dir="${maven.test.reports}"/>
|
|
||||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
|
||||||
<sysproperty key="basedir" value="."/>
|
|
||||||
<formatter type="xml"/>
|
|
||||||
<formatter type="plain" usefile="false"/>
|
|
||||||
<classpath>
|
|
||||||
<path refid="build.test.classpath"/>
|
|
||||||
<pathelement location="${maven.build.outputDir}"/>
|
|
||||||
<pathelement location="${maven.build.testOutputDir}"/>
|
|
||||||
</classpath>
|
|
||||||
<batchtest todir="${maven.test.reports}" unless="test">
|
|
||||||
<fileset dir="${maven.build.testDir.0}">
|
|
||||||
<include name="**/Test*.java"/>
|
|
||||||
<include name="**/*Test.java"/>
|
|
||||||
<include name="**/*TestCase.java"/>
|
|
||||||
<exclude name="**/AllTest.java"/>
|
|
||||||
<exclude name="**/PackageTest.java"/>
|
|
||||||
</fileset>
|
|
||||||
</batchtest>
|
|
||||||
<batchtest todir="${maven.test.reports}" if="test">
|
|
||||||
<fileset dir="${maven.build.testDir.0}">
|
|
||||||
<include name="**/${test}.java"/>
|
|
||||||
<exclude name="**/AllTest.java"/>
|
|
||||||
<exclude name="**/PackageTest.java"/>
|
|
||||||
</fileset>
|
|
||||||
</batchtest>
|
|
||||||
</junit>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-present">
|
|
||||||
<available classname="junit.framework.Test" property="junit.present"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-status"
|
|
||||||
depends="test-junit-present">
|
|
||||||
<condition property="junit.missing">
|
|
||||||
<and>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<isfalse value="${maven.test.skip}"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<condition property="junit.skipped">
|
|
||||||
<or>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<istrue value="${maven.test.skip}"/>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="junit-missing"
|
|
||||||
depends="test-junit-status"
|
|
||||||
if="junit.missing">
|
|
||||||
<echo>=================================== WARNING ===================================</echo>
|
|
||||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>===============================================================================</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Javadoc target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
|
||||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
|
||||||
packagenames="*"
|
|
||||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
|
||||||
access="protected"
|
|
||||||
old="false"
|
|
||||||
verbose="false"
|
|
||||||
version="true"
|
|
||||||
use="true"
|
|
||||||
author="true"
|
|
||||||
splitindex="false"
|
|
||||||
nodeprecated="false"
|
|
||||||
nodeprecatedlist="false"
|
|
||||||
notree="false"
|
|
||||||
noindex="false"
|
|
||||||
nohelp="false"
|
|
||||||
nonavbar="false"
|
|
||||||
serialwarn="false"
|
|
||||||
charset="ISO-8859-1"
|
|
||||||
linksource="false"
|
|
||||||
breakiterator="false"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Package target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="package" depends="compile,test" description="Package the application">
|
|
||||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
|
||||||
compress="true"
|
|
||||||
index="false"
|
|
||||||
manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF"
|
|
||||||
basedir="${maven.build.outputDir}"
|
|
||||||
excludes="**/package.html"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- A dummy target for the package named after the type it creates -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
<!-- Download dependencies target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="test-offline">
|
|
||||||
<condition property="maven.mode.offline">
|
|
||||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project name="stax-ex" default="jar" basedir=".">
|
|
||||||
<target name="compile">
|
|
||||||
<mkdir dir="build"/>
|
|
||||||
<javac debug="false" srcdir="src" destdir="build" encoding="UTF-8">
|
|
||||||
<classpath>
|
|
||||||
<pathelement path="${classpath}"/>
|
|
||||||
<fileset dir="lib/" includes="**/*.jar"/>
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
<target name="jar" depends="compile">
|
|
||||||
<jar destfile="stax-ex.jar">
|
|
||||||
<fileset dir="build" includes="**/*.class"/>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
@ -1,23 +0,0 @@
|
|||||||
# patch from gcj-overlay, not sure if by geki himself
|
|
||||||
# removes QA warning about strict-aliasing
|
|
||||||
--- callback.c.orig 2006-12-12 17:25:26.000000000 +0100
|
|
||||||
+++ callback.c 2006-12-12 18:11:34.000000000 +0100
|
|
||||||
@@ -250,12 +250,16 @@
|
|
||||||
|
|
||||||
#ifdef JNI_VERSION_1_2
|
|
||||||
if (IS_JNI_1_2) {
|
|
||||||
- (*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2);
|
|
||||||
+ /* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */
|
|
||||||
+ /* jint GetEnv(JavaVM *vm, void **env, jint version); */
|
|
||||||
+ (*jvm)->GetEnv(jvm, (void *)&env, JNI_VERSION_1_2);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (env == NULL) {
|
|
||||||
- (*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
|
|
||||||
+ /* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */
|
|
||||||
+ /* jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args); */
|
|
||||||
+ (*jvm)->AttachCurrentThread(jvm, (void *)&env, NULL);
|
|
||||||
if (IS_JNI_1_2) detach = 1;
|
|
||||||
}
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
Manifest-Version: 1.0
|
|
||||||
Bundle-ManifestVersion: 2
|
|
||||||
Bundle-Name: %pluginName
|
|
||||||
Bundle-Vendor: %providerName
|
|
||||||
Bundle-Localization: plugin
|
|
||||||
Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
|
|
||||||
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
|
|
||||||
Bundle-Version: 3.4.0
|
|
||||||
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
|
|
||||||
Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
|
|
||||||
org.eclipse.swt.internal.cairo; x-internal:=true,
|
|
||||||
org.eclipse.swt.internal.cde; x-internal:=true,
|
|
||||||
org.eclipse.swt.internal.gnome; x-internal:=true,
|
|
||||||
org.eclipse.swt.internal.gtk; x-internal:=true,
|
|
||||||
org.eclipse.swt.internal.mozilla; x-internal:=true,
|
|
||||||
org.eclipse.swt.internal.opengl.glx; x-internal:=true
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue