[eclipse-jbosstools/f19: 11/36] Update *module* to jbosstools-*module* everywhere
Gerard Ryan
galileo at fedoraproject.org
Sun Aug 18 15:21:52 UTC 2013
commit 52700612afaddbfa3b6b8233fe6fd663eb5d6d85
Author: Gerard Ryan <gerard at ryan.lt>
Date: Tue Jul 23 22:59:16 2013 +0100
Update *module* to jbosstools-*module* everywhere
eclipse-jbosstools.spec | 110 +++++++++++++++++++++++------------------------
1 files changed, 54 insertions(+), 56 deletions(-)
---
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index 8eb45f7..c5dfba9 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -375,21 +375,21 @@ find -name '*.jar' -delete
find -name '*.class' -delete
# add symlinks to Fedora versions of removed jars
-pushd server/archives/plugins/org.jboss.ide.eclipse.archives.core/lib/
+pushd jbosstools-server/archives/plugins/org.jboss.ide.eclipse.archives.core/lib/
ln -s %{_javadir}/truezip/truezip-driver-file.jar
ln -s %{_javadir}/truezip/truezip-driver-zip.jar
ln -s %{_javadir}/truezip/truezip-file.jar
ln -s %{_javadir}/truezip/truezip-kernel.jar
popd
-pushd server/as/plugins/org.jboss.ide.eclipse.as.dmr/
+pushd jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.dmr/
ln -s %{_javadir}/jboss-dmr.jar
popd
-pushd server/as/plugins/org.jboss.ide.eclipse.as.core/
+pushd jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.core/
ln -s %{_javadir}/dom4j.jar
ln -s %{_javadir}/jaxen.jar
ln -s %{_javadir}/gnu-getopt.jar
popd
-pushd server/as/plugins/org.jboss.ide.eclipse.as.management.as71/
+pushd jbosstools-server/as/plugins/org.jboss.ide.eclipse.as.management.as71/
ln -s %{_javadir}/jboss-as/jboss-as-controller-client.jar
ln -s %{_javadir}/jboss-as/jboss-as-protocol.jar
ln -s %{_javadir}/jboss-dmr.jar
@@ -401,15 +401,15 @@ ln -s %{_javadir}/jboss-threads.jar
ln -s %{_javadir}/xnio-api.jar
ln -s %{_javadir}/xnio-nio.jar
popd
-pushd webservices/plugins/org.jboss.tools.ws.ui/lib/
+pushd jbosstools-webservices/plugins/org.jboss.tools.ws.ui/lib/
ln -s %{_javadir}/axis/axis.jar
ln -s %{_javadir}/axis/jaxrpc.jar
ln -s %{_javadir}/resteasy/jaxrs-api.jar
popd
-pushd freemarker/plugins/org.jboss.ide.eclipse.freemarker/
+pushd jbosstools-freemarker/plugins/org.jboss.ide.eclipse.freemarker/
ln -s %{_javadir}/freemarker.jar
popd
-pushd openshift/plugins/org.jboss.tools.openshift.express.client/
+pushd jbosstools-openshift/plugins/org.jboss.tools.openshift.express.client/
ln -s %{_javadir}/jboss-dmr.jar
ln -s %{_javadir}/log4j.jar
ln -s %{_javadir}/openshift-java-client.jar
@@ -422,52 +422,49 @@ popd
# Disable modules that fail to build
## build-site/aggregate/local-site
-%pom_disable_module ../../../gwt build-sites/aggregate/local-site
-%pom_disable_module ../../../forge build-sites/aggregate/local-site
-%pom_disable_module ../../../hibernate build-sites/aggregate/local-site
-%pom_disable_module ../../../birt build-sites/aggregate/local-site
-%pom_disable_module ../../../xulrunner build-sites/aggregate/local-site
-%pom_disable_module ../../../portlet build-sites/aggregate/local-site
-%pom_disable_module ../../../central build-sites/aggregate/local-site
-%pom_disable_module ../../../vpe build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-gwt jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-forge jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-hibernate jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-birt jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-xulrunner jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-portlet jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-central jbosstools-build-sites/aggregate/local-site
+%pom_disable_module ../../../jbosstools-vpe jbosstools-build-sites/aggregate/local-site
## tests
disable_tests_module="base base/common base/runtime base/usage \
server/archives server/jmx server/as \
jst webservices javaee/cdi freemarker openshift"
-for pom in ${disable_tests_module}; do %pom_disable_module tests ${pom}; done
+for pom in ${disable_tests_module}; do %pom_disable_module tests jbosstools-${pom}; done
## site
disable_site_module="base server jst webservices javaee freemarker openshift"
-for pom in ${disable_site_module}; do %pom_disable_module site ${pom}; done
+for pom in ${disable_site_module}; do %pom_disable_module site jbosstools-${pom}; done
## base
-%pom_disable_module org.jboss.tools.common.mylyn base/common/plugins
-%pom_disable_module org.jboss.tools.common.mylyn.test base/common/tests
-%pom_disable_module org.jboss.tools.common.mylyn.feature base/common/features
-%pom_disable_module org.jboss.tools.common.all.test.feature base/common/features
-%pom_disable_module org.jboss.tools.usage.test.feature base/usage/features
-%pom_disable_module org.jboss.tools.runtime.test.feature base/runtime/features
+%pom_disable_module org.jboss.tools.common.mylyn jbosstools-base/common/plugins
+%pom_disable_module org.jboss.tools.common.mylyn.test jbosstools-base/common/tests
+%pom_disable_module org.jboss.tools.common.mylyn.feature jbosstools-base/common/features
+%pom_disable_module org.jboss.tools.common.all.test.feature jbosstools-base/common/features
+%pom_disable_module org.jboss.tools.usage.test.feature jbosstools-base/usage/features
+%pom_disable_module org.jboss.tools.runtime.test.feature jbosstools-base/runtime/features
+%pom_disable_module org.jboss.tools.stacks.core.test.feature jbosstools-base/stacks/features
## server
-%pom_disable_module org.jboss.ide.eclipse.archives.test.feature \
- server/archives/features
-%pom_disable_module org.jboss.tools.jmx.test.feature server/jmx/features
-%pom_disable_module org.jboss.ide.eclipse.as.test.feature server/as/features
+%pom_disable_module org.jboss.ide.eclipse.archives.test.feature jbosstools-server/archives/features
+%pom_disable_module org.jboss.tools.jmx.test.feature jbosstools-server/jmx/features
+%pom_disable_module org.jboss.ide.eclipse.as.test.feature jbosstools-server/as/features
## jst
-%pom_disable_module org.jboss.tools.jst.test.feature jst/features
+%pom_disable_module org.jboss.tools.jst.test.feature jbosstools-jst/features
## webservices
-%pom_disable_module org.jboss.tools.ws.test.feature webservices/features
+%pom_disable_module org.jboss.tools.ws.test.feature jbosstools-webservices/features
## javaee
-%pom_disable_module jsf javaee
-%pom_disable_module seam javaee
-%pom_disable_module struts javaee
-%pom_disable_module org.jboss.tools.cdi.test.feature javaee/cdi/features
-%pom_disable_module org.jboss.tools.cdi.seam.test.feature javaee/cdi/features
-%pom_disable_module org.jboss.tools.cdi.deltaspike.test.feature \
- javaee/cdi/features
+%pom_disable_module jsf jbosstools-javaee
+%pom_disable_module seam jbosstools-javaee
+%pom_disable_module org.jboss.tools.cdi.test.feature jbosstools-javaee/cdi/features
+%pom_disable_module org.jboss.tools.cdi.seam.test.feature jbosstools-javaee/cdi/features
+%pom_disable_module org.jboss.tools.cdi.deltaspike.test.feature jbosstools-javaee/cdi/features
## freemarker
-%pom_disable_module org.jboss.ide.eclipse.freemarker.test.feature \
- freemarker/features
+%pom_disable_module org.jboss.ide.eclipse.freemarker.test.feature jbosstools-freemarker/features
## openshift
-pom_disable_module org.jboss.tools.openshift.egit.integration.test.feature \
- openshift/features
+%pom_disable_module org.jboss.tools.openshift.egit.integration.test.feature jbosstools-openshift/features
+%pom_disable_module org.jboss.tools.openshift.express.test.feature jbosstools-openshift/features
%patch10
%patch12
@@ -480,19 +477,20 @@ pom_disable_module org.jboss.tools.openshift.egit.integration.test.feature \
%patch21
%patch22
%patch23
+%patch24
+%patch25
# Add Fedora version to OSGi version qualifier
-%pom_xpath_remove pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:format build/parent
-%pom_xpath_inject pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration "<format>'v'yyyyMMdd-HHmm'-\${BUILD_ALIAS}-F%{fedora}'</format>" build/parent
-
-# Set tycho version to 0.16.0-SNAPSHOT in build/parent/pom.xml
-sed -i -e 's|<tychoVersion>0.15.0</tychoVersion>|<tychoVersion>0.16.0-SNAPSHOT</tychoVersion>|g' build/parent/pom.xml
+%pom_xpath_remove pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:format jbosstools-build/parent
+%pom_xpath_inject pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration "<format>'v'yyyyMMdd-HHmm'-\${BUILD_ALIAS}-F%{fedora}'</format>" jbosstools-build/parent
+# Set tycho version to 0.18.0-SNAPSHOT in jbosstools-build/parent/pom.xml
+sed -i -e 's|<tychoVersion>0.17.0</tychoVersion>|<tychoVersion>0.18.0</tychoVersion>|g' jbosstools-build/parent/pom.xml
%build
-# Build everything from within build
-pushd build-sites/aggregate/local-site
- mvn-rpmbuild -f ../../../build/parent/pom.xml install \
+# Build everything from within jbosstools-build-sites
+pushd jbosstools-build-sites/aggregate/local-site
+ mvn-rpmbuild -f ../../../jbosstools-build/parent/pom.xml install \
-Dlocal.site=file:.m2/p2/repo
mvn-rpmbuild install -Dno-target-platform -X -Dmaven.local.debug=true \
-Dlocal.site=file:.m2/p2/repo
@@ -516,14 +514,14 @@ for tool in common usage archives jmx as jst cdi ws freemarker runtime openshift
install -d -m 755 %{buildroot}%{eclipse_dropins}/%{name}-${tool}/eclipse/plugins
## POM for each tool
- pushd ${tool}/*-SNAPSHOT
+ pushd jbosstools-${tool}/*-SNAPSHOT
install -pm 644 ${tool}-*.pom \
%{buildroot}%{_mavenpomdir}/JPP-%{name}-${tool}.pom
%add_maven_depmap JPP-%{name}-${tool}.pom -f ${tool}
popd
## features
- pushd ${tool}/features
+ pushd jbosstools-${tool}/features
for feat in `echo *.feature`; do
pushd ${feat}/*-SNAPSHOT
unzip ${feat}-*-SNAPSHOT.jar -d \
@@ -533,7 +531,7 @@ for tool in common usage archives jmx as jst cdi ws freemarker runtime openshift
popd
##plugins
- pushd ${tool}/plugins
+ pushd jbosstools-${tool}/plugins
for plug in `echo org.jboss.*`; do
pushd ${plug}/*-SNAPSHOT
install -p ${plug}-*-SNAPSHOT.jar \
@@ -544,8 +542,8 @@ for tool in common usage archives jmx as jst cdi ws freemarker runtime openshift
done;
- # org.jboss.tools.jst.web.kb is in jst/tests, but we need it
- install -p jst/tests/org.jboss.tools.jst.web.kb/*-SNAPSHOT/*-SNAPSHOT.jar \
+ # org.jboss.tools.jst.web.kb is in jbosstools-jst/tests, but we need it
+ install -p jbosstools-jst/tests/org.jboss.tools.jst.web.kb/*-SNAPSHOT/*-SNAPSHOT.jar \
%{buildroot}%{eclipse_dropins}/%{name}-jst/eclipse/plugins
popd;
@@ -558,14 +556,14 @@ popd;
%files common
%doc lgpl-2.1.txt
-%doc base/tests/features/org.jboss.tools.test.feature/epl-v10.html
+%doc jbosstools-base/tests/features/org.jboss.tools.test.feature/epl-v10.html
%{eclipse_dropins}/%{name}-common
%{_mavenpomdir}/JPP-%{name}-common.pom
%{_mavendepmapfragdir}/%{name}-common
%files usage
%doc LICENSE-2.0.txt
-%doc base/tests/features/org.jboss.tools.test.feature/epl-v10.html
+%doc jbosstools-base/tests/features/org.jboss.tools.test.feature/epl-v10.html
%{eclipse_dropins}/%{name}-usage
%{_mavenpomdir}/JPP-%{name}-usage.pom
%{_mavendepmapfragdir}/%{name}-usage
@@ -577,7 +575,7 @@ popd;
%{_mavendepmapfragdir}/%{name}-archives
%files jmx
-%doc base/tests/features/org.jboss.tools.test.feature/epl-v10.html
+%doc jbosstools-base/tests/features/org.jboss.tools.test.feature/epl-v10.html
%{eclipse_dropins}/%{name}-jmx
%{_mavenpomdir}/JPP-%{name}-jmx.pom
%{_mavendepmapfragdir}/%{name}-jmx
More information about the scm-commits
mailing list