[eclipse-jbosstools/f17] Make build process more efficient

Gerard Ryan galileo at fedoraproject.org
Mon Aug 13 02:41:26 UTC 2012


commit 1268a4ca608a9b266d7357ae6af45966b499fe89
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Aug 11 15:40:15 2012 +0100

    Make build process more efficient

 eclipse-jbosstools.spec |   31 ++++++++-----------------------
 1 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index af36a1d..4dfcf9c 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -1,9 +1,12 @@
 %global eclipse_dropins %{_datadir}/eclipse/dropins
 %global build_base      build/.m2/org/jboss/tools/
 
+# Comma separated list of all modules that we're currently building (in order)
+%global tools parent,common,usage,archives,jmx,as,jst,cdi,ws,freemarker
+
 Name:           eclipse-jbosstools
 Version:        3.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A set of Eclipse plugins that supports JBoss and related technology
 
 Group:          Development/Tools
@@ -447,32 +450,11 @@ popd
 
 
 %build
-# build the local repository for building with maven
-
-/bin/sh -x %{_eclipse_base}/buildscripts/copy-platform SDK %{_eclipse_base} \
-  wtp-jeetools wtp-webservices eclipse-wtp-common dtp-enablement wtp-jpa \
-  dtp-connectivity wtp-sourceediting org.eclipse.jst.server_ui.feature \
-  eclipse-wtp-jst-web eclipse-wtp-jsf dtp-modelbase emf emf-sdk gef xsd rse 
-
-SDK=$(cd SDK >/dev/null && pwd)
-
-mkdir repo
-repodir=$(cd repo >/dev/null && pwd)
-
-%{_eclipse_base}/eclipse -debug -consolelog -nosplash -verbose \
-  -data /tmp/workspace \
-  -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
-  -metadataRepository file:${repodir} \
-  -artifactRepository file:${repodir} \
-  -source ${SDK} -compress -publishArtifacts
-
 # Build everything from within build
 # Skipping tests because of missing dependency swtbot
 pushd build/
-for tool in parent common usage archives jmx as jst cdi ws freemarker; do
-  mvn-rpmbuild install -Plocal.site,${tool} -Dlocal.site=file://${repodir} \
+  mvn-rpmbuild install -Plocal.site,%{tools} -Dlocal.site=file:.m2/p2/repo \
     -Dmaven.test.skip=true
-done
 popd
 
 
@@ -592,6 +574,9 @@ popd;
 
 
 %changelog
+* Fri Aug 11 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.3.1-3
+- Make build process more efficient.
+
 * Thu Jul 26 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.3.1-2
 - Fix license field and install license files.
 - Use a clean tarball to reduce srpm size.


More information about the scm-commits mailing list