From: | "Miroslav Sulc (fordfrog)" <fordfrog@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-java/netbeans-platform: ChangeLog netbeans-platform-7.1.2.ebuild |
Date: | Thu, 26 Apr 2012 21:50:48 |
Message-Id: | 20120426215038.6F3552004B@flycatcher.gentoo.org |
1 | fordfrog 12/04/26 21:50:38 |
2 | |
3 | Modified: ChangeLog |
4 | Added: netbeans-platform-7.1.2.ebuild |
5 | Log: |
6 | dev-java/netbeans-platform: version bump in 7.1 slot |
7 | |
8 | (Portage version: 2.1.10.57/cvs/Linux x86_64) |
9 | |
10 | Revision Changes Path |
11 | 1.12 dev-java/netbeans-platform/ChangeLog |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.12&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.12&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?r1=1.11&r2=1.12 |
16 | |
17 | Index: ChangeLog |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v |
20 | retrieving revision 1.11 |
21 | retrieving revision 1.12 |
22 | diff -u -r1.11 -r1.12 |
23 | --- ChangeLog 5 Mar 2012 14:07:39 -0000 1.11 |
24 | +++ ChangeLog 26 Apr 2012 21:50:38 -0000 1.12 |
25 | @@ -1,6 +1,12 @@ |
26 | # ChangeLog for dev-java/netbeans-platform |
27 | # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.11 2012/03/05 14:07:39 fordfrog Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.12 2012/04/26 21:50:38 fordfrog Exp $ |
30 | + |
31 | +*netbeans-platform-7.1.2 (26 Apr 2012) |
32 | + |
33 | + 26 Apr 2012; Miroslav Ć ulc <fordfrog@g.o> |
34 | + +netbeans-platform-7.1.2.ebuild: |
35 | + Version bump in 7.1 slot |
36 | |
37 | *netbeans-platform-7.1.1 (05 Mar 2012) |
38 | |
39 | |
40 | |
41 | |
42 | 1.1 dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild |
43 | |
44 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.1&view=markup |
45 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.1&content-type=text/plain |
46 | |
47 | Index: netbeans-platform-7.1.2.ebuild |
48 | =================================================================== |
49 | # Copyright 1999-2012 Gentoo Foundation |
50 | # Distributed under the terms of the GNU General Public License v2 |
51 | # $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v 1.1 2012/04/26 21:50:38 fordfrog Exp $ |
52 | |
53 | EAPI="4" |
54 | WANT_ANT_TASKS="ant-nodeps" |
55 | inherit eutils java-pkg-2 java-ant-2 |
56 | |
57 | DESCRIPTION="Netbeans Platform" |
58 | HOMEPAGE="http://netbeans.org/features/platform/" |
59 | SLOT="7.1" |
60 | SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip" |
61 | SRC_URI="${SOURCE_URL} |
62 | http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 |
63 | http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar |
64 | http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar |
65 | http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar |
66 | http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar |
67 | http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip" |
68 | LICENSE="|| ( CDDL GPL-2-with-linking-exception )" |
69 | KEYWORDS="~amd64 ~x86" |
70 | IUSE="" |
71 | S="${WORKDIR}" |
72 | |
73 | CDEPEND="dev-java/javahelp:0 |
74 | >=dev-java/jna-3.2.7:0 |
75 | dev-java/swing-layout:1[source]" |
76 | DEPEND="virtual/jdk:1.6 |
77 | app-arch/unzip |
78 | ${CDEPEND}" |
79 | RDEPEND=">=virtual/jdk-1.6 |
80 | ${CDEPEND}" |
81 | |
82 | INSTALL_DIR="/usr/share/${PN}-${SLOT}" |
83 | |
84 | EANT_BUILD_XML="nbbuild/build.xml" |
85 | EANT_BUILD_TARGET="rebuild-cluster" |
86 | EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true" |
87 | EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7" |
88 | JAVA_PKG_BSFIX="off" |
89 | |
90 | src_unpack() { |
91 | unpack $(basename ${SOURCE_URL}) |
92 | |
93 | einfo "Deleting bundled jars..." |
94 | find -name "*.jar" -type f -delete |
95 | |
96 | unpack netbeans-9999-r1-build.xml.patch.bz2 |
97 | |
98 | pushd "${S}" >/dev/null || die |
99 | ln -s "${DISTDIR}"/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar libs.felix/external/felix-3.2.2.jar || die |
100 | ln -s "${DISTDIR}"/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar netbinox/external/org.eclipse.osgi_3.6.0.v20100517.jar || die |
101 | ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die |
102 | ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.jar || die |
103 | ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die |
104 | popd >/dev/null || die |
105 | } |
106 | |
107 | src_prepare() { |
108 | einfo "Deleting bundled class files..." |
109 | find -name "*.class" -type f | xargs rm -vf |
110 | |
111 | epatch netbeans-9999-r1-build.xml.patch |
112 | # upstream jna jar contains bundled binary libraries so we disable that feature |
113 | |
114 | # Support for custom patches |
115 | if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then |
116 | local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f` |
117 | |
118 | if [ -n "${files}" ] ; then |
119 | einfo "Applying custom patches:" |
120 | |
121 | for file in ${files} ; do |
122 | epatch "${file}" |
123 | done |
124 | fi |
125 | fi |
126 | |
127 | einfo "Symlinking external libraries..." |
128 | java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar |
129 | java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar |
130 | java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar |
131 | java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar |
132 | ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die |
133 | |
134 | java-pkg-2_src_prepare |
135 | } |
136 | |
137 | src_compile() { |
138 | unset DISPLAY |
139 | eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed" |
140 | } |
141 | |
142 | src_install() { |
143 | pushd nbbuild/netbeans/platform >/dev/null || die |
144 | |
145 | java-pkg_dojar lib/*.jar |
146 | grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die |
147 | |
148 | insinto ${INSTALL_DIR} |
149 | doins -r * |
150 | rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die |
151 | dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip |
152 | find "${D}"/${INSTALL_DIR} -name "*.exe" -delete |
153 | find "${D}"/${INSTALL_DIR} -name "*.dll" -delete |
154 | rm -fr "${D}"/modules/lib || die |
155 | |
156 | popd >/dev/null || die |
157 | |
158 | fperms 775 ${INSTALL_DIR}/lib/nbexec |
159 | dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT} |
160 | |
161 | local instdir=${INSTALL_DIR}/modules/ext |
162 | pushd "${D}"/${instdir} >/dev/null || die |
163 | # felix-main-2.0.2.jar |
164 | # felix-2.0.3.jar |
165 | rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die |
166 | rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die |
167 | # osgi.cmpn-4.2.jar |
168 | # osgi.core-4.2.jar |
169 | rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.jar || die |
170 | rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die |
171 | # updater.jar |
172 | popd >/dev/null || die |
173 | |
174 | dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform |
175 | } |