- Add p2 metadata generation to pdebuild
- Fix symlinking to %{_libdir}/eclipse/dropins/* stuff in copy-platform - Fix brightness in splash screen - Fix icon symlinks - Bump icu4j-eclipse requirement
This commit is contained in:
parent
4f4365d996
commit
4e2999319c
|
@ -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,17 @@
|
@@ -0,0 +1,12 @@
|
||||||
+buildDirectory=${sourceDirectory}/build
|
+buildDirectory=${sourceDirectory}/build
|
||||||
+buildLabel=rpmBuild
|
+buildLabel=rpmBuild
|
||||||
+archivePrefix=eclipse
|
+archivePrefix=eclipse
|
||||||
|
@ -276,11 +276,6 @@ 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
|
||||||
|
|
|
@ -216,6 +216,11 @@ $debugPlatformArgs \
|
||||||
-DorbitDepsDir="$orbitDepsDir" \
|
-DorbitDepsDir="$orbitDepsDir" \
|
||||||
-Dp2.root.name="$featureName" \
|
-Dp2.root.name="$featureName" \
|
||||||
-Dp2.root.version="$featureVersion" \
|
-Dp2.root.version="$featureVersion" \
|
||||||
|
-Dgenerate.p2.metadata=true \
|
||||||
|
-Dp2.metadata.repo=file:$buildDir/repo \
|
||||||
|
-Dp2.artifact.repo=file:$buildDir/repo \
|
||||||
|
-Dp2.flavor=tooling \
|
||||||
|
-Dp2.publish.artifacts=true \
|
||||||
$additionalArgs \
|
$additionalArgs \
|
||||||
-f $pdeBuildDir/scripts/build.xml \
|
-f $pdeBuildDir/scripts/build.xml \
|
||||||
-vmargs \
|
-vmargs \
|
||||||
|
@ -234,11 +239,16 @@ if [ $dryRun -ne 1 ]; then
|
||||||
-DsourceDirectory=$sourceDir \
|
-DsourceDirectory=$sourceDir \
|
||||||
-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.name="$featureName" \
|
||||||
-Dp2.root.version=\""$featureVersion\"" \
|
-Dp2.root.version="$featureVersion" \
|
||||||
-Dp2.metadata.repo.name=\""$featureName\"" \
|
-Dp2.metadata.repo.name="$featureName" \
|
||||||
-Dp2.artifact.repo.version=\""$featureVersion\"" \
|
-Dp2.artifact.repo.version="$featureVersion" \
|
||||||
|
-Dgenerate.p2.metadata=true \
|
||||||
|
-Dp2.metadata.repo=file:$buildDir/repo \
|
||||||
|
-Dp2.artifact.repo=file:$buildDir/repo \
|
||||||
|
-Dp2.flavor=tooling \
|
||||||
|
-Dp2.publish.artifacts=true \
|
||||||
$additionalArgs \
|
$additionalArgs \
|
||||||
-f $pdeBuildDir/scripts/build.xml \
|
-f $pdeBuildDir/scripts/build.xml \
|
||||||
-vmargs \
|
-vmargs \
|
||||||
|
|
|
@ -212,7 +212,7 @@ Requires: %{name}-swt = %{epoch}:%{version}-%{release}
|
||||||
# FIXME: investigate. Can we just add a %{arch} to the above?
|
# FIXME: investigate. Can we just add a %{arch} to the above?
|
||||||
## This file-level requirement is for the bi-arch multilib case
|
## This file-level requirement is for the bi-arch multilib case
|
||||||
#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
|
#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
|
||||||
Requires: icu4j-eclipse >= 3.6.1-1jpp.4
|
Requires: icu4j-eclipse >= 3.8.1
|
||||||
Requires: java >= 1.6.0
|
Requires: java >= 1.6.0
|
||||||
|
|
||||||
%description rcp
|
%description rcp
|
||||||
|
@ -1449,11 +1449,12 @@ fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 06 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-17
|
* Wed Aug 06 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-17
|
||||||
- Add p2 metadata generation to package-build and pdebuild
|
- Add p2 metadata generation to pdebuild
|
||||||
- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
|
- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
|
||||||
copy-platform
|
copy-platform
|
||||||
- Fix brightness in splash screen
|
- Fix brightness in splash screen
|
||||||
- Fix icon symlinks
|
- Fix icon symlinks
|
||||||
|
- Bump icu4j-eclipse requirement
|
||||||
|
|
||||||
* 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
|
||||||
|
|
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
|
||||||
be338ba0836dd4edc6b72849b55aae4b org.fedoraproject.ide.platform-3.4.0-1.zip
|
372361ae6f1355ec5cfb9a301ad690f5 org.fedoraproject.ide.platform-3.4.0-1.zip
|
||||||
|
|
Loading…
Reference in New Issue