Skip to content

Commit

Permalink
3.1.10 release - fixed bukkit javadoc link. Added canarymod-1.8.0 and…
Browse files Browse the repository at this point in the history
… spigot-1.8.8.jar
  • Loading branch information
walterhiggins committed Aug 16, 2015
1 parent bef42e3 commit c6d6dea
Show file tree
Hide file tree
Showing 7 changed files with 246 additions and 188 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scriptcraft-version=3.1.9
scriptcraft-version=3.1.10
39 changes: 10 additions & 29 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<property name="src.bukkit" location="src/main/java/bukkit"/>

<!-- compiles against these libraries -->
<property name="lib.canary" location="target/lib/canarymod.jar"/>
<property name="lib.bukkit" location="lib/bukkit-1.7.10-R0.1-SNAPSHOT.jar"/>
<property name="lib.canary" location="lib/canarymod-1.8.0.jar"/>
<property name="lib.bukkit" location="lib/spigot-1.8.8.jar"/>

<property name="build" location="target/classes"/>
<property name="dist" location="target/" />
Expand Down Expand Up @@ -56,26 +56,7 @@
</target>


<target name="get-canary" depends="init" description="Downloads canarymod jar" unless="canary.present">
<mkdir dir="target/lib/"/>
<get src="http://scriptcraftjs.org/download/latest/CanaryMod-1.8.0-1.2.1-SNAPSHOT-shaded.jar"
maxtime="60"
dest="target/lib/canarymod.jar"
verbose="true"/>
<!--
wph 20150801 - CanaryMod is no longer being developed. Get the latest version from scriptcraftjs.org instead.
<get src="https://ci.visualillusionsent.net/job/CanaryMod/lastStableBuild/artifact/*zip*/archive.zip"
maxtime="60"
dest="target/canarymod.zip"
verbose="true"/>
<unzip src="target/canarymod.zip"
dest="target/lib">
<mapper type="glob" from="*.jar" to="canarymod.jar"/>
</unzip>
-->
</target>

<target name="compile-plugins" depends="init,get-canary" description="compile canary plugin source">
<target name="compile-plugins" depends="init" description="compile canary plugin source">
<javac includeantruntime="false"
source="1.6"
target="1.6"
Expand All @@ -90,18 +71,18 @@
</javac>
</target>

<target name="gendocs" depends="construct-ypgpm, construct-api-ref, get-canary" description="Generate API documentation">
<target name="gendocs" depends="construct-ypgpm, construct-api-ref" description="Generate API documentation">
</target>

<target name="compile-docs" depends="init, get-canary">
<target name="compile-docs" depends="init">
<javac includeantruntime="false" srcdir="src/docs/java" destdir="${build}">
<classpath>
<pathelement path="${lib.canary}"/>
</classpath>
</javac>
</target>

<target name="generate-api-ref-entries" depends="copy-js,compile-docs,init,get-canary">
<target name="generate-api-ref-entries" depends="copy-js,compile-docs,init">

<jscript src="src/docs/js/generateApiDocs.js"
out="${dist}/apiref.md"
Expand All @@ -118,7 +99,7 @@

</target>

<target name="gen-events-helper-canary" depends="compile-docs,init, get-canary">
<target name="gen-events-helper-canary" depends="compile-docs,init">
<mkdir dir="${dist}/js/lib"/>
<jscript src="src/docs/js/generateEventsHelper.js"
out="${dist}/js/lib/events-helper-canary.js"
Expand All @@ -130,7 +111,7 @@
</jscript>
</target>

<target name="gen-events-helper-bukkit" depends="compile-docs,init,get-canary">
<target name="gen-events-helper-bukkit" depends="compile-docs,init">
<mkdir dir="${dist}/js/lib"/>
<jscript src="src/docs/js/generateEventsHelper.js"
out="${dist}/js/lib/events-helper-bukkit.js"
Expand Down Expand Up @@ -165,15 +146,15 @@ Walter Higgins
</concat>
</target>

<target name="gen-toc-apiref" depends="compile-docs,generate-api-ref-entries, init, get-canary" description="Generate Table of Contents for API Reference">
<target name="gen-toc-apiref" depends="compile-docs,generate-api-ref-entries, init" description="Generate Table of Contents for API Reference">
<jscript src="src/docs/js/generateTOC.js"
out="${dist}/toc-apiref.md"
err="${dist}/gen-toc-error.log">
<arg value="${dist}/apiref-con.md"/>
</jscript>
</target>

<target name="gen-toc-ypgpm" depends="compile-docs,init, get-canary" description="Generate Table of Contents for Young Programmers Guide">
<target name="gen-toc-ypgpm" depends="compile-docs,init" description="Generate Table of Contents for Young Programmers Guide">
<jscript src="src/docs/js/generateTOC.js"
out="${dist}/toc-ypgpm.md"
err="${dist}/gen-ypgpm-error.log">
Expand Down
Loading

0 comments on commit c6d6dea

Please sign in to comment.