diff options
| -rw-r--r-- | dev-util/ecletex/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/ecletex/Manifest | 7 | ||||
| -rw-r--r-- | dev-util/ecletex/ecletex-0.0.3.ebuild | 53 | ||||
| -rw-r--r-- | dev-util/ecletex/files/build.properties-0.0.3 | 2 | ||||
| -rw-r--r-- | dev-util/ecletex/files/build.xml-0.0.3 | 3 |
5 files changed, 63 insertions, 11 deletions
diff --git a/dev-util/ecletex/ChangeLog b/dev-util/ecletex/ChangeLog index 2a22b5e6baa7..1953861aee4d 100644 --- a/dev-util/ecletex/ChangeLog +++ b/dev-util/ecletex/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/ecletex -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ChangeLog,v 1.8 2004/12/21 21:45:54 karltk Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ChangeLog,v 1.9 2005/02/10 23:53:52 karltk Exp $ + + 11 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org> + +files/build.properties-0.0.3, files/build.xml-0.0.3, + ecletex-0.0.3.ebuild: + Partial fix for #81272. Still not resolving gtk jars correctly. 15 Nov 2004; Karl Trygve Kalleberg <karltk@gentoo.org> -files/build.xml-0.0.2, -ecletex-0.0.2.ebuild, ecletex-0.0.3.ebuild: diff --git a/dev-util/ecletex/Manifest b/dev-util/ecletex/Manifest index d9067f8d2cfd..baed818721ce 100644 --- a/dev-util/ecletex/Manifest +++ b/dev-util/ecletex/Manifest @@ -1,5 +1,6 @@ -MD5 69221c32d6f73a044d8ff481ce92d7e4 ecletex-0.0.3.ebuild 1776 -MD5 f69aab1fc7a97ade79a9bafe9c1d2da3 ChangeLog 906 +MD5 ca7281c350743bc80ffc6c253fc7c277 ecletex-0.0.3.ebuild 2445 +MD5 142aeb3e2b0f9cd609d6de6a0445417d ChangeLog 1110 MD5 a019ed743e7db3b8bcf517a492f1ed03 metadata.xml 496 MD5 e6f8663a52b0283c846324a27681fbb8 files/digest-ecletex-0.0.3 63 -MD5 338e7b12c6a7d4317433c04b9b373265 files/build.xml-0.0.3 7181 +MD5 3fcc2a7a525e2ab6e359462c4bf050a4 files/build.xml-0.0.3 5789 +MD5 b094a7dfce36d273c8f310f0fc83af06 files/build.properties-0.0.3 1456 diff --git a/dev-util/ecletex/ecletex-0.0.3.ebuild b/dev-util/ecletex/ecletex-0.0.3.ebuild index a4630914be1d..e73271d1c5c6 100644 --- a/dev-util/ecletex/ecletex-0.0.3.ebuild +++ b/dev-util/ecletex/ecletex-0.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ecletex-0.0.3.ebuild,v 1.4 2004/11/15 10:57:58 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ecletex-0.0.3.ebuild,v 1.5 2005/02/10 23:53:52 karltk Exp $ inherit eclipse-ext @@ -28,6 +28,46 @@ pkg_setup() { eclipse-ext_require-slot 3 || die "No suitable Eclipse found!" } +get-classpath() { + + local file=$1 + local envvar="classpath" + + if [ "$1" == "build.properties" ] ; then + if [ ! -z "$2" ] ; then + envvar="$2" + fi + fi + + echo "$(cat ${FILESDIR}/build.properties-${PV} | sed "s/.*=//" | tr ';' ' ')" +} + +get-plugin-name() { + + echo $1 | sed -r "s/(.*)_[0-9.]+/\1/" +} + +resolve-jars() { + + eclipse_dir=/usr/lib/eclipse-3 + + local resolved="" + + for x in $1 ; do + local jarfile=$(basename $x) + local plugindir=$(basename $(dirname $x)) + local name="$(get-plugin-name $plugindir)" + local x=$(echo ${eclipse_dir}/plugins/${name}_*/${jarfile}) + if [ -f ${x} ] ; then + resolved="${resolved}:$x" + else + : + #echo "Warning: did not find ${name}" + fi + done + echo ${resolved} +} + src_unpack() { mkdir -p ${S} cd ${S} @@ -40,9 +80,12 @@ src_unpack() { echo "temp.folder=dist" > build.properties || die "Failed to create build.propertes" cp ${FILESDIR}/build.xml-${PV} build.xml || die "Failed to add build.xml" - local cp=$(eclipse-ext_get-classpath-from-build build.xml) - cp=$(eclipse-ext_resolve-classpath ${cp}) - eclipse-ext_rewrite-classpath ${cp} build.xml + + x="$(get-classpath build.properties)" + y=$(resolve-jars "$x") + + echo "classpath = $y" > build.properties + mkdir -p final/ish.ecletex_${PV} } diff --git a/dev-util/ecletex/files/build.properties-0.0.3 b/dev-util/ecletex/files/build.properties-0.0.3 new file mode 100644 index 000000000000..be9daff9decf --- /dev/null +++ b/dev-util/ecletex/files/build.properties-0.0.3 @@ -0,0 +1,2 @@ + +classpath = ext/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar;ext/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar;ext/org.eclipse.core.boot_3.0.0/boot.jar;ext/org.eclipse.core.runtime_3.0.0/runtime.jar;;ext/org.eclipse.osgi_3.0.0/osgi.jar;ext/org.eclipse.osgi_3.0.0/core.jar;ext/org.eclipse.osgi_3.0.0/resolver.jar;ext/org.eclipse.osgi_3.0.0/defaultAdaptor.jar;ext/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar;ext/org.eclipse.osgi_3.0.0/console.jar;ext/org.eclipse.osgi.services_3.0.0/services.jar;ext/org.eclipse.osgi.util_3.0.0/util.jar;ext/org.eclipse.ui_3.0.0/ui.jar;ext/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar;ext/org.eclipse.update.configurator_3.0.0/configurator.jar;ext/org.eclipse.help_3.0.0/help.jar;;ext/org.eclipse.jface_3.0.0/jface.jar;ext/org.eclipse.ui.workbench_3.0.0/compatibility.jar;ext/org.eclipse.ui.workbench_3.0.0/workbench.jar;ext/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar;ext/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar;ext/org.eclipse.jface.text_3.0.0/jfacetext.jar;ext/org.eclipse.text_3.0.0/text.jar;ext/org.eclipse.ui.editors_3.0.0/editors.jar;ext/org.eclipse.ui.ide_3.0.0/ide.jar;ext/org.eclipse.core.resources_3.0.0/resources.jar;ext/org.eclipse.ui.views_3.0.0/views.jar;ext/org.eclipse.update.core_3.0.0/updatecore.jar;ext/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar;ext/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar;ext/org.eclipse.ui.forms_3.0.0/forms.jar diff --git a/dev-util/ecletex/files/build.xml-0.0.3 b/dev-util/ecletex/files/build.xml-0.0.3 index 81abf9d441ef..bf03ac3ce9af 100644 --- a/dev-util/ecletex/files/build.xml-0.0.3 +++ b/dev-util/ecletex/files/build.xml-0.0.3 @@ -2,6 +2,7 @@ <project name="ish.ecletex" default="build.jars" basedir="."> <property name="bootclasspath" value=""/> + <property file="build.properties" /> <property name="basews" value="${ws}"/> <property name="baseos" value="${os}"/> <property name="basearch" value="${arch}"/> @@ -47,7 +48,7 @@ <delete dir="${temp.folder}/ecletex.jar.bin"/> <mkdir dir="${temp.folder}/ecletex.jar.bin"/> <!-- compile the source code --> - <javac destdir="${temp.folder}/ecletex.jar.bin" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="ext/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar;ext/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar;ext/org.eclipse.core.boot_3.0.0/boot.jar;ext/org.eclipse.core.runtime_3.0.0/runtime.jar;;ext/org.eclipse.osgi_3.0.0/osgi.jar;ext/org.eclipse.osgi_3.0.0/core.jar;ext/org.eclipse.osgi_3.0.0/resolver.jar;ext/org.eclipse.osgi_3.0.0/defaultAdaptor.jar;ext/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar;ext/org.eclipse.osgi_3.0.0/console.jar;ext/org.eclipse.osgi.services_3.0.0/services.jar;ext/org.eclipse.osgi.util_3.0.0/util.jar;ext/org.eclipse.ui_3.0.0/ui.jar;ext/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar;ext/org.eclipse.update.configurator_3.0.0/configurator.jar;ext/org.eclipse.help_3.0.0/help.jar;;ext/org.eclipse.jface_3.0.0/jface.jar;ext/org.eclipse.ui.workbench_3.0.0/compatibility.jar;ext/org.eclipse.ui.workbench_3.0.0/workbench.jar;ext/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar;ext/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar;ext/org.eclipse.jface.text_3.0.0/jfacetext.jar;ext/org.eclipse.text_3.0.0/text.jar;ext/org.eclipse.ui.editors_3.0.0/editors.jar;ext/org.eclipse.ui.ide_3.0.0/ide.jar;ext/org.eclipse.core.resources_3.0.0/resources.jar;ext/org.eclipse.ui.views_3.0.0/views.jar;ext/org.eclipse.update.core_3.0.0/updatecore.jar;ext/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar;ext/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar;ext/org.eclipse.ui.forms_3.0.0/forms.jar" source="${javacSource}" target="${javacTarget}" > + <javac destdir="${temp.folder}/ecletex.jar.bin" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="${classpath}" source="${javacSource}" target="${javacTarget}" > <!-- --> <src path="src/" /> </javac> |