- Fix typo in gcj db building loops.
- Add -O1 to x86_64 jar.so compilation. - Add EFJ (Eclipse Formatter for Java) patches (bkonrath) (e.o#75333). - Add patch to build swttools.jar (e.o#90364).
This commit is contained in:
Andrew Overholt
parent
351ba52054
commit
a1ebed49c5
|
|
@ -0,0 +1,26 @@
|
|||
Index: build.xml
|
||||
===================================================================
|
||||
RCS file: /home/eclipse/org.eclipse.swt.gtk64/build.xml,v
|
||||
retrieving revision 1.43
|
||||
diff -u -r1.43 build.xml
|
||||
--- build.xml 18 Mar 2005 13:45:25 -0000 1.43
|
||||
+++ build.xml 5 Apr 2005 22:27:49 -0000
|
||||
@@ -20,7 +20,6 @@
|
||||
|
||||
<target name="properties" if="eclipse.running">
|
||||
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
|
||||
- <!--compile the jar in org.eclipse.swt.tools-->
|
||||
</target>
|
||||
|
||||
<target name="build.update.jar" depends="init">
|
||||
@@ -188,6 +187,10 @@
|
||||
</target>
|
||||
|
||||
<target name="build.cfiles" depends="build.jars">
|
||||
+ <!--compile the jar in org.eclipse.swt.tools-->
|
||||
+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
|
||||
+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
|
||||
+
|
||||
<!-- generate the C code from the (64 bit) SWT PI java classes -->
|
||||
<!-- assumes the swt.jar has already been built -->
|
||||
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
|
||||
30
eclipse.spec
30
eclipse.spec
|
|
@ -22,7 +22,7 @@ ExclusiveArch: i386 x86_64 ppc
|
|||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
|
||||
Release: 0.M5.17
|
||||
Release: 0.M5.18
|
||||
License: CPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -80,6 +80,12 @@ Patch16: %{name}-find.patch
|
|||
# Bootstrap the build a la https://bugs.eclipse.org/bugs/show_bug.cgi?id=84914
|
||||
# ... the patch is a bit hacky at the moment
|
||||
Patch17: %{name}-bootstrap.patch
|
||||
# Build swttools.jar
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
|
||||
Patch18: %{name}-swttools.patch
|
||||
# Add command-line source code formatter
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=75333
|
||||
Patch19: %{name}-efj.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: ant
|
||||
|
|
@ -224,6 +230,12 @@ rm -f activeHelpSample.jar
|
|||
popd
|
||||
%patch16 -p0
|
||||
%patch17 -p1
|
||||
pushd plugins/org.eclipse.swt.gtk64
|
||||
%patch18 -p0
|
||||
popd
|
||||
pushd plugins/org.eclipse.jdt.core
|
||||
%patch19 -p0
|
||||
popd
|
||||
|
||||
# Red Hat splash screen.
|
||||
pushd plugins/org.eclipse.platform
|
||||
|
|
@ -459,7 +471,7 @@ rm -f plugins/org.junit_3.8.1/junit.jar
|
|||
d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
|
||||
mkdir -p $d;
|
||||
s=`echo $j | sed "s:\./::"`;
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O1 \
|
||||
-o $d/`basename $j`.so $j;
|
||||
done
|
||||
%endif
|
||||
|
|
@ -694,7 +706,7 @@ gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
|
|||
for dir in `cat %{SOURCE7}`; do
|
||||
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
|
||||
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
|
||||
if [ -f $RPM_BUILD_ROOT/$lib ]; then
|
||||
if [ -f $lib ]; then
|
||||
gcj-dbtool -f $gcjdbdir/%{name}-jdt.db \
|
||||
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
|
||||
fi;
|
||||
|
|
@ -705,7 +717,7 @@ done
|
|||
for dir in `cat %{SOURCE8}`; do
|
||||
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
|
||||
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
|
||||
if [ -f $RPM_BUILD_ROOT/$lib ]; then
|
||||
if [ -f $lib ]; then
|
||||
gcj-dbtool -f $gcjdbdir/%{name}-pde.db \
|
||||
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
|
||||
fi;
|
||||
|
|
@ -716,7 +728,7 @@ done
|
|||
for dir in `cat %{SOURCE9}`; do
|
||||
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
|
||||
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
|
||||
if [ -f $RPM_BUILD_ROOT/$lib ]; then
|
||||
if [ -f $lib ]; then
|
||||
gcj-dbtool -f $gcjdbdir/%{name}-platform.db \
|
||||
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
|
||||
fi;
|
||||
|
|
@ -727,7 +739,7 @@ done
|
|||
for dir in `cat %{SOURCE10}`; do
|
||||
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
|
||||
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
|
||||
if [ -f $RPM_BUILD_ROOT/$lib ]; then
|
||||
if [ -f $lib ]; then
|
||||
gcj-dbtool -f $gcjdbdir/libswt3-gtk2.db \
|
||||
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
|
||||
fi;
|
||||
|
|
@ -980,6 +992,12 @@ rebuild-gcj-db %{_libdir}
|
|||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
|
||||
|
||||
%changelog
|
||||
* Wed Apr 06 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.18
|
||||
- Fix typo in gcj db building loops.
|
||||
- Add -O1 to x86_64 jar.so compilation.
|
||||
- Add EFJ (Eclipse Formatter for Java) patches (bkonrath) (e.o#75333).
|
||||
- Add patch to build swttools.jar (e.o#90364).
|
||||
|
||||
* Mon Apr 04 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.17
|
||||
- Actually insert .jar-.jar.so combinations into sub-dbs.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue