Attachment 162270 Details for Bug 304112 – compile-xpt.patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] compile-xpt.patch

compile-xpt.patch (text/plain), 2.37 KB, created by Benjamin Drung

on 2010-03-17 08:27:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Drung

Created: 2010-03-17 08:27:40 EDT

Size: 2.37 KB

patch

obsolete

>Index: eclipse-build/patches/eclipse-swt-compile-xpt.patch
>===================================================================
>--- eclipse-build/patches/eclipse-swt-compile-xpt.patch	(Revision 0)
>+++ eclipse-build/patches/eclipse-swt-compile-xpt.patch	(Revision 0)
>@@ -0,0 +1,31 @@
>+Description: Build .xpt file if it does not exit
>+Author: Benjamin Drung
>+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305569
>+
>+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
>++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
>+@@ -24,6 +24,24 @@ if [ "${CC}" = "" ]; then
>+ 	export CC
>+ fi
>+ 
>++COMPONENTS_DIR=$(pwd)/../../org.eclipse.swt/components
>++# Check if we have to compile external.xpt from external.idl
>++if test ! -f ${COMPONENTS_DIR}/external.xpt; then
>++	if test ! -f ${COMPONENTS_DIR}/external.idl; then
>++		echo "Can't find ${COMPONENTS_DIR}/external.idl"
>++		exit 1
>++	fi
>++
>++	IDLDIR=$(pkg-config --variable=idldir libxul | sed 's@/stable$@@')/unstable
>++	if test ! -d ${IDLDIR}; then
>++		IDLDIR=$(pkg-config --variable=idldir libxul)
>++	fi
>++	XPIDL=$(pkg-config --variable=sdkdir libxul)/bin/xpidl
>++
>++	echo "${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl"
>++	${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl
>++fi
>++
>+ # Determine which OS we are on
>+ if [ "${OS}" = "" ]; then
>+ 	OS=`uname -s`
>Index: eclipse-build/build.xml
>===================================================================
>--- eclipse-build/build.xml	(Revision 24437)
>+++ eclipse-build/build.xml	(Arbeitskopie)
>@@ -256,6 +256,7 @@
> 		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
> 		<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}"  strip="0" />
> 		<patch patchfile="${basedir}/patches/addEcfQualifiers.patch" dir="${buildDirectory}"  strip="0" />
>+		<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}"  strip="1" />
> 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
> 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
>

Actions: View | Diff

Attachments on bug 304112: 160372 | 160382 | 160628 | 161034 | 162120 | 162270 | 173962 | 173973