diff options
| author | spingel | 2010-04-25 04:22:13 +0000 |
|---|---|---|
| committer | spingel | 2010-04-25 04:22:13 +0000 |
| commit | 5bdc08e098e9b466572be4d7b738df14d22acd57 (patch) | |
| tree | 3d126082d543a054d04c55381930887381250511 /examples | |
| parent | c3b43b95d3f89781852098b2660b4bcc1eb40ddc (diff) | |
| download | rt.equinox.p2-5bdc08e098e9b466572be4d7b738df14d22acd57.tar.gz rt.equinox.p2-5bdc08e098e9b466572be4d7b738df14d22acd57.tar.xz rt.equinox.p2-5bdc08e098e9b466572be4d7b738df14d22acd57.zip | |
NEW - bug 309874: [discovery] provide RCP example for discovery based extension install
https://bugs.eclipse.org/bugs/show_bug.cgi?id=309874
Diffstat (limited to 'examples')
4 files changed, 22 insertions, 9 deletions
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/Build Cloud Example.launch b/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/Build Cloud Example.launch index 9da6e2c17..c2eb88df9 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/Build Cloud Example.launch +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/Build Cloud Example.launch @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties b/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties index 3f64da774..d8e85b5a7 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties @@ -12,7 +12,7 @@ product=/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product runPackager=true p2.gathering=true - p2.metadata.repo=file:${builder}/repository +p2.metadata.repo=file:${builder}/repository p2.artifact.repo=file:${builder}/repository #Set the name of the archive that will result from the product build. @@ -28,7 +28,8 @@ collectingFolder=${archivePrefix} # value is a '&' separated list of ',' separate triples. For example, # configs=win32,win32,x86 & linux,motif,x86 # By default the value is *,*,* -configs = win32, win32, x86 +configs = win32, win32, x86 & \ + linux, gtk, x86 & #configs=win32, win32, x86 & \ # linux, gtk, ppc &\ # linux, gtk, x86 & \ diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/buildProduct.xml b/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/buildProduct.xml index 2f1b9a970..eb3d38eb9 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/buildProduct.xml +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/buildProduct.xml @@ -10,9 +10,23 @@ <property name="builder" value="${basedir}" /> <property name="buildDirectory" value="${basedir}/buildDirectory"/> - <property name="pluginPath" value="${basedir}/..${path.separator}${deltapack}" /> + <property name="pluginPath" value="${deltapack}" /> <property name="buildTempFolder" value="${buildDirectory}" /> - + + <!-- Clean build directory and workspace --> + <delete includeemptydirs="true" failonerror="false"> + <fileset dir="${basedir}/buildDirectory"/> + <fileset dir="${basedir}/repository"/> + </delete> + + <!-- Copy plug-ins from workspace --> + <copy todir="${buildDirectory}/plugins"> + <fileset dir="${basedir}/.."> + <include name="org.eclipse.equinox.p2.examples.rcp.cloud/**/*"/> + <exclude name="**/bin/**"/> + </fileset> + </copy> + <ant antfile="${eclipse.pdebuild.scripts}/productBuild/productBuild.xml" /> <move todir="${basedir}"> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product index a95f241f8..917ae236f 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product @@ -63,10 +63,8 @@ <plugin id="org.eclipse.equinox.p2.core"/> <plugin id="org.eclipse.equinox.p2.director"/> <plugin id="org.eclipse.equinox.p2.directorywatcher"/> - <plugin id="org.eclipse.equinox.p2.discovery"/> - <plugin id="org.eclipse.equinox.p2.discovery.compatibility"/> <plugin id="org.eclipse.equinox.p2.engine"/> - <plugin id="org.eclipse.equinox.p2.examples.rcp.cloud"/> + <plugin id="org.eclipse.equinox.p2.examples.rcp.cloud" version="1.0.0.qualifier"/> <plugin id="org.eclipse.equinox.p2.extensionlocation"/> <plugin id="org.eclipse.equinox.p2.garbagecollector"/> <plugin id="org.eclipse.equinox.p2.jarprocessor"/> @@ -77,8 +75,8 @@ <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> + <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/> <plugin id="org.eclipse.equinox.p2.ui"/> - <plugin id="org.eclipse.equinox.p2.ui.discovery"/> <plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/> <plugin id="org.eclipse.equinox.p2.updatechecker"/> <plugin id="org.eclipse.equinox.p2.updatesite"/> |