[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse-checkstyle/devel checkout_and_build_tarball.sh, NONE, 1.1 eclipse-checkstyle-4.0.1-tabwidth.patch, NONE, 1.1 eclipse-checkstyle-4.0.1.patch, NONE, 1.1 eclipse-checkstyle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2



Author: rmyers

Update of /cvs/extras/rpms/eclipse-checkstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23317/devel

Modified Files:
	.cvsignore sources 
Added Files:
	checkout_and_build_tarball.sh 
	eclipse-checkstyle-4.0.1-tabwidth.patch 
	eclipse-checkstyle-4.0.1.patch eclipse-checkstyle.spec 
Log Message:
initial import from eclipse-checkstyle-4.0.1-6.fc7.src.rpm.



--- NEW FILE checkout_and_build_tarball.sh ---
#!/bin/bash -x 

TAG="v4_0_1"

# start with a clean directory
rm -rf CheckstylePlugin
# export cvs revision
cvs -d:pserver:anonymous eclipse-cs cvs sourceforge net:/cvsroot/eclipse-cs export -r ${TAG} CheckstylePlugin
# remove any pre-compiled stuff
find CheckstylePlugin -regextype posix-egrep -regex '.*.jar|.*.zip|.*.class' -print | xargs rm -f
# create tar
tar -jcvf CheckstylePlugin-${TAG}.tar.bz2 CheckstylePlugin

eclipse-checkstyle-4.0.1-tabwidth.patch:

--- NEW FILE eclipse-checkstyle-4.0.1-tabwidth.patch ---
--- CheckstylePlugin/src/com/atlassw/tools/eclipse/checkstyle/builder/Auditor.java	2007-05-11 16:05:10.000000000 -0400
+++ CheckstylePlugin/src/com/atlassw/tools/eclipse/checkstyle/builder/Auditor.java	2007-05-11 16:07:16.000000000 -0400
@@ -344,8 +344,7 @@ public class Auditor
             }
             catch (Exception e)
             {
-                // we're in Eclipse 3.0 - fall back to the std method
-                mTabWidth = CodeFormatterUtil.getTabWidth();
+                CheckstyleLog.log(e);
             }
 
             // init the marker limitation

eclipse-checkstyle-4.0.1.patch:

--- NEW FILE eclipse-checkstyle-4.0.1.patch ---
--- CheckstylePlugin/build/build.xml	2007-05-11 15:39:03.000000000 -0400
+++ CheckstylePlugin/build/build.xml	2007-05-11 16:13:26.000000000 -0400
@@ -77,7 +91,9 @@
 		<mkdir dir="${dist.basedir.tmpdir}/binnls" />
 
 		<!-- read the eclipse classpath -->
+<!--
 		<getEclipseClasspath workspace="${workspace}" projectName="${project.name}" classpathId="build.classpath" />
+-->
 
 		<!-- compile -->
 		<javac srcdir="${basedir}/src" destdir="${dist.basedir.tmpdir}/bin" classpathref="build.classpath" source="1.4" />
@@ -107,7 +109,6 @@
 		<!-- copy the plugin contents to the tmp dir -->
 		<copy todir="${dist.basedir.tmpdir}/">
 			<fileset dir="${basedir}">
-				<include name="${checkstyle.jar}" />
 				<include name="extension-libraries/**" />
 				<include name="plugin.xml" />
 				<include name="*.properties" />


--- NEW FILE eclipse-checkstyle.spec ---
%define eclipse_base %{_datadir}/eclipse
%define cs_ver 4.1
%define eclipse_ver 3.2
%define gcj_support 1

Summary:   Checkstyle plugin for Eclipse
Name:      eclipse-checkstyle
Version:   4.0.1
Release:   6%{?dist}
License:   LGPL
Group:     Development/Tools
URL:       http://eclipse-cs.sourceforge.net
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Source0: CheckstylePlugin-v4_0_1.tar.bz2
Source10: checkout_and_build_tarball.sh

# remove problematic getEclipseClasspath call and checkstyle jar inclusion
Patch0: %{name}-%{version}.patch
# remove problematic eclipse 3.0 backwards compatibility
Patch1: %{name}-%{version}-tabwidth.patch

Requires: eclipse-platform >= 1:%{eclipse_ver}
Requires: checkstyle = 0:%{cs_ver}
Requires: checkstyle-optional = 0:%{cs_ver}

BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant >= 0:1.6
BuildRequires: eclipse-pde >= 1:%{eclipse_ver}
BuildRequires: checkstyle = 0:%{cs_ver}
BuildRequires: checkstyle-optional = 0:%{cs_ver}
%if %{gcj_support}
BuildRequires:          java-gcj-compat-devel >= 1.0.33
Requires(post):         java-gcj-compat >= 1.0.33
Requires(postun):       java-gcj-compat >= 1.0.33
%else
BuildRequires:          java-devel >= 1.4.2
%endif

%description
The Eclipse Checkstyle plugin integrates the Checkstyle Java code
auditor into the Eclipse IDE. The plugin provides real-time feedback
to the user about violations of rules that check for coding style and
possible error prone code constructs. 

%prep
%setup -q -c
%patch0
%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

%build
# make target directory for build.plugin.docs
mkdir -p target/docs

# 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_%{eclipse_ver}.*.jar \
%{eclipse_base}/plugins/org.eclipse.jdt.core_%{eclipse_ver}.*.jar \
%{eclipse_base}/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_%{eclipse_ver}.*.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_%{eclipse_ver}.*.jar \
%{eclipse_base}/plugins/org.eclipse.core.jobs_%{eclipse_ver}.*.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

popd

%install
rm -rf %{buildroot}
install -d -m755 %{buildroot}/%{eclipse_base}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
BUILD_DIR=`pwd`/CheckstylePlugin

# install feature
pushd %{buildroot}/%{eclipse_base}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
   jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-feature.jar
popd

# install plugin
pushd %{buildroot}/%{eclipse_base}
    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 \
    %{buildroot}/%{eclipse_base}/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
    checkstyle-%{cs_ver} \
    checkstyle-optional-%{cs_ver} \
    commons-beanutils-core \
    commons-logging antlr
popd

%if %{gcj_support}
  %{_bindir}/aot-compile-rpm
%endif

%clean 
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root)
%doc CheckstylePlugin/license/LICENSE.*
%{eclipse_base}/features/*
%{eclipse_base}/plugins/*

%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%changelog
* Wed May 16 2007 Rob Myers <rob myers gtri gatech edu> 4.0.1-6
- remove epoch from changelog

* Tue May 15 2007 Rob Myers <rob myers gtri gatech edu> 4.0.1-5
- add eclipse_ver
- include licenses
- spec cleanup

* Sat May 12 2007 Rob Myers <rob myers gtri gatech edu> 4.0.1-4
- add gcj_support
- use wildcard to match eclipse library jar for all build architectures
- fine tune Requires

* Fri May 11 2007 Rob Myers <rob myers gtri gatech edu> 4.0.1-1
- first build for fc7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-checkstyle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 May 2007 17:31:44 -0000	1.1
+++ .cvsignore	21 May 2007 18:26:43 -0000	1.2
@@ -0,0 +1 @@
+CheckstylePlugin-v4_0_1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-checkstyle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 May 2007 17:31:44 -0000	1.1
+++ sources	21 May 2007 18:26:43 -0000	1.2
@@ -0,0 +1 @@
+f486012b03ba580413bfdbe1e0c2237b  CheckstylePlugin-v4_0_1.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]