apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Merging changes #92

Merged
StevenRS11 merged 7 commits from master into 1.6.2-code 2013-11-06 20:45:39 +00:00
Conversation 0 Commits 7 Files Changed 22 +11 -18
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7d13c3afc0 - Show all commits

29
build.xml
View File

@@ -70,9 +70,6 @@
<copy todir="${classes.dir}/schematics" overwrite="true"> <copy todir="${classes.dir}/schematics" overwrite="true">
<fileset dir="schematics" /> <fileset dir="schematics" />
</copy> </copy>
<copy todir="${classes.dir}/com">
<fileset dir="com" />
</copy>
<zip destfile="${dist.dir}/DimensionalDoors-${grep.out}-${build.number}.zip" basedir="${classes.dir}"/> <zip destfile="${dist.dir}/DimensionalDoors-${grep.out}-${build.number}.zip" basedir="${classes.dir}"/>
<delete dir="${classes.dir}" /> <delete dir="${classes.dir}" />
<delete dir="${mcp.dir}/reobf"/> <delete dir="${mcp.dir}/reobf"/>
@@ -154,27 +151,23 @@
<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes\n"> <exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
<arg value="install.sh" /> <arg value="install.sh" />
</exec> </exec>
<get src="http://mirror.technicpack.net/Technic/lib/fml/fml_libs15.zip" dest="${download.dir}/fml_libs15.zip" />
<unzip src="${download.dir}/fml_libs15.zip" dest="${lib.dir}/" />
<exec dir="${forge.dir}" executable="cmd" osfamily="windows" inputstring="Yes">
<arg line="/c install.cmd"/>
</exec>
<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes">
<arg value="install.sh" />
</exec>
<chmod file="${mcp.dir}/decompile.sh" perm="+x"/>
<chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/> <chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
<chmod file="${mcp.dir}/recompile.sh" perm="+x"/> <chmod file="${mcp.dir}/recompile.sh" perm="+x"/>
<chmod file="${mcp.dir}/reobfuscate_srg.sh" perm="+x"/> <chmod file="${mcp.dir}/reobfuscate_srg.sh" perm="+x"/>
<chmod file="${mcp.dir}/runtime/bin/astyle-osx" perm="+x" /> <chmod file="${mcp.dir}/runtime/bin/astyle-osx" perm="+x" />
<chmod file="${mcp.dir}/runtime/bin/jad-osx" perm="+x" /> <chmod file="${mcp.dir}/runtime/bin/jad-osx" perm="+x" />
<!-- Remove below after 1.5 -->
<get src="http://mirror.technicpack.net/Technic/lib/fml/fml_libs15.zip" dest="${download.dir}/fml_libs15.zip" />
<unzip src="${download.dir}/fml_libs15.zip" dest="${lib.dir}/" />
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" inputstring="Yes\n">
<arg line="/c decompile.bat"/>
</exec>
<exec dir="${mcp.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
<arg value="decompile.sh" />
</exec>
<!-- Remove above after 1.5 -->
<!-- Copy libraries --> <!-- Copy libraries -->
<!-- <copy todir="${mcp.dir}/lib" > <!-- <copy todir="${mcp.dir}/lib" >
<fileset dir="lib" > <fileset dir="lib" >