LiteLoader / LiteLoader · Commits

Commit 2ceb8ad829514a5441f89c5317dbb5d3af6043a1

Authored by Mumfrey
1 parent 33e3174e

include debug and resources in core and mcpnames jars

Inline Side-by-side
Showing 1 changed file with 25 additions and 10 deletions
ant/build_liteloader.xml
  View file @2ceb8ad
... ... @@ -11,6 +11,7 @@
11 11 <!-- Project definitions and dependencies -->
12 12 <property name="upstream" value="" />
13 13 <property name="project" value="LiteLoader" />
  14 + <property name="displayname" value="LiteLoader" />
14 15 <property name="md5set" value="mcp" />
15 16 <property name="outmd5set" value="liteloader" />
16 17 <property name="tweakclass" value="com.mumfrey.liteloader.launch.LiteLoaderTweaker" />
... ... @@ -24,6 +25,7 @@
24 25 <property name="src.dir" location="${build.dir}/src"/>
25 26 <property name="mc.src.dir" location="${mcp.dir}/src/minecraft" />
26 27 <property name="mc.bin.dir" location="${mcp.dir}/bin/minecraft" />
  28 + <property name="reobf.dir" location="${mcp.dir}/reobf/minecraft" />
27 29 <property name="mc.libs.dir" location="${mcp.dir}/jars/libraries" />
28 30  
29 31 <property name="dist.dir" location="${build.dir}/dist" />
... ... @@ -157,7 +159,7 @@
157 159  
158 160 <echo level="info" message="Contributing libs" />
159 161 <copy todir="${libs.dir}" verbose="true" overwrite="true">
160   - <fileset dir="${eclipse.dir}/LiteLoader/lib">
  162 + <fileset dir="${eclipse.dir}/${project}/lib">
161 163 <exclude name="**/authlib*.jar" />
162 164 <exclude name="**/log4j*.jar" />
163 165 </fileset>
... ... @@ -238,7 +240,7 @@
238 240 <echo level="info" message="Staging resources" />
239 241  
240 242 <copy todir="${stage.dir}" overwrite="true">
241   - <fileset dir="${mcp.dir}/reobf/minecraft" excludes=".svn/**, *.txt">
  243 + <fileset dir="${reobf.dir}" excludes=".svn/**, *.txt">
242 244 <exclude name="?.class" />
243 245 <exclude name="??.class" />
244 246 <exclude name="???.class" />
... ... @@ -275,15 +277,23 @@
275 277 <attribute name="Implementation-Title" value="${ant.project.name}" />
276 278 <attribute name="Implementation-Version" value="${meta.version}" />
277 279 <attribute name="TweakClass" value="${tweakclass}" />
278   - <attribute name="TweakName" value="LiteLoader" />
  280 + <attribute name="TweakName" value="${displayname}" />
279 281 <attribute name="TweakVersion" value="${version}" />
280 282 <attribute name="TweakAuthor" value="${author}" />
281 283 </manifest>
282 284 <fileset dir="${stage.dir}" />
283 285 </jar>
284 286 </target>
  287 +
  288 + <target name="compiledebug" description="Recompile with debug classes">
  289 + <copy todir="${src.dir}" verbose="false" overwrite="true" failonerror="false">
  290 + <fileset dir="${eclipse.dir}/${project}/debug" />
  291 + </copy>
  292 +
  293 + <antcall target="recompile" />
  294 + </target>
285 295  
286   - <target name="mcpjar" description="Build the MCP-names jar">
  296 + <target name="mcpjar" description="Build the MCP-names jar" depends="compiledebug">
287 297 <echo level="info" message="Building mcpnamesjars" />
288 298  
289 299 <mkdir dir="${dist.dir}" />
... ... @@ -298,20 +308,24 @@
298 308 <attribute name="Implementation-Title" value="${ant.project.name}" />
299 309 <attribute name="Implementation-Version" value="${meta.version}" />
300 310 <attribute name="TweakClass" value="${tweakclass}" />
301   - <attribute name="TweakName" value="LiteLoader" />
  311 + <attribute name="TweakName" value="${displayname}" />
302 312 <attribute name="TweakVersion" value="${version}" />
303 313 <attribute name="TweakAuthor" value="${author}" />
304 314 </manifest>
305   - <fileset dir="${mcp.dir}/bin/minecraft">
  315 + <fileset dir="${mc.bin.dir}">
306 316 <include name="com/mumfrey/**" />
307 317 <include name="net/eq2online/**" />
308 318 </fileset>
  319 + <fileset dir="${eclipse.dir}/${project}/resources" excludes=".svn/**" />
  320 + <fileset dir="${eclipse.dir}/${project}/debug" excludes=".svn/**">
  321 + <exclude name="**/*.java" />
  322 + </fileset>
309 323 </jar>
310 324 <jar destfile="${dist.dir}/${artefact.name}-mcpnames-sources.${filetype}" duplicate="preserve" index="false" filesetmanifest="skip">
311   - <fileset dir="${eclipse.dir}/LiteLoader/java/common" />
312   - <fileset dir="${eclipse.dir}/LiteLoader/java/client" />
313   - <fileset dir="${eclipse.dir}/LiteLoader/debug" />
314   - <fileset dir="${eclipse.dir}/LiteLoader/resources" />
  325 + <fileset dir="${eclipse.dir}/${project}/java/common" />
  326 + <fileset dir="${eclipse.dir}/${project}/java/client" />
  327 + <fileset dir="${eclipse.dir}/${project}/debug" />
  328 + <fileset dir="${eclipse.dir}/${project}/resources" />
315 329 </jar>
316 330 </target>
317 331  
... ... @@ -343,6 +357,7 @@
343 357 </manifest>
344 358 <fileset dir="${stage.dir}/${javadocpath}" />
345 359 </jar>
  360 + <copy file="${dist.dir}/${artefact.name}-javadoc.${filetype}" tofile="${dist.dir}/${artefact.name}-mcpnames-javadoc.${filetype}" />
346 361 </target>
347 362  
348 363 <target name="deploy" depends="production" description="Deploy artifact to local minecraft installation in APPDATA">
... ...