- Add p2 metadata generation to package-build and pdebuild
- Fix symlinking to %{_libdir}/eclipse/dropins/* stuff in copy-platform - Fix brightness in splash screen - Fix icon symlinks
This commit is contained in:
parent
c2c49f8540
commit
4f4365d996
@ -51,7 +51,7 @@ if [ $# -gt 0 ]; then
|
|||||||
(cd $eclipse/dropins/$f; ls -d plugins/* features/*) |
|
(cd $eclipse/dropins/$f; ls -d plugins/* features/*) |
|
||||||
while read g; do
|
while read g; do
|
||||||
[ ! -e $g ] && \
|
[ ! -e $g ] && \
|
||||||
ln -s $eclipse/dropins/$g $g
|
ln -s $eclipse/dropins/$f/$g $g
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -263,7 +263,7 @@ RCS file: templates/package-build/build.properties
|
|||||||
diff -N templates/package-build/build.properties
|
diff -N templates/package-build/build.properties
|
||||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||||
+++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000
|
+++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000
|
||||||
@@ -0,0 +1,12 @@
|
@@ -0,0 +1,17 @@
|
||||||
+buildDirectory=${sourceDirectory}/build
|
+buildDirectory=${sourceDirectory}/build
|
||||||
+buildLabel=rpmBuild
|
+buildLabel=rpmBuild
|
||||||
+archivePrefix=eclipse
|
+archivePrefix=eclipse
|
||||||
@ -276,6 +276,11 @@ diff -N templates/package-build/build.properties
|
|||||||
+archiveName=${id}.zip
|
+archiveName=${id}.zip
|
||||||
+runPackager=false
|
+runPackager=false
|
||||||
+baseLocation=/usr/share/eclipse
|
+baseLocation=/usr/share/eclipse
|
||||||
|
+generate.p2.metadata=true
|
||||||
|
+p2.metadata.repo = file:${buildDirectory}/repo
|
||||||
|
+p2.artifact.repo = file:${buildDirectory}/repo
|
||||||
|
+p2.flavor = tooling
|
||||||
|
+p2.publish.artifacts=true
|
||||||
Index: templates/package-build/symlink-deps.sh
|
Index: templates/package-build/symlink-deps.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
RCS file: templates/package-build/symlink-deps.sh
|
RCS file: templates/package-build/symlink-deps.sh
|
||||||
|
@ -71,6 +71,33 @@ function findFeatureId {
|
|||||||
rm $buildFile
|
rm $buildFile
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function findFeatureNameAndVersion {
|
||||||
|
featureXml=$(find $sourceDir -name feature.xml | while read f; do grep -l id=\"$featureId\" $f; done)
|
||||||
|
|
||||||
|
buildFile=$buildDir/findFeatureForRPM-tmp-build.xml
|
||||||
|
|
||||||
|
echo "<project default=\"main\">
|
||||||
|
<target name=\"main\">
|
||||||
|
<xmlproperty file=\"$featureXml\" collapseAttributes=\"true\"/>
|
||||||
|
<fail unless=\"feature.id\" message=\"feature.id not set\"/>
|
||||||
|
<echo message=\"\${feature.label}\" />
|
||||||
|
</target>
|
||||||
|
</project>" > $buildFile
|
||||||
|
|
||||||
|
featureName=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //")
|
||||||
|
rm $buildFile
|
||||||
|
|
||||||
|
echo "<project default=\"main\">
|
||||||
|
<target name=\"main\">
|
||||||
|
<xmlproperty file=\"$featureXml\" collapseAttributes=\"true\"/>
|
||||||
|
<fail unless=\"feature.id\" message=\"feature.id not set\"/>
|
||||||
|
<echo message=\"\${feature.version}\" />
|
||||||
|
</target>
|
||||||
|
</project>" > $buildFile
|
||||||
|
|
||||||
|
featureVersion=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //")
|
||||||
|
rm $buildFile
|
||||||
|
}
|
||||||
sourceDir=$PWD
|
sourceDir=$PWD
|
||||||
buildDir=$PWD/build
|
buildDir=$PWD/build
|
||||||
SDK=$buildDir/SDK
|
SDK=$buildDir/SDK
|
||||||
@ -148,6 +175,8 @@ if [ -z $featureId ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
findFeatureNameAndVersion
|
||||||
|
|
||||||
echo "Building feature = $featureId."
|
echo "Building feature = $featureId."
|
||||||
|
|
||||||
if [ -z "$dependencies" ]; then
|
if [ -z "$dependencies" ]; then
|
||||||
@ -185,6 +214,8 @@ $debugPlatformArgs \
|
|||||||
-DbuildDirectory=$buildDir \
|
-DbuildDirectory=$buildDir \
|
||||||
-Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
|
-Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
|
||||||
-DorbitDepsDir="$orbitDepsDir" \
|
-DorbitDepsDir="$orbitDepsDir" \
|
||||||
|
-Dp2.root.name="$featureName" \
|
||||||
|
-Dp2.root.version="$featureVersion" \
|
||||||
$additionalArgs \
|
$additionalArgs \
|
||||||
-f $pdeBuildDir/scripts/build.xml \
|
-f $pdeBuildDir/scripts/build.xml \
|
||||||
-vmargs \
|
-vmargs \
|
||||||
@ -204,9 +235,22 @@ if [ $dryRun -ne 1 ]; then
|
|||||||
-DbuildDirectory=$buildDir \
|
-DbuildDirectory=$buildDir \
|
||||||
-Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
|
-Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
|
||||||
-DorbitDepsDir=\""$orbitDepsDir"\" \
|
-DorbitDepsDir=\""$orbitDepsDir"\" \
|
||||||
|
-Dp2.root.name=\""$featureName\"" \
|
||||||
|
-Dp2.root.version=\""$featureVersion\"" \
|
||||||
|
-Dp2.metadata.repo.name=\""$featureName\"" \
|
||||||
|
-Dp2.artifact.repo.version=\""$featureVersion\"" \
|
||||||
$additionalArgs \
|
$additionalArgs \
|
||||||
-f $pdeBuildDir/scripts/build.xml \
|
-f $pdeBuildDir/scripts/build.xml \
|
||||||
-vmargs \
|
-vmargs \
|
||||||
-Duser.home=$homeDir \
|
-Duser.home=$homeDir \
|
||||||
$vmArgs
|
$vmArgs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Add content.xml into zip
|
||||||
|
pushd $buildDir/rpmBuild
|
||||||
|
unzip $featureId.zip
|
||||||
|
rm $featureId.zip
|
||||||
|
cp -p ../repo/content.xml eclipse
|
||||||
|
zip -r $featureId.zip eclipse
|
||||||
|
rm -rf eclipse
|
||||||
|
popd
|
||||||
|
15
eclipse.spec
15
eclipse.spec
@ -27,7 +27,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 16%{?dist}
|
Release: 17%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -1021,13 +1021,13 @@ ln -s %{_javadir}/ecj-%{version}.jar \
|
|||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
|
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
|
||||||
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \
|
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_3.4.0/eclipse48.png \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
|
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
|
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
|
||||||
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse32.png \
|
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_3.4.0/eclipse32.png \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
|
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
|
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
|
||||||
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse.png \
|
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_3.4.0/eclipse.png \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
|
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||||
ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||||
@ -1448,6 +1448,13 @@ fi
|
|||||||
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 06 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-17
|
||||||
|
- Add p2 metadata generation to package-build and pdebuild
|
||||||
|
- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
|
||||||
|
copy-platform
|
||||||
|
- Fix brightness in splash screen
|
||||||
|
- Fix icon symlinks
|
||||||
|
|
||||||
* Tue Aug 05 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-16
|
* Tue Aug 05 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-16
|
||||||
- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
|
- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
|
||||||
- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
|
- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
|
||||||
|
2
sources
2
sources
@ -3,4 +3,4 @@ e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
|
|||||||
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
|
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
|
||||||
555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip
|
555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip
|
||||||
485f281cd968bf30d5266dc254004b1e eclipse-ecj-gcj.tar.bz2
|
485f281cd968bf30d5266dc254004b1e eclipse-ecj-gcj.tar.bz2
|
||||||
3b057b12f346de131bf7039965ca0c2e org.fedoraproject.ide.platform-3.4.0-1.zip
|
be338ba0836dd4edc6b72849b55aae4b org.fedoraproject.ide.platform-3.4.0-1.zip
|
||||||
|
Loading…
Reference in New Issue
Block a user