more branding changes #24

Merged
merged 9 commits into from Nov 14, 2016
Jump to file
+271 −271
Split
View
@@ -21,9 +21,9 @@ findbugs/classesEclipse/
findbugs/doc/
findbugs/jnlp/appengine.jnlp
findbugs/lib/annotations.jar
-findbugs/lib/findbugs-annotations.jar
-findbugs/lib/findbugs-ant.jar
-findbugs/lib/findbugs.jar
+findbugs/lib/spotbugs-annotations.jar
+findbugs/lib/spotbugs-ant.jar
+findbugs/lib/spotbugs.jar
findbugs/lib/apache-ant-1.8.3-src.zip
findbugs/lib/asm-debug-all*.jar
findbugs/lib/bcel*.jar
@@ -1 +1 @@
-findbugs.home=../findbugs
+spotbugs.home=../findbugs
@@ -10,7 +10,7 @@
<property name="src.dir" value="src/java"/>
<property name="junitsrc.dir" value="src/junit"/>
<property name="junit.dir" value="build/junit"/>
- <property name="fb-ant.jar" value="${findbugs.home}/lib/findbugs-ant.jar" />
+ <property name="fb-ant.jar" value="${spotbugs.home}/lib/spotbugs-ant.jar" />
<target name="classes" >
@@ -23,7 +23,7 @@
debug="on">
<src path="${src.dir}"/>
<src path="${junitsrc.dir}"/>
- <classpath path="${findbugs.home}/lib/junit.jar:${findbugs.home}/lib/jsr305.jar:${findbugs.home}/lib/annotations.jar"/>
+ <classpath path="${spotbugs.home}/lib/junit.jar:${spotbugs.home}/lib/jsr305.jar:${spotbugs.home}/lib/annotations.jar"/>
</javac>
</target>
<target name="clean" >
@@ -40,19 +40,19 @@
classpath="${fb-ant.jar}"/>
<echo>Test expected warnings with javac bytecode</echo>
- <findbugs home="${findbugs.home}" jvmargs="-ea -Xmx900m -Dfindbugs.sf.comment=false"
+ <findbugs home="${spotbugs.home}" jvmargs="-ea -Xmx900m -Dfindbugs.sf.comment=false"
output="xml:withMessages" timestampNow="true" reportLevel="low" chooseVisitors="+CheckExpectedWarnings" outputFile="build/normal.xml">
<sourcePath path="${basedir}/src/java" />
- <auxclasspath path="${findbugs.home}/lib/junit.jar:${findbugs.home}/lib/jsr305.jar:${findbugs.home}/lib/annotations.jar"/>
+ <auxclasspath path="${spotbugs.home}/lib/junit.jar:${spotbugs.home}/lib/jsr305.jar:${spotbugs.home}/lib/annotations.jar"/>
<class location="${basedir}/build/classes" />
</findbugs>
- <filterBugs home="${findbugs.home}"
+ <filterBugs home="${spotbugs.home}"
priority="1"
bugPattern="FB"
inputFile="build/normal.xml"
outputFile="build/unexpected.xml">
</filterBugs>
- <printBugs home="${findbugs.home}"
+ <printBugs home="${spotbugs.home}"
inputFile="build/unexpected.xml"
errorProperty="bugsReported"
format="text">
View
@@ -62,9 +62,9 @@
<!-- Build the extension .jar file -->
<target name="dist" depends="clean,classes" description="Build a plugin distributable">
- <jar destfile="${dist.dir}/FindBugs.jar">
+ <jar destfile="${dist.dir}/SoitBugs.jar">
<fileset dir="${bin.dir}"/>
- <zipfileset src="lib/findbugs.jar"/>
+ <zipfileset src="lib/spotbugs.jar"/>
<zipfileset src="lib/bcel.jar"/>
<zipfileset src="lib/asm-debug-all-6.0-SNAPSHOT.jar"/>
<zipfileset src="lib/dom4j-1.6.1.jar"/>
@@ -54,7 +54,7 @@
<property name="fbpackage" value="edu/umd/cs/findbugs" />
<!-- FB core jar created by FB core ant build -->
- <property name="fb.jar" value="${findbugs.dir}/lib/findbugs.jar" />
+ <property name="fb.jar" value="${findbugs.dir}/lib/spotbugs.jar" />
<!-- FB optional noUpdateChecks jar (we need it) -->
<property name="fb.noUpdateChecks.jar" value="${findbugs.dir}/optionalPlugin/noUpdateChecks.jar" />
@@ -74,8 +74,8 @@
<!-- list of all libraries, copied from FB core project, plus old libraries not more used -->
<property name="jars.cleanup" value="${jars.required},
- findbugs.jar,
- findbugs-ant.jar" />
+ spotbugs.jar,
+ spotbugs-ant.jar" />
<path id="plugin.classpath">
<fileset dir="${lib.dir}" includes="${jars.required}"/>
@@ -87,7 +87,7 @@
</path>
<target name="init">
- <!-- true to recompile FB core (if findbugs.jar is not there) -->
+ <!-- true to recompile FB core (if spotbugs.jar is not there) -->
<condition property="fb.recompile" >
<not><available file="${fb.jar}" /></not>
</condition>
@@ -412,7 +412,7 @@
<ant dir="${findbugs.dir}" inheritall="false" target="clean" />
</target>
- <!-- Trigger (re-)compilation of FB core, if findbugs.jar is not available -->
+ <!-- Trigger (re-)compilation of FB core, if spotbugs.jar is not available -->
<target name="fbcompile" if="fb.recompile" >
<echo message="Building Findbugs core libraries"/>
<ant dir="${findbugs.dir}" inheritall="false" target="build" />
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: findbugs
Bundle-SymbolicName: findbugs
Bundle-Version: 1.0.0
-Bundle-ClassPath: findbugs.jar,
+Bundle-ClassPath: spotbugs.jar,
lib/AppleJavaExtensions.jar,
lib/bcel.jar,
lib/dom4j-1.6.1.jar,
@@ -1,7 +1,7 @@
# User Configuration:
# This section must be modified to reflect your system.
-source.findbugs.jar = src/java/,\
+source.spotbugs.jar = src/java/,\
src/antTask/,\
src/tools/,\
src/junit/,\
@@ -40,4 +40,4 @@ dblatex.img.fix=while(<>){s,([A-Za-z-]*\.png\}),manual/\1,g;print;}
pluginsSrc.dir=../plugins/
serverSrc.dir=../server/
-findbugsTestCases.dir=../findbugsTestCases
+spotbugsTestCases.dir=../findbugsTestCases
Oops, something went wrong.