Simplify initial repo creation.

The eclipse-build initial repo with two manifests is now already
unpacked into a right place, so there is no need to move it. Tycho
bundled jars are no longer unpacked, as Tycho manages to work properly
without them now.

.gitignore

@@ -28,3 +28,4 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
 /results_eclipse
 /eclipse-build-06227d455145aad68156ca408ce96a26beae4714.tar.xz
 /eclipse-build-264db10bec789532541d16baaa8889e4db52298d.tar.xz
+/eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz

eclipse.spec

@@ -9,7 +9,7 @@ Epoch:                  1
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   1
 %global initialize      1
-%global eb_commit       264db10bec789532541d16baaa8889e4db52298d
+%global eb_commit       094a56b8b1222d3535f5dada20290dc91f14d102
 %global build_id        I20120608-1400
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global installation_loc %{_libdir}/%{name}
@@ -69,7 +69,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -471,6 +471,7 @@ sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/ja
    eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
 
 #fix for glib 2.31 not allowing include of anything else but glib
+#This was released into Kepler
 sed -i -e "s|#include <glib/gslist.h>||g" eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
 
 # make sure there are no jars left
@@ -534,22 +535,34 @@ sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launch
 mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
 
 %build
-
+#This is the lowest value where the build succeeds. 512m is not enough.
 export MAVEN_OPTS=-Xmx640m
 
-mkdir -p .m2/p2/repo-sdk/plugins
+pushd .m2/p2/repo-sdk/features
-mkdir -p .m2/p2/repo-sdk/features
+    ln -s /usr/share/java/emf/eclipse/features/* -t .
+popd
 
-%if %{bootstrap} == 1
+pushd .m2/p2/repo-sdk/plugins
-currentDir=`pwd`
 
-pushd repo/emf/eclipse/plugins
+ln -s /usr/share/java/emf/eclipse/plugins/* -t .
-    ln -s %{_javadir}/hamcrest/core.jar
+
-    pushd org.junit_3.8.2.v3_8_2_v20100427-1100
+
+#If Eclipse is present (non-bootstrap build) copy all bundles
+%if %{bootstrap} == 0
+    for f in %{_libdir}/eclipse/plugins/* ; do ln -s $f || echo "$f exists"; done
+    for f in %{_libdir}/eclipse/dropins/jdk/plugins/* ; do ln -s $f || echo "$f exists"; done
+    for f in %{_libdir}/eclipse/dropins/sdk/plugins/* ; do ln -s $f || echo "$f exists"; done
+%endif
+
+#ln -s %{_javadir}/hamcrest/core.jar
+
+#create fake junit3
+pushd org.junit_3.8.2.v3_8_2_v20100427-1100
     ln -s %{_javadir}/junit.jar
-    popd
+popd
-    zip -r org.junit_3.8.2.v3_8_2_v20100427-1100.jar org.junit_3.8.2.v3_8_2_v20100427-1100
+zip -r org.junit_3.8.2.v3_8_2_v20100427-1100.jar org.junit_3.8.2.v3_8_2_v20100427-1100
 
+#symlink ant libraries
 pushd org.apache.ant_1.8.3.v20120321-1730
   mkdir -p lib
     pushd lib
@@ -587,47 +600,8 @@ mkdir -p bin
     popd
 popd
 zip -r org.apache.ant_1.8.3.v20120321-1730.jar org.apache.ant_1.8.3.v20120321-1730
-cd ../..
-unzip %{_javadir}/tycho/tycho-bundles-external.zip
 popd
 
-cp -r /usr/share/java/emf repo
-
-cp -r repo/emf/eclipse/plugins/* .m2/p2/repo-sdk/plugins/
-cp -r repo/emf/eclipse/features/* .m2/p2/repo-sdk/features/
-
-pushd repo/emf/eclipse/plugins/
-mvn-rpmbuild install:install-file -DgroupId=org.eclipse.tycho  \
--DartifactId=org.eclipse.osgi  \
--Dversion=3.8.0.v20120529-1548  \
--Dfile=org.eclipse.osgi_3.8.1.v20121002-1112.jar  \
--Dpackaging=jar \
--DgeneratePom=true -Dmaven.local.mode=true -DskipTychoVersionCheck -DlocalRepositoryPath=../../../../.m2
-
-mvn-rpmbuild install:install-file -DgroupId=org.eclipse.tycho  \
--DartifactId=org.eclipse.jdt.core  \
--Dversion=3.8.1.v20120531-0637  \
--Dfile=%{_javadir}/eclipse-ecj.jar  \
--Dpackaging=jar \
--DgeneratePom=true -Dmaven.local.mode=true -DskipTychoVersionCheck -DlocalRepositoryPath=../../../../.m2
-
-
-id=1
-for p in $(find /usr/share/java -name "*.jar"); do
-   ((unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName') && (plugin=${id}-$(basename $p) ; [ ! -e $plugin ] && ln -s $p $plugin ; id=$((${id} + 1)) ;)) || true;
-done
-
-cd ..
-
-java -jar plugins/org.eclipse.equinox.launcher_*.jar -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
--metadataRepository file:${currentDir}/.m2/p2/repo/ \
--artifactRepository file:${currentDir}/.m2/p2/repo/ \
--source `pwd` \
--compress -append -publishArtifacts
-
-popd
-%endif
-
 mvn-rpmbuild -f eclipse-parent/pom.xml \
    clean install \
    -Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck
@@ -642,9 +616,9 @@ pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
     ant build_eclipse_cbi
 popd 
 
-mvn-rpmbuild clean install \
+mvn-rpmbuild -o clean install \
    -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1))
+   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Dmaven.local.debug
 
 
 pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}
@@ -1356,6 +1330,9 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Wed Nov 7 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-15
+- Simplify initial repo creation.
+
 * Tue Nov 6 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-14
 - Export missing java home.
 

sources

@@ -1,2 +1,2 @@
-862f674def739b7ab7abdf068d3e4c7b  eclipse-build-264db10bec789532541d16baaa8889e4db52298d.tar.xz
+30164141fa99313969cdd32a11d7cf6d  eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz
-e0410f4224b0e4390b553e092e400439  eclipse-source.tar.bz2
+e0410f4224b0e4390b553e092e400439  eclipse-source.tar.bz2