No hamcrest src
This commit is contained in:
parent
9ea9d9ba1f
commit
8834406809
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
junit3.8.2.zip
|
junit3.8.2.zip
|
||||||
/junit-4.10.tar.xz
|
/junit-4.10.tar.xz
|
||||||
|
/r4.11.tar.gz
|
||||||
|
31
junit-no-hamcrest-src.patch
Normal file
31
junit-no-hamcrest-src.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff --git a/build.xml b/build.xml
|
||||||
|
index 0efaf87..62e1df3 100644
|
||||||
|
--- a/build.xml
|
||||||
|
+++ b/build.xml
|
||||||
|
@@ -30,7 +30,6 @@
|
||||||
|
<property name="javadoczip" location="${dist}-javadoc.zip" />
|
||||||
|
<property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
|
||||||
|
<property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" />
|
||||||
|
- <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
|
||||||
|
|
||||||
|
<property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
|
||||||
|
|
||||||
|
@@ -125,10 +124,6 @@
|
||||||
|
</copy>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
- <target name="unjar.hamcrest">
|
||||||
|
- <unjar src="${hamcrestlibsources}" dest="${hamcrestsrc}" />
|
||||||
|
- </target>
|
||||||
|
-
|
||||||
|
<target name="release-notes">
|
||||||
|
<property name="basename" value="doc/ReleaseNotes${version-base}" />
|
||||||
|
<exec executable="perl" failonerror="true">
|
||||||
|
@@ -151,7 +146,6 @@
|
||||||
|
<excludepackage name="org.junit.experimental.theories.internal.*" />
|
||||||
|
|
||||||
|
<sourcepath location="${src}" />
|
||||||
|
- <sourcepath location="${hamcrestsrc}" />
|
||||||
|
<link href="http://java.sun.com/javase/6/docs/api/" />
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
@ -41,6 +41,7 @@ BuildArch: noarch
|
|||||||
Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz
|
Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz
|
||||||
Source2: junit-OSGi-MANIFEST.MF
|
Source2: junit-OSGi-MANIFEST.MF
|
||||||
Patch0: %{name}-removed-test.patch
|
Patch0: %{name}-removed-test.patch
|
||||||
|
Patch1: %{name}-no-hamcrest-src.patch
|
||||||
|
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: ant-contrib
|
BuildRequires: ant-contrib
|
||||||
@ -96,6 +97,7 @@ Demonstrations and samples for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-r%{version}
|
%setup -q -n %{name}-r%{version}
|
||||||
#%patch0 -p1
|
#%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
cp build/maven/junit-pom-template.xml pom.xml
|
cp build/maven/junit-pom-template.xml pom.xml
|
||||||
find -iname '*.class' -o -iname '*.jar' -delete
|
find -iname '*.class' -o -iname '*.jar' -delete
|
||||||
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
|
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
|
||||||
|
Loading…
Reference in New Issue
Block a user