Skip to content

Commit c6d6dea

Browse files
committed
3.1.10 release - fixed bukkit javadoc link. Added canarymod-1.8.0 and spigot-1.8.8.jar
1 parent bef42e3 commit c6d6dea

7 files changed

+246
-188
lines changed

build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scriptcraft-version=3.1.9
1+
scriptcraft-version=3.1.10

build.xml

+10-29
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<property name="src.bukkit" location="src/main/java/bukkit"/>
1212

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

1717
<property name="build" location="target/classes"/>
1818
<property name="dist" location="target/" />
@@ -56,26 +56,7 @@
5656
</target>
5757

5858

59-
<target name="get-canary" depends="init" description="Downloads canarymod jar" unless="canary.present">
60-
<mkdir dir="target/lib/"/>
61-
<get src="http://scriptcraftjs.org/download/latest/CanaryMod-1.8.0-1.2.1-SNAPSHOT-shaded.jar"
62-
maxtime="60"
63-
dest="target/lib/canarymod.jar"
64-
verbose="true"/>
65-
<!--
66-
wph 20150801 - CanaryMod is no longer being developed. Get the latest version from scriptcraftjs.org instead.
67-
<get src="https://ci.visualillusionsent.net/job/CanaryMod/lastStableBuild/artifact/*zip*/archive.zip"
68-
maxtime="60"
69-
dest="target/canarymod.zip"
70-
verbose="true"/>
71-
<unzip src="target/canarymod.zip"
72-
dest="target/lib">
73-
<mapper type="glob" from="*.jar" to="canarymod.jar"/>
74-
</unzip>
75-
-->
76-
</target>
77-
78-
<target name="compile-plugins" depends="init,get-canary" description="compile canary plugin source">
59+
<target name="compile-plugins" depends="init" description="compile canary plugin source">
7960
<javac includeantruntime="false"
8061
source="1.6"
8162
target="1.6"
@@ -90,18 +71,18 @@
9071
</javac>
9172
</target>
9273

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

96-
<target name="compile-docs" depends="init, get-canary">
77+
<target name="compile-docs" depends="init">
9778
<javac includeantruntime="false" srcdir="src/docs/java" destdir="${build}">
9879
<classpath>
9980
<pathelement path="${lib.canary}"/>
10081
</classpath>
10182
</javac>
10283
</target>
10384

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

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

119100
</target>
120101

121-
<target name="gen-events-helper-canary" depends="compile-docs,init, get-canary">
102+
<target name="gen-events-helper-canary" depends="compile-docs,init">
122103
<mkdir dir="${dist}/js/lib"/>
123104
<jscript src="src/docs/js/generateEventsHelper.js"
124105
out="${dist}/js/lib/events-helper-canary.js"
@@ -130,7 +111,7 @@
130111
</jscript>
131112
</target>
132113

133-
<target name="gen-events-helper-bukkit" depends="compile-docs,init,get-canary">
114+
<target name="gen-events-helper-bukkit" depends="compile-docs,init">
134115
<mkdir dir="${dist}/js/lib"/>
135116
<jscript src="src/docs/js/generateEventsHelper.js"
136117
out="${dist}/js/lib/events-helper-bukkit.js"
@@ -165,15 +146,15 @@ Walter Higgins
165146
</concat>
166147
</target>
167148

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

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

0 commit comments

Comments
 (0)