rpms/eclipse-checkstyle/devel unpack-plugins.patch, NONE, 1.1 eclipse-eclipsecs-fetch-src.sh, NONE, 1.1 itext-rtf-remove.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 eclipse-checkstyle.spec, 1.9, 1.10 checkout_and_build_tarball.sh, 1.1, NONE

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Jul 7 13:50:34 UTC 2010


Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-checkstyle/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3074/devel

Modified Files:
	.cvsignore sources eclipse-checkstyle.spec 
Added Files:
	unpack-plugins.patch eclipse-eclipsecs-fetch-src.sh 
	itext-rtf-remove.patch 
Removed Files:
	checkout_and_build_tarball.sh 
Log Message:
Update to 5.1.0.

unpack-plugins.patch:
 feature.xml |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE unpack-plugins.patch ---
--- net.sf.eclipsecs-feature/feature.xml.sav	2010-07-01 20:44:12.158193231 +0300
+++ net.sf.eclipsecs-feature/feature.xml	2010-07-01 20:44:43.727164634 +0300
@@ -47,8 +47,7 @@
          id="net.sf.eclipsecs.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.sf.eclipsecs.doc"
@@ -67,7 +66,6 @@
          id="net.sf.eclipsecs.ui"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>


--- NEW FILE eclipse-eclipsecs-fetch-src.sh ---
#!/bin/sh
usage='usage: $0 <tag>'
tag=v5_1_0_final
tar_name=eclipse-checkstyle-5.1.0

if [ "x$tag"x = 'xx' ]; then
   echo >&2 "$usage"
   exit 1
fi

rm -fr $tar_name && mkdir $tar_name
pushd $tar_name

# Fetch plugins
for f in \
net.sf.eclipsecs-feature \
net.sf.eclipsecs.branding \
net.sf.eclipsecs.core \
net.sf.eclipsecs.doc \
net.sf.eclipsecs.checkstyle \
net.sf.eclipsecs.ui \
; do
cvs -d :pserver:anonymous at eclipse-cs.cvs.sourceforge.net:/cvsroot/eclipse-cs \
export -r $tag $f;
done

popd
# create archive
tar -caf $tar_name.tar.xz $tar_name

itext-rtf-remove.patch:
 StatsExporterFactory.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE itext-rtf-remove.patch ---
--- net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/export/StatsExporterFactory.java	2010-07-01 20:31:27.030165006 +0300
+++ net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/export/StatsExporterFactory.java.sav	2010-06-30 01:19:50.273482941 +0300
@@ -20,7 +20,7 @@
 
 package net.sf.eclipsecs.ui.stats.export;
 
