buildserver fixes
thanks deathrat!
This commit is contained in:
StevenRS11
parent
6383c4f5ff
commit
c39e2b34ab
2 changed files with 231 additions and 17 deletions
49
build.xml
49
build.xml
|
|
@ -14,6 +14,9 @@
|
||||||
<property name="mcp.dir" value="${forge.dir}/mcp" />
|
<property name="mcp.dir" value="${forge.dir}/mcp" />
|
||||||
<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft" />
|
<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft" />
|
||||||
<property name="resources.dir" value="resources" />
|
<property name="resources.dir" value="resources" />
|
||||||
|
|
||||||
|
<property name="gson.url" value="https://google-gson.googlecode.com/files/google-gson-2.2.4-release.zip" />
|
||||||
|
<property name="gson.name" value="gson-2.2.4.zip" />
|
||||||
|
|
||||||
<property name="package.meta-inf" value="META-INF" />
|
<property name="package.meta-inf" value="META-INF" />
|
||||||
<property name="build.ver" value="1.5.2" />
|
<property name="build.ver" value="1.5.2" />
|
||||||
|
|
@ -41,8 +44,6 @@
|
||||||
<fileset dir="StevenDimDoors" />
|
<fileset dir="StevenDimDoors" />
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<exec dir="${verclass.dir}" executable="sh" osfamily="unix" outputproperty="grep.out">
|
<exec dir="${verclass.dir}" executable="sh" osfamily="unix" outputproperty="grep.out">
|
||||||
<arg value="-c"/>
|
<arg value="-c"/>
|
||||||
<arg value="grep -o -P '[0-9.]+R[0-9.]+(RC[0-9]+)?(B[0-9]+)?' ${verclass.name}"/>
|
<arg value="grep -o -P '[0-9.]+R[0-9.]+(RC[0-9]+)?(B[0-9]+)?' ${verclass.name}"/>
|
||||||
|
|
@ -56,6 +57,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<available property="forge-exists" file="${download.dir}/minecraftforge-src-${forge.version}.zip" />
|
<available property="forge-exists" file="${download.dir}/minecraftforge-src-${forge.version}.zip" />
|
||||||
|
<available property="gson-exists" file="${mcpsrc.dir}/com/google/gson/Gson.java" />
|
||||||
<available property="already-compiled" file="${classes.dir}/deathrat" />
|
<available property="already-compiled" file="${classes.dir}/deathrat" />
|
||||||
<condition property="should-download-ant-contrib">
|
<condition property="should-download-ant-contrib">
|
||||||
<or>
|
<or>
|
||||||
|
|
@ -65,17 +67,30 @@
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
<target name="install" depends="build">
|
<target name="install" depends="build">
|
||||||
<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"/>
|
||||||
<delete dir="${mcpsrc}/StevenDimDoors" />
|
<delete dir="${mcpsrc.dir}/StevenDimDoors" />
|
||||||
<delete dir="${mcpsrc}/Steven" />
|
<delete dir="${mcpsrc.dir}/Steven" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="get-gson" unless="gson-exists">
|
||||||
|
<get src="${gson.url}" dest="${download.dir}/${gson.name}" />
|
||||||
|
<unzip src="${download.dir}/${gson.name}" dest="${download.dir}" />
|
||||||
|
<unzip src="${download.dir}/google-gson-2.2.4/gson-2.2.4-sources.jar" dest="${download.dir}/google-gson-2.2.4/"/>
|
||||||
|
<copy todir="${mcpsrc.dir}/com">
|
||||||
|
<fileset dir="${download.dir}/google-gson-2.2.4/com"/>
|
||||||
|
</copy>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="build" depends="get-version" unless="already-compiled">
|
<target name="build" depends="get-version,get-gson" unless="already-compiled">
|
||||||
|
|
||||||
<!-- Recompile -->
|
<!-- Recompile -->
|
||||||
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" failonerror="true">
|
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" failonerror="true">
|
||||||
<arg line="/c recompile.bat"/>
|
<arg line="/c recompile.bat"/>
|
||||||
|
|
@ -155,17 +170,17 @@
|
||||||
</copy> -->
|
</copy> -->
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="download-forge" depends="download-ant-contrib" unless="forge-exists">
|
<target name="download-forge" depends="download-ant-contrib" unless="forge-exists">
|
||||||
<taskdef resource="net/sf/antcontrib/antlib.xml">
|
<taskdef resource="net/sf/antcontrib/antlib.xml">
|
||||||
<classpath>
|
<classpath>
|
||||||
<pathelement location="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
|
<pathelement location="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
|
||||||
<fileset dir="${download.dir}/ant-contrib/lib">
|
<fileset dir="${download.dir}/ant-contrib/lib">
|
||||||
<include name="*.jar"/>
|
<include name="*.jar"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</classpath>
|
</classpath>
|
||||||
</taskdef>
|
</taskdef>
|
||||||
<echo message="Downloading forge... " />
|
<echo message="Downloading forge... " />
|
||||||
<get src="${forge.url}" dest="${download.dir}/minecraftforge-src-${forge.version}.zip" />
|
<get src="${forge.url}" dest="${download.dir}/minecraftforge-src-${forge.version}.zip" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
199
buildOLD.xml
Normal file
199
buildOLD.xml
Normal file
|
|
@ -0,0 +1,199 @@
|
||||||
|
|
||||||
|
|
||||||
|
<project name="DimensionalDoors" default="install" basedir=".">
|
||||||
|
|
||||||
|
<property environment="env" />
|
||||||
|
|
||||||
|
<property name="build.dir" value="build" />
|
||||||
|
<property name="classes.dir" value="${build.dir}/packaging" />
|
||||||
|
<property name="src.dir" value="src" />
|
||||||
|
<property name="forge.version" value="1.5.2-7.8.0.691" />
|
||||||
|
<property name="forge.url" value="http://files.minecraftforge.net/minecraftforge/minecraftforge-src-${forge.version}.zip" />
|
||||||
|
<property name="mcp.version" value="751" />
|
||||||
|
<property name="forge.dir" value="${build.dir}/forge" />
|
||||||
|
<property name="mcp.dir" value="${forge.dir}/mcp" />
|
||||||
|
<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft" />
|
||||||
|
<property name="resources.dir" value="resources" />
|
||||||
|
|
||||||
|
<property name="package.meta-inf" value="META-INF" />
|
||||||
|
<property name="build.ver" value="1.5.2" />
|
||||||
|
<property name="dist.dir" value="${build.dir}/dist" />
|
||||||
|
|
||||||
|
<property name="download.dir" value="downloads" />
|
||||||
|
|
||||||
|
<property name="lib.dir" value="${mcp.dir}/lib" />
|
||||||
|
|
||||||
|
<property file="${forge.dir}/forgeversion.properties" />
|
||||||
|
<condition property="forge.already.installed">
|
||||||
|
<equals arg1="${forge.build.number}" arg2="691" />
|
||||||
|
</condition>
|
||||||
|
|
||||||
|
<property name="verclass.dir" value="${mcpsrc.dir}/StevenDimDoors/mod_pocketDim/" />
|
||||||
|
<property name="verclass.name" value="mod_pocketDim.java"/>
|
||||||
|
|
||||||
|
|
||||||
|
<mkdir dir="${download.dir}"/>
|
||||||
|
<mkdir dir="${build.dir}" />
|
||||||
|
|
||||||
|
<target name="get-version" depends="setup-forge">
|
||||||
|
<mkdir dir="${mcpsrc.dir}/StevenDimDoors" />
|
||||||
|
<copy todir="${mcpsrc.dir}/StevenDimDoors" overwrite="true">
|
||||||
|
<fileset dir="StevenDimDoors" />
|
||||||
|
</copy>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<exec dir="${verclass.dir}" executable="sh" osfamily="unix" outputproperty="grep.out">
|
||||||
|
<arg value="-c"/>
|
||||||
|
<arg value="grep -o -P '[0-9.]+R[0-9.]+(RC[0-9]+)?(B[0-9]+)?' ${verclass.name}"/>
|
||||||
|
</exec>
|
||||||
|
<exec executable="python" osfamily="unix">
|
||||||
|
<arg value="versionscript.py" />
|
||||||
|
<arg value="${grep.out}" />
|
||||||
|
</exec>
|
||||||
|
<echo message="Grepped version: ${grep.out}"/>
|
||||||
|
<copy todir="${classes.dir}" file="mcmod.info" overwrite="true"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<available property="forge-exists" file="${download.dir}/minecraftforge-src-${forge.version}.zip" />
|
||||||
|
<available property="already-compiled" file="${classes.dir}/deathrat" />
|
||||||
|
<condition property="should-download-ant-contrib">
|
||||||
|
<or>
|
||||||
|
<available file="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
|
||||||
|
<available file="${download.dir}/minecraftforge-src-${forge.version}.zip"/>
|
||||||
|
</or>
|
||||||
|
</condition>
|
||||||
|
|
||||||
|
<target name="install" depends="build">
|
||||||
|
<copy todir="${classes.dir}/schematics" overwrite="true">
|
||||||
|
<fileset dir="schematics" />
|
||||||
|
</copy>
|
||||||
|
<zip destfile="${dist.dir}/DimensionalDoors-${grep.out}-${build.number}.zip" basedir="${classes.dir}"/>
|
||||||
|
<delete dir="${classes.dir}" />
|
||||||
|
<delete dir="${mcp.dir}/reobf"/>
|
||||||
|
<delete dir="${mcpsrc}/StevenDimDoors" />
|
||||||
|
<delete dir="${mcpsrc}/Steven" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" depends="get-version" unless="already-compiled">
|
||||||
|
<!-- Recompile -->
|
||||||
|
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" failonerror="true">
|
||||||
|
<arg line="/c recompile.bat"/>
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
<exec dir="${mcp.dir}" executable="sh" osfamily="unix" failonerror="true">
|
||||||
|
<arg value="recompile.sh" />
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
<!-- Reobf -->
|
||||||
|
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
|
||||||
|
<arg line="/c reobfuscate_srg.bat"/>
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
|
||||||
|
<arg value="reobfuscate_srg.sh" />
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
<copy todir="${classes.dir}">
|
||||||
|
<fileset dir="${mcp.dir}/reobf/minecraft"/>
|
||||||
|
</copy>
|
||||||
|
<copy todir="${classes.dir}">
|
||||||
|
<fileset dir="${resources.dir}"/>
|
||||||
|
</copy>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build-number-there" if="env.BUILD_NUMBER" >
|
||||||
|
<echo message="Using build number ${env.BUILD_NUMBER}..." />
|
||||||
|
<property name="build.number" value="${env.BUILD_NUMBER}" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build-number-not-there" unless="env.BUILD_NUMBER" >
|
||||||
|
<echo message="!! No build number set !!" />
|
||||||
|
<property name="build.number" value="CUSTOM_BUILD" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="setup-forge" depends="download-forge,build-number-there,build-number-not-there" unless="forge.already.installed">
|
||||||
|
|
||||||
|
<property name="build.full" value="${build.number}" />
|
||||||
|
<unzip dest="${build.dir}">
|
||||||
|
<fileset dir="${download.dir}">
|
||||||
|
<include name="minecraftforge-src-${forge.version}.zip"/>
|
||||||
|
</fileset>
|
||||||
|
</unzip>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Change executables' permitions -->
|
||||||
|
|
||||||
|
<chmod file="${forge.dir}/install.sh" perm="+x"/>
|
||||||
|
|
||||||
|
<!-- if your building on OSX these 2 should be executable -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Install forge -->
|
||||||
|
<delete dir="${mcp.dir}" failonerror="no"/>
|
||||||
|
<exec dir="${forge.dir}" executable="cmd" osfamily="windows" inputstring="Yes\n">
|
||||||
|
<arg line="/c install.cmd"/>
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
|
||||||
|
<arg value="install.sh" />
|
||||||
|
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
|
||||||
|
<chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
|
||||||
|
<chmod file="${mcp.dir}/recompile.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/jad-osx" perm="+x" />
|
||||||
|
<!-- Copy libraries -->
|
||||||
|
<!-- <copy todir="${mcp.dir}/lib" >
|
||||||
|
<fileset dir="lib" >
|
||||||
|
<patternset includes="*.jar" />
|
||||||
|
</fileset>
|
||||||
|
</copy> -->
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="download-forge" depends="download-ant-contrib" unless="forge-exists">
|
||||||
|
<taskdef resource="net/sf/antcontrib/antlib.xml">
|
||||||
|
<classpath>
|
||||||
|
<pathelement location="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
|
||||||
|
<fileset dir="${download.dir}/ant-contrib/lib">
|
||||||
|
<include name="*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
</classpath>
|
||||||
|
</taskdef>
|
||||||
|
<echo message="Downloading forge... " />
|
||||||
|
<get src="${forge.url}" dest="${download.dir}/minecraftforge-src-${forge.version}.zip" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<target name="download-ant-contrib" unless="should-download-ant-contrib">
|
||||||
|
<echo message="Getting: ant-contrib"/>
|
||||||
|
<mkdir dir="${download.dir}/tmp"/>
|
||||||
|
<mkdir dir="${download.dir}/ant-contrib/lib" />
|
||||||
|
<get src="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download" dest="${download.dir}/tmp/ant-contrib-1.0b3-bin.zip"/>
|
||||||
|
<get src="http://archive.apache.org/dist/commons/codec/binaries/commons-codec-1.6-bin.zip" dest="${download.dir}/tmp/commons-codec-1.6-bin.zip"/>
|
||||||
|
|
||||||
|
<unzip src="${download.dir}/tmp/ant-contrib-1.0b3-bin.zip" dest="${download.dir}"/>
|
||||||
|
<unzip src="${download.dir}/tmp/commons-codec-1.6-bin.zip" dest="${download.dir}/tmp"/>
|
||||||
|
|
||||||
|
<move todir="${download.dir}/ant-contrib/lib">
|
||||||
|
<fileset file="${download.dir}/tmp/commons-codec-1.6/commons-codec-1.6.jar"/>
|
||||||
|
</move>
|
||||||
|
|
||||||
|
<!-- Delete useless files -->
|
||||||
|
<delete dir="${download.dir}/ant-contrib/docs"/>
|
||||||
|
<delete dir="${download.dir}/tmp"/>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="clean" >
|
||||||
|
<delete dir="${build.dir}" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
</project>
|
||||||
|
|
||||||
Loading…
Reference in a new issue