Skip to content

Commit

Permalink
Merge pull request #493 from themainfunction/master
Browse files Browse the repository at this point in the history
A few misc bug fixes to make the build work properly
  • Loading branch information
cbeust committed Mar 20, 2014
2 parents 311b837 + b5e338c commit e5da288
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ src/test/java/test/ignore
.project
.idea
testng.iml
.ant-targets*
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Please note that even though the .zip distribution contains the TestNG sources,
you will not be able to build the software with them because we decided
not to include the external jar files in order to keep the size down.

If you want to build TestNG, please sync to the GitHub repository at http://github.com/cbeust/testng.
If you want to build TestNG, please sync to the GitHub repository at https://github.com/cbeust/testng.

--
The TestNG team
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ guice2.jar=guice-2.0.jar
junit.jar=junit-4.10.jar
ant.jar=ant-1.7.0.jar
jcommander.jar=jcommander-1.27.jar
yaml.jar=snakeyaml-1.6.jar
yaml.jar=snakeyaml-1.12.jar

all.jar.files=${beanshell.jar},${junit.jar},${ant.jar},${jcommander.jar},${yaml.jar},${guice2.jar}

Expand Down
9 changes: 5 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@
<ant inheritall="no" antfile="examples/build.xml" />
</target>

<target name="tests" depends="compile" description="runs all JDK5 tests with JDK5 distro">
<target name="tests" depends="build" description="runs all JDK5 tests with JDK5 distro">
<ant inheritall="no" antfile="build-tests.xml" />
</target>

<target name="test-ant">
<target name="test-ant" depends="build">
<echo message=" -- Testing ant testng task functionality --" />
<ant inheritall="no" antfile="build-ant.xml" />
</target>
Expand All @@ -126,7 +126,7 @@
<!-- Documentation -->
<!-- ==================================================================== -->

<target name="javadocs" depends="javadocs-current" />
<target name="javadocs" depends="build,javadocs-current" />

<target name="doclava">
<javadoc
Expand Down Expand Up @@ -248,7 +248,8 @@
</zip>
</target>

<target name="create-jar" description="Create a jar file with the Testng classes and nothing else" >
<target name="create-jar" description="Create a jar file with the Testng classes and nothing else"
depends="compile">
<delete file="${jar.file}" />
<jar destfile="${jar.file}" >
<manifest>
Expand Down

0 comments on commit e5da288

Please sign in to comment.