-//import net.sf.eclipsecs.ui.stats.export.internal.RTFStatsExporter;
+import net.sf.eclipsecs.ui.stats.export.internal.RTFStatsExporter;
 
 /**
  * Factory used to create an IStatsExporter.
@@ -46,7 +46,7 @@ public final class StatsExporterFactory 
     public static IStatsExporter createStatsExporter(String type) throws StatsExporterException {
         IStatsExporter exporter = null;
         if (RTF.equals(type)) {
-//            #exporter = new RTFStatsExporter();
+            exporter = new RTFStatsExporter();
         }
         else {
             throw new StatsExporterException("Unsupported kind of file ot export the stats to.");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-checkstyle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 May 2007 18:26:43 -0000	1.2
+++ .cvsignore	7 Jul 2010 13:50:33 -0000	1.3
@@ -1 +1,2 @@
 CheckstylePlugin-v4_0_1.tar.bz2
+eclipse-checkstyle-5.1.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-checkstyle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 May 2007 18:26:43 -0000	1.2
+++ sources	7 Jul 2010 13:50:34 -0000	1.3
@@ -1 +1,2 @@
 f486012b03ba580413bfdbe1e0c2237b  CheckstylePlugin-v4_0_1.tar.bz2
+177dd23d0913ce4eb97d88588c3bc270  eclipse-checkstyle-5.1.0.tar.xz


Index: eclipse-checkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-checkstyle/devel/eclipse-checkstyle.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- eclipse-checkstyle.spec	24 Jul 2009 20:51:54 -0000	1.9
+++ eclipse-checkstyle.spec	7 Jul 2010 13:50:34 -0000	1.10
@@ -1,39 +1,45 @@
 %global eclipse_base %{_libdir}/eclipse
 %global install_loc %{_datadir}/eclipse/dropins/checkstyle
-%global cs_ver 4.1
+%global cs_ver 5.1
 %global eclipse_ver 3.5
 
 Summary:   Checkstyle plugin for Eclipse
 Name:      eclipse-checkstyle
-Version:   4.0.1
-Release:   14%{?dist}
+Version:   5.1.0
+Release:   1%{?dist}
 License:   LGPLv2+
 Group:     Development/Tools
 URL:       http://eclipse-cs.sourceforge.net
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
-Source0: CheckstylePlugin-v4_0_1.tar.bz2
-Source10: checkout_and_build_tarball.sh
+Source0: %{name}-%{version}.tar.xz 
+Source10: eclipse-eclipsecs-fetch-src.sh
+Patch0:  itext-rtf-remove.patch
+Patch1:  unpack-plugins.patch
 
 # remove problematic getEclipseClasspath call and checkstyle jar inclusion
-Patch0: %{name}-%{version}.patch
+#Patch0: %{name}-%{version}.patch
 # remove problematic eclipse 3.0 backwards compatibility
-Patch1: %{name}-%{version}-tabwidth.patch
+#Patch1: %{name}-%{version}-tabwidth.patch
 
 Requires: eclipse-platform >= 1:%{eclipse_ver}
-Requires: eclipse-cvs-client
 Requires: eclipse-jdt
 Requires: checkstyle = 0:%{cs_ver}
-Requires: checkstyle-optional = 0:%{cs_ver}
+Requires: guava
+Requires: apache-commons-beanutils
+Requires: apache-commons-io
+Requires: dom4j
 
 BuildRequires: jpackage-utils >= 0:1.5
 BuildRequires: ant >= 0:1.6
 BuildRequires: eclipse-pde >= 1:%{eclipse_ver}
-BuildRequires: eclipse-cvs-client
 BuildRequires: checkstyle = 0:%{cs_ver}
-BuildRequires: checkstyle-optional = 0:%{cs_ver}
-BuildRequires:          java-devel >= 1.4.2
+BuildRequires: java-devel >= 1.4.2
+BuildRequires: apache-commons-io
+BuildRequires: guava
+BuildRequires: jfreechart
+BuildRequires: dom4j
 
 %description
 The Eclipse Checkstyle plugin integrates the Checkstyle Java code
@@ -42,86 +48,58 @@ to the user about violations of rules th
 possible error prone code constructs. 
 
 %prep
-%setup -q -c
-%patch0
+%setup -q 
+%patch0 -R
 %patch1
 
-# rewrite classpath
-perl -p -i -e "s/checkstyle-all-%{cs_ver}.jar/[checkstyle-%{cs_ver}].jar,\
-[checkstyle-optional-%{cs_ver}].jar,[commons-beanutils-core].jar,\
-[commons-logging].jar,[antlr].jar/g" CheckstylePlugin/META-INF/MANIFEST.MF
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
-%build
-# make target directory for build.plugin.docs
-mkdir -p target/docs
+sed -i -e "s|checkstyle-all-5.1.jar|checkstyle-all-5.1.jar,guava.jar,commons-beanutils.jar|g"  net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF
 
-# remove any precompiled bits (also done in checkout_and_build_tarball.sh)
-find . -regextype posix-egrep -regex '.*.jar|.*.zip|.*.class' -type f -print \
-    | xargs rm -f
-
-# create build classpath
-export CLASSPATH=$(build-classpath checkstyle-%{cs_ver} \
-                          checkstyle-optional-%{cs_ver})
-for jar in \
-%{_libdir}/eclipse/swt-gtk-%{eclipse_ver}.jar \
-%{eclipse_base}/plugins/org.eclipse.core.commands_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.core.filebuffers_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.core.resources_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.core.runtime*.jar \
-%{eclipse_base}/dropins/jdt/plugins/org.eclipse.jdt.core_%{eclipse_ver}.*.jar \
-%{eclipse_base}/dropins/jdt/plugins/org.eclipse.jdt.ui_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.jface_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.jface.text_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.osgi_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.swt_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.team.core_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.team.cvs.core_*.jar \
-%{eclipse_base}/plugins/org.eclipse.text_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.ui_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.ui.editors_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.ui.ide_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.ui.workbench_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.ui.workbench.texteditor_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.equinox.common_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.equinox.registry*.jar \
-%{eclipse_base}/plugins/org.eclipse.core.jobs_*.jar
-do
-  CLASSPATH=$CLASSPATH:${jar}
-done
-
-pushd CheckstylePlugin/build
-
-ant -Dbuild.sysclasspath=only \
-    -Dcheckstyle.docs.dir=../target/docs \
-    -Declipse.plugin.dir=%{eclipse_base}/plugins \
-    -Dworkspace=.. \
-    -Declipse.version=%{eclipse_ver} \
-    -Dproject.name=CheckstylePlugin_4.0.1 \
-    build.bindist
+ln -s %{_javadir}/checkstyle.jar net.sf.eclipsecs.checkstyle/checkstyle-all-5.1.jar
+ln -s %{_javadir}/guava.jar net.sf.eclipsecs.checkstyle/guava.jar
+ln -s %{_javadir}/commons-beanutils.jar net.sf.eclipsecs.checkstyle/commons-beanutils.jar
+ln -s %{_javadir}/commons-io.jar net.sf.eclipsecs.core/lib/commons-io-1.2.jar
+ln -s %{_javadir}/commons-lang.jar net.sf.eclipsecs.core/lib/commons-lang-2.3.jar
+ln -s %{_javadir}/dom4j.jar net.sf.eclipsecs.core/lib/dom4j-1.6.1.jar
+
+ln -s %{_javadir}/jcommon.jar net.sf.eclipsecs.ui/lib/jcommon-1.0.9.jar
+ln -s %{_javadir}/jfreechart/jfreechart.jar net.sf.eclipsecs.ui/lib/jfreechart-1.0.5.jar
+ln -s %{_javadir}/itext.jar net.sf.eclipsecs.ui/lib/itext-2.0.1.jar
 
-popd
+rm -fr net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/export/internal/RTFStatsExporter.java
+
+%build
+%{eclipse_base}/buildscripts/pdebuild
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
-install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
-BUILD_DIR=`pwd`/CheckstylePlugin
 
-# install feature
-pushd $RPM_BUILD_ROOT%{install_loc}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
-   jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-feature.jar
-popd
+unzip -q -o -d $RPM_BUILD_ROOT%{install_loc} \
+ build/rpmBuild/net.sf.eclipsecs.zip
 
-# install plugin
-pushd $RPM_BUILD_ROOT%{install_loc}
-    jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-bin.zip
-    find . -type f -name '*src.zip' -print | xargs -t rm -f
-    build-jar-repository \
-    $RPM_BUILD_ROOT%{install_loc}/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
-    checkstyle-%{cs_ver} \
-    checkstyle-optional-%{cs_ver} \
-    commons-beanutils-core \
-    commons-logging antlr
+pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins
+rm -fr net.sf.eclipsecs.checkstyle_0.0.0/checkstyle-all-5.1.jar
+ln -s %{_javadir}/checkstyle.jar net.sf.eclipsecs.checkstyle_0.0.0/checkstyle-all-5.1.jar
+rm -fr net.sf.eclipsecs.checkstyle_0.0.0/guava.jar
+ln -s %{_javadir}/guava.jar net.sf.eclipsecs.checkstyle_0.0.0/guava.jar
+rm -fr net.sf.eclipsecs.checkstyle_0.0.0/commons-beanutils.jar
+ln -s %{_javadir}/commons-beanutils.jar net.sf.eclipsecs.checkstyle_0.0.0/commmons-beanutils.jar
+rm -fr net.sf.eclipsecs.core_0.0.0/lib/commons-io-1.2.jar
+ln -s %{_javadir}/commons-io.jar net.sf.eclipsecs.core_0.0.0/lib/commons-io-1.2.jar
+rm -fr net.sf.eclipsecs.core_0.0.0/lib/commons-lang-2.3.jar
+ln -s %{_javadir}/commons-lang.jar net.sf.eclipsecs.core_0.0.0/lib/commons-lang-2.3.jar
+rm -fr net.sf.eclipsecs.core_0.0.0/lib/dom4j-1.6.1.jar net.sf.eclipsecs.core_0.0.0/lib/dom4j-1.6.1.jar
+ln -s %{_javadir}/dom4j.jar net.sf.eclipsecs.core_0.0.0/lib/dom4j-1.6.1.jar
+
+rm -fr net.sf.eclipsecs.ui_0.0.0/lib/jcommon-1.0.9.jar
+ln -s %{_javadir}/jcommon.jar net.sf.eclipsecs.ui_0.0.0/lib/jcommon-1.0.9.jar
+rm -fr net.sf.eclipsecs.ui_0.0.0/lib/jfreechart-1.0.5.jar
+ln -s %{_javadir}/jfreechart/jfreechart.jar net.sf.eclipsecs.ui_0.0.0/lib/jfreechart-1.0.5.jar
+rm -fr net.sf.eclipsecs.ui_0.0.0/lib/itext-2.0.1.jar
+ln -s %{_javadir}/itext.jar net.sf.eclipsecs.ui_0.0.0/lib/itext-2.0.1.jar
 popd
 
 %clean 
@@ -129,10 +107,13 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc CheckstylePlugin/license/LICENSE.*
+%doc net.sf.eclipsecs-feature/license.html
 %{install_loc}
 
 %changelog
+* Wed Jul 7 2010 Alexander Kurtakov <akurtako at redhat.com> 5.1.0-1
+- Update to 5.1.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- checkout_and_build_tarball.sh DELETED ---



More information about the scm-commits mailing list