[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream-3.6, updated. 5dc98a6fe8e928c8a11e307cfdb2d23ca7537089
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Jul 7 23:16:54 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, upstream-3.6 has been updated
via 5dc98a6fe8e928c8a11e307cfdb2d23ca7537089 (commit)
from f14af072718e4a59ea3628896219e30d0ab6f0ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ABOUT.mediawiki | 28 ------------------------
ChangeLog | 27 +++++++++++++++++++++++
README.mediawiki | 24 ---------------------
TODO.mediawiki | 18 ----------------
build.properties | 1 -
build.sh | 44 ---------------------------------------
build.xml | 31 ++++++++++++++++++++++++++-
patches/junit4-nochecksum.patch | 18 ++++++++--------
regenerateBootstrapFiles.sh | 22 +++++++++---------
9 files changed, 77 insertions(+), 136 deletions(-)
diff --git a/ABOUT.mediawiki b/ABOUT.mediawiki
deleted file mode 100644
index 8bc0aa8..0000000
--- a/ABOUT.mediawiki
+++ /dev/null
@@ -1,28 +0,0 @@
-'''About building the Eclipse SDK'''
-
-Building the Eclipse SDK is not a simple process. You can not simply download a
-tarball from eclipse.org and build it. There are a lot of manual interactions
-needed.
-
-'''About eclipse-build'''
-
-With eclipse-build we hope to simplify the build significantly.
-Current plan is to create:
-# Working ant build.
-# Common place and infrastructure for storing/applying patches needed for clean build on various Linux distributions.
-# Standardize the usage of system libraries.
-
-'''Patches and Bugs'''
-
-We are always open to patches to document, clean up, or improve our process. Please open a bug against Technology -> Linux Tools -> Packaging Tools with an attached patch. Please put "[eclipse-build]" at the start of the bug title. Here is a link to follow to open a bug:
-
-http://preview.tinyurl.com/eclipse-build-bug
-
-The current list of open bugs is available via this query:
-
-http://preview.tinyurl.com/eclipse-build-openbugs
-
-'''Current status'''
-
-As of 2009-06-22, it is possible to build the Eclipse SDK entirely from a tarball of the sources. The build procedure is ''very'' similar to
-what is done by the upstream release engineers. The resulting provisioned SDK can be run and have additional software installed into it. See README.mediawiki for more information.
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 5f0540a..10ab39e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2010-07-07 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Fix strip of the patch.
+ * patches/junit4-nochecksum.patch: Rediff patch.
+
+
+2010-07-07 Alexander Kurtakov <akurtako at redhat.com>
+ Remove mediawiki pages which are outdated.
+ * ABOUT.mediawiki: Removed.
+ * README.mediawiki: Removed.
+ * TODO.mediawiki: Removed.
+
+2010-07-07 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.sh: Removed.
+ * build.xml: Save output to log file.
+
+2010-07-06 Alexander Kurtakov <akurtako at redhat.com>
+ Fix for bz#317391 (Benjamin Drung).
+ * build.properties: Remove buildArch it's autoset by buildscript.
+ * build.sh: Remove buildArch checking code.
+ * build.xml: Determine buildArch by ant.
+
+2010-07-06 Alexander Kurtakov <akurtako at redhat.com>
+
+ * regenerateBootstrapFiles.sh: Let launcher dir be a parameter.
+
2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
* buildSDKSource.sh: Remove *.orig files. (Benjamin Drung bz#316525)
diff --git a/README.mediawiki b/README.mediawiki
deleted file mode 100644
index a51157a..0000000
--- a/README.mediawiki
+++ /dev/null
@@ -1,24 +0,0 @@
-This project should provide a simplified build for the Eclipse SDK on Linux
-distributions. The current state is producing a usable eclipse build under build/(build Id)/installation.
-Tasks completed so far:
-# Build pdebuild-ant and its dependencies in the directory bootstrap/plugins (not yet enabled by default)
-# Generate source tarball of entire Eclipse SDK and required other files (buildSDKSource.sh)
-# All plugins and features of org.eclipse.sdk built
-# Use p2 publisher to create metadata for all built components
-# Provision org.eclipse.sdk using p2 director
-
-To test it do the following:
-
-<!-- FIXME: Include SVN instructions as an alternative -->
-* generate source using <tt>./buildSource.sh</tt> (alternatively, look for 3.5.1 sources here: http://download.eclipse.org/technology/linuxtools/eclipse-build/ -- get the tarball for 3.5.1: eclipse-R3_5_1-fetched-src.tar.bz2 and verify its md5sum matches)
-** <tt>./buildSource.sh -workdir /tmp/eclipseSDKBuild</tt>
-* if you are using pre-generated source tarballs, check out basebuilder:
-** <tt>mkdir -p /tmp/eclipseSDKBuild; cd /tmp/eclipseSDKBuild; cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co -r R35_M7 org.eclipse.releng.basebuilder</tt>
-* ensure the directory in which you are running the build contains the generated source tarball of the Eclipse SDK: eclipse-I20090611-1540-fetched-src.tar.bz2 . A symlink is also acceptable.
-* run the build using an existing basebuilder checkout ('''note''': YOUR_ARCH should be in the way eclipse defines archs, e.g i*86 becomes x86, x86_64 is the same. We have yet to test with other archs. Any help is welcome.)
-** <tt>java -jar <basebuilder>/plugins/org.eclipse.equinox.launcher_1.0.200.v20090429-1630.jar -consolelog -data $(pwd)/baseworkspace -Duser.home=$(pwd)/userhome -application org.eclipse.ant.core.antRunner -DbuildArch=YOUR_ARCH -DbaseBuilder=<basebuilder> -Dlauncher=<basebuilder>/plugins/org.eclipse.equinox.launcher_1.0.200.v20090429-1630.jar -Declipse.pdebuild.scripts=<basebuilder>/plugins/org.eclipse.pde.build_3.5.0.v20090430-1420 -DskipFetch=true 2>&1 | tee build.log</tt>
-
-You should get:
-<!-- Not anymore. We need to fix this.
-* all the dependencies of pdebuild-ant in the bootstrap/plugins folder. -->
-* working Eclipse SDK 3.5.1 build in build/(build Id)/installation directory
\ No newline at end of file
diff --git a/TODO.mediawiki b/TODO.mediawiki
deleted file mode 100644
index 3a0c55b..0000000
--- a/TODO.mediawiki
+++ /dev/null
@@ -1,18 +0,0 @@
-Eclipse-build aims at ease the building of the Eclipse SDK especially for Linux distributions.
-
-'''Detailed TODO:'''
-* Fix broken features build.xml caused by source features/plugins generation.
-Workaround for now: Copy back the original after generation is done.
-* Migrate plugins with custom build.xml files to customCallbacks.
-* Check naming of org.eclipse.equinox.http.jetty_1.1.0 with upstream. Version should
-not be part of the name. According to Kim Moir there are 2 equino.http.jetty plugins used in different
-part of the build problem.
-* Hook native compilation in the build.xml.
-* Add a target to create an all-in-one tarball - srcIncluded zip, patches, missing bundles from srcIncluded and the build scripts
-
-'''Overall PLAN:'''
-# Create a working build with upstream srcIncluded build.
-# Create a script to fetch sources from cvs.
-# Fix to properly build with the fetched sources.
-# Put all patches we have in Fedora srpm here so other distros can easily reuse them.
-Others are welcome.
\ No newline at end of file
diff --git a/build.properties b/build.properties
index b243dfb..ec76547 100644
--- a/build.properties
+++ b/build.properties
@@ -10,7 +10,6 @@ featureToBuild=eclipse-build-feature
skipBase=true
skipFetch=true
individualSourceBundles=true
-buildArch=x86
ws=gtk
os=linux
includeLaunchers=true
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 53808ac..0000000
--- a/build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-if `uname -m > /dev/null 2>&1`; then
- arch=`uname -m`
-else
- arch=`uname -p`
-fi
-
-# Massage arch for Eclipse-uname differences
-case ${arch} in
- arm*)
- arch=arm ;;
- i[0-9]*86)
- arch=x86 ;;
- ia64)
- arch=ia64 ;;
- mips*)
- if which dpkg-architecture >/dev/null 2>&1; then
- arch=`dpkg-architecture -qDEB_HOST_ARCH`
- fi ;;
- parisc*)
- arch=PA_RISC ;;
- ppc)
- arch=ppc ;;
- ppc64)
- arch=ppc64 ;;
- x86_64)
- arch=x86_64 ;;
- sparc)
- arch=sparc ;;
- sparcv9)
- arch=sparc ;;
- sparc64)
- arch=sparc64 ;;
- *)
- echo "Unrecognized architecture: $arch" 1>&2
- exit 1 ;;
-esac
-DATE=`date +%Y%m%d%H%M%S`
-
-ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log
-EXIT_CODE=$?
-echo "Build log is available in build_${DATE}.log"
-exit $?
diff --git a/build.xml b/build.xml
index ebedc0d..8439fa3 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,9 @@
<project name="Eclipse SDK build" default="provision.sdk" basedir=".">
+ <tstamp>
+ <format property="timestamp" pattern="yyyyMMddHHmmss"/>
+ </tstamp>
+ <record name="build_${timestamp}.log"/>
+ <echo message="Build log is available in build_${timestamp}.log" />
<property name="baseBuilder" value="${basedir}/bootstrap" />
<property name="launcher" value="${basedir}/bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
<property name="eclipse.pdebuild.scripts" value="${basedir}/bootstrap/plugins/org.eclipse.pde.build/scripts" />
@@ -52,6 +57,30 @@
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
+ <!-- Determine host architecture -->
+ <exec executable="uname" outputproperty="uname-m">
+ <arg line="-m" />
+ </exec>
+ <condition property="hostArch" value="arm">
+ <matches pattern="^arm.*" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="x86">
+ <matches pattern="i[0-9]*86" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="PA_RISC">
+ <matches pattern="^parisc.*" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="sparc">
+ <matches pattern="sparcv9" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="${uname-m}">
+ <not><isset property="hostArch" /></not>
+ </condition>
+ <condition property="buildArch" value="${hostArch}">
+ <not><isset property="buildArch" /></not>
+ </condition>
+ <echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
+
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
<!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
@@ -252,7 +281,7 @@
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.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" />
diff --git a/patches/junit4-nochecksum.patch b/patches/junit4-nochecksum.patch
index 72d7684..76c8753 100644
--- a/patches/junit4-nochecksum.patch
+++ b/patches/junit4-nochecksum.patch
@@ -1,15 +1,14 @@
---- a/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
-+++ b/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
-@@ -28,19 +28,3 @@
- ers.model;version="4.8.1"
- Bundle-Version: 4.8.1.v4_8_1_v20100427-1100
+--- plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF.orig 2010-05-20 01:33:28.000000000 +0300
++++ plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF 2010-07-07 13:23:16.258708324 +0300
+@@ -29,18 +29,4 @@ Export-Package: junit.extensions;version
+ Bundle-Version: 4.8.1.v4_8_1_v20100427-1100
Bundle-ManifestVersion: 2
--
+
-Name: META-INF/eclipse.inf
-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
-
-Name: junit.jar
--SHA1-Digest: zPmrTAyba4ZMLFgf8QAHILhgZ9o=
+-SHA1-Digest: zPmrTAyba4ZMLFgf8QAHILhgZ9o=
-
-Name: about_files/cpl-v10.html
-SHA1-Digest: REygXYi+T14Sj1v8XnnKycNjpN4=
@@ -18,5 +17,6 @@
-SHA1-Digest: w3lIEWRkSmgtAui4qxGRJmqgDw4=
-
-Name: plugin.properties
--SHA1-Digest: f1fR+Wdi2X4qLQSIBEgwenAuk2c=
--
+-SHA1-Digest: f1fR+Wdi2X4qLQSIBEgwenAuk2c=
+-
++
diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
index ebb7187..f815330 100644
--- a/regenerateBootstrapFiles.sh
+++ b/regenerateBootstrapFiles.sh
@@ -1,17 +1,17 @@
-#!/bin/bash
+#!/bin/sh
+set -e
-baseDir=$(pwd)
-workDirectory=
-buildID=R3_5_2
-baseBuilder=
-eclipseBuilder=
-baseBuilderTag="R3_5"
-eclipseBuilderTag="R3_5_2"
-fetchTests="no"
-ecfTag="v20090604-1131"
+usage='usage: $0 <launcherDir>'
+
+launcherDir=$1
+
+if [ "x$launcherDir"x = 'xx' ]; then
+ echo >&2 "$usage"
+ exit 1
+fi
java -jar \
-/home/akurtakov/opt/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+$launcherDir/org.eclipse.equinox.launcher_*.jar \
-consolelog \
-data build/eclipse-3.6.0-src \
-application org.eclipse.ant.core.antRunner \
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list