[tycho] Perform non-bootstrap build

[Mat Booth]

commit 2b548d906db3da643e20c12128e4ddba8dd0d7d1
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Aug 28 14:49:17 2014 +0100

    Perform non-bootstrap build
    
    - Update running-env-only patch

 tycho-running-env-only.patch |   31 +++++++++++++++----------------
 tycho.spec                   |   10 +++++++---
 2 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/tycho-running-env-only.patch b/tycho-running-env-only.patch
index c50df3c..5fb78f9 100644
--- a/tycho-running-env-only.patch
+++ b/tycho-running-env-only.patch
@@ -1,4 +1,4 @@
-From f2455f1142b7fc8570139d5fec8b5f22ebe5542c Mon Sep 17 00:00:00 2001
+From 03176de4589022cdb80672017080066b192116c8 Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth at redhat.com>
 Date: Thu, 10 Jul 2014 15:26:50 +0100
 Subject: [PATCH] Add "running env only" option to the p2-director-plugin.
@@ -6,33 +6,32 @@ Subject: [PATCH] Add "running env only" option to the p2-director-plugin.
 This options allows you to restrict assembling and archiving products
 to only the current running target environment.
 ---
- .../tycho/plugins/p2/director/AbstractProductMojo.java  | 17 +++++++++++++++++
- .../eclipse/tycho/plugins/p2/director/DirectorMojo.java |  3 +++
- .../tycho/plugins/p2/director/ProductArchiverMojo.java  |  3 +++
- 3 files changed, 23 insertions(+)
+ .../tycho/plugins/p2/director/AbstractProductMojo.java   | 16 ++++++++++++++++
+ .../eclipse/tycho/plugins/p2/director/DirectorMojo.java  |  3 +++
+ .../tycho/plugins/p2/director/ProductArchiverMojo.java   |  3 +++
+ 3 files changed, 22 insertions(+)
 
 diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
-index c34cb72..d605091 100644
+index c34cb72..a2e2f72 100644
 --- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
 +++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
-@@ -106,6 +106,16 @@ abstract class AbstractProductMojo extends AbstractMojo {
-     private List<Product> products;
+@@ -112,6 +112,15 @@ abstract class AbstractProductMojo extends AbstractMojo {
+     @Parameter(property = "p2.timeout", defaultValue = "0")
+     private int forkedProcessTimeoutInSeconds;
  
-     /**
++    /**
 +     * <p>
 +     * Assemble and archive product installations for the running environment only. Setting this to
 +     * true will omit all target environments that do not exactly match the running environment.
 +     * </p>
-+     *
-+     * @parameter expression="${director.running.env.only}"
 +     */
++    @Parameter(defaultValue = "false", property = "director.running.env.only")
 +    private boolean runningEnvOnly;
 +
-+    /**
-      * Kill the forked process after a certain number of seconds. If set to 0, wait forever for the
-      * process, never timing out.
-      */
-@@ -148,4 +158,11 @@ abstract class AbstractProductMojo extends AbstractMojo {
+     int getForkedProcessTimeoutInSeconds() {
+         return forkedProcessTimeoutInSeconds;
+     }
+@@ -148,4 +157,11 @@ abstract class AbstractProductMojo extends AbstractMojo {
      static String getOsWsArch(TargetEnvironment env, char separator) {
          return env.getOs() + separator + env.getWs() + separator + env.getArch();
      }
diff --git a/tycho.spec b/tycho.spec
index dfb7ef6..9dbfd7e 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -6,11 +6,11 @@
 # This basically uses javac + xmvn to build only the Tycho components
 # required to perform a full Tycho build
 # Most common usage : A library (in Fedora) used by Tycho's runtime broke API
-%global tycho_bootstrap 1
+%global tycho_bootstrap 0
 # Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
 # This basically provides a location for usage of pre-bundled Eclipse
 # Possible uses : Need to build Tycho before Eclipse in fresh buildroot
-%global eclipse_bootstrap 1
+%global eclipse_bootstrap 0
 # When building version under development (non-release)
 # %%global snap -SNAPSHOT
 %global snap %{nil}
@@ -23,7 +23,7 @@
 
 Name:           tycho
 Version:        0.21.0
-Release:        2.1%{?dist}
+Release:        3%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -368,6 +368,10 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 28 2014 Mat Booth <mat.booth at redhat.com> - 0.21.0-3
+- Perform non-bootstrap build
+- Update running-env-only patch
+
 * Wed Aug 27 2014 Roland Grunberg <rgrunber at redhat.com> - 0.21.0-2.1
 - fedoraproject-p2: Fix issues with creation of feature IUs.
 - fedoraproject-p2: Fix jar corruption bug.