adding LiteLoaderToSrg ant scripts and jenkins configurations

Mumfrey
1 parent d3ec7c49
Showing 4 changed files with 186 additions and 8 deletions
ant/build_liteloader.xml
ant/build_srgjar.xml
ant/ivy.xml
ant/ivysettings.xml
@@ -39,17 +39,27 @@
 	<target name="setup_development">
 	    <property name="skipremoval" value="DEV" />
 		<property name="md5.outfile" value="${md5.dir}/client_${outmd5set}.md5" />
+		<property name="artefact.name" value="${ant.project.name}-${mcversion}" />
 	</target>
  
 	<target name="setup_production">
 	    <property name="skipremoval" value="" />
 		<property name="md5.outfile" value="${md5.dir}/client_${outmd5set}_production.md5" />
+        <property name="artefact.name" value="${ant.project.name}-${mcversion}" />
+	</target>
+	
+	<target name="setup_jenkins">
+	    <property name="skipremoval" value="" />
+		<property name="md5.outfile" value="${md5.dir}/client_${outmd5set}_production.md5" />
+        <property name="artefact.name" value="${ant.project.name}-${mcversion}-SNAPSHOT" />
 	</target>
  
 	<!-- Main target -->
 	<target name="development" depends="setup_development, findmcp, setdirsold, setdirsnew, build" description="Entry point for MCP and upstream builds" />
  
-	<target name="production" depends="setup_production, findmcp, setdirsold, setdirsnew, build" description="Entry point for production builds" />
+	<target name="production" depends="setup_production, findmcp, setdirsold, setdirsnew, build, mcpjar" description="Entry point for production builds" />
+	
+	<target name="jenkins" depends="setup_jenkins, findmcp, setdirsold, setdirsnew, build, mcpjar" description="Entry point for CI builds" />
  
 	<target name="setdirsnew" description="Set the MCP source directories for the new layout" unless="mcpsrc.exists">
 		<echo level="info" message="Setting MCP source directories for NEW configuration" />
@@ -239,7 +249,7 @@
  
 		<mkdir dir="${dist.dir}" />
  
-		<jar destfile="${dist.dir}/${ant.project.name}-${mcversion}.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
+		<jar destfile="${dist.dir}/${artefact.name}.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
 			<manifest>
 				<attribute name="Built-By" value="MCP (http://mcp.ocean-labs.de)" />
 				<attribute name="Implementation-Vendor" value="${author}" />
@@ -259,10 +269,10 @@
  
         <mkdir dir="${dist.dir}" />
  
-        <delete file="${dist.dir}/${ant.project.name}-${version}-mcpnames.${filetype}" />
-        <delete file="${dist.dir}/${ant.project.name}-${version}-mcpnames-sources.${filetype}" />
+        <delete file="${dist.dir}/${artefact.name}-mcpnames.${filetype}" />
+        <delete file="${dist.dir}/${artefact.name}-mcpnames-sources.${filetype}" />
  
-        <jar destfile="${dist.dir}/${ant.project.name}-${version}-mcpnames.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
+        <jar destfile="${dist.dir}/${artefact.name}-mcpnames.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
             <manifest>
                 <attribute name="Built-By" value="MCP (http://mcp.ocean-labs.de)" />
                 <attribute name="Implementation-Vendor" value="${author}" />
@@ -275,7 +285,7 @@
             </manifest>
             <fileset dir="${eclipse}/LiteLoader/bin" />
         </jar>
-        <jar destfile="${dist.dir}/${ant.project.name}-${version}-mcpnames-sources.${filetype}" duplicate="preserve" index="false" filesetmanifest="skip">
+        <jar destfile="${dist.dir}/${artefact.name}-mcpnames-sources.${filetype}" duplicate="preserve" index="false" filesetmanifest="skip">
             <fileset dir="${eclipse}/LiteLoader/java/common" />
             <fileset dir="${eclipse}/LiteLoader/java/client" />
             <fileset dir="${eclipse}/LiteLoader/debug" />
@@ -287,7 +297,7 @@
  
 	<target name="deploy" depends="production" description="Deploy artifact to local minecraft installation in APPDATA">
 		<mkdir dir="${env.APPDATA}/.minecraft/libraries/com/mumfrey/liteloader/${mcversion}"/>
-		<copy todir="${env.APPDATA}/.minecraft/libraries/com/mumfrey/liteloader/${mcversion}" file="${dist.dir}/${ant.project.name}-${mcversion}.${filetype}" failonerror="false" overwrite="true" />
-		<copy todir="${eclipse}/LiteLoaderInstaller/src/main/resources" file="${dist.dir}/${ant.project.name}-${mcversion}.${filetype}" failonerror="false" overwrite="true" />
+		<copy todir="${env.APPDATA}/.minecraft/libraries/com/mumfrey/liteloader/${mcversion}" file="${dist.dir}/${artefact.name}.${filetype}" failonerror="false" overwrite="true" />
+		<copy todir="${eclipse}/LiteLoaderInstaller/src/main/resources" file="${dist.dir}/${artefact.name}.${filetype}" failonerror="false" overwrite="true" />
 	</target>
 </project>
 \ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="liteloadertosrg" basedir="." default="build" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+    <property name="project.name" value="liteloader" />
+    <property name="version" value="1.8" />
+    <property name="author" value="Mumfrey" />
+    
+    <property name="mcp.dir" location="../../.." />
+    <property name="mcp.temp.dir" location="${mcp.dir}/temp" />
+    <property name="minecraft.src.dir" location="${mcp.dir}/src/minecraft" />
+    <property name="lib.dir" location="./lib" />
+    <property name="temp.dir" location="./temp" />
+    <property name="out.dir" location="${temp.dir}/out" />
+    <property name="dist.dir" location="${mcp.dir}/build/dist" />
+    <property name="src.dir" location="${temp.dir}/src" />
+    <property name="map.file" location="${temp.dir}/range.map" />
+    <property name="insrg.file" location="${mcp.temp.dir}/client_ro_srg.srg" />
+    <property name="outsrg.file" location="${temp.dir}/remap.srg" />
+    <property name="liteloader.src.base" location="../java" />
+    
+    <property name="python_windows" location="${mcp.dir}/runtime/bin/python/python_mcp.exe" />
+    <property name="python_linux" location="/usr/bin/python" />
+
+    <path id="class.path">
+        <fileset dir="${lib.dir}">
+            <include name="**/*.jar" />
+        </fileset>
+    </path>
+	
+    <target name="build">
+        <property name="artefact" location="${dist.dir}/${project.name}-${version}-srgnames-sources.jar" />
+        <ivy:configure file="ivysettings.xml" />
+        <antcall target="jar" />
+    </target>
+
+    <target name="jenkins">
+        <property name="artefact" location="${dist.dir}/${project.name}-${version}-SNAPSHOT-srgnames-sources.jar" />
+        <ivy:configure file="ivysettings.xml" />
+        <antcall target="jar" />
+    </target>
+
+    <path id="classpath">
+        <fileset dir="${ivy.lib.dir}">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+    
+    <target name="clean">
+        <echo message="Cleaning working directories..." />
+        
+        <delete dir="${temp.dir}" failonerror="false" />
+        
+        <mkdir dir="${src.dir}"/>
+        <mkdir dir="${out.dir}"/>
+        <mkdir dir="${temp.dir}"/>
+    </target>
+    
+    <target name="init" depends="clean">
+        <echo message="Aggregating sources..." />
+    	
+        <copy todir="${src.dir}" overwrite="true">
+            <fileset dir="${minecraft.src.dir}">
+            	<exclude name="*.java" />
+            </fileset>
+            <fileset dir="${liteloader.src.base}/common">
+                <exclude name="**/Jump.java" />
+            </fileset>
+            <fileset dir="${liteloader.src.base}/client" />
+        </copy>
+        
+        <echo message="Fetching dependencies..." />
+    </target>
+    
+   <target name="reobfSrg" depends="init">
+        <echo message="Running reobf to generate srgs..." />
+        
+        <exec executable="${python_windows}" dir="${mcp.dir}" osfamily="windows">
+            <arg value="runtime/reobfuscate.py" />
+            <arg value="--srgnames" />
+            <arg value="--client" />
+        </exec>
+        
+        <exec executable="${python_linux}" dir="${mcp.dir}" osfamily="unix">
+            <arg value="runtime/reobfuscate.py" />
+            <arg value="--srgnames" />
+            <arg value="--client" />
+        </exec>
+    </target>
+
+    <target name="extractRanges" depends="reobfSrg">
+    	<echo message="Extracting ranges from source..." />
+    	
+        <java classname="net.minecraftforge.srg2source.ast.RangeExtractor" output="${temp.dir}/extractRanges.log">
+            <classpath refid="class.path" />
+            <arg value="${src.dir}" />
+            <arg value="${lib.dir}" />
+            <arg value="${map.file}" />
+        </java>
+    </target>
+    
+    <target name="flipsrg" depends="extractRanges">
+        <echo message="Remapping SRG file..." />
+    	
+        <copy file="${insrg.file}" tofile="${outsrg.file}" overwrite="true" />
+        <replaceregexp file="${outsrg.file}" byline="true" match="(FD|CL): ([^\s]+) ([^\s]+)" replace="\1: \3 \2" />
+        <replaceregexp file="${outsrg.file}" byline="true" match="MD: ([^\s]+) ([^\s]+) ([^\s]+) ([^\s]+)" replace="MD: \3 \4 \1 \2" />
+    </target>
+    
+    <target name="applyRanges" depends="flipsrg">
+        <echo message="Remapping ranges in source..." />
+    	
+        <java classname="net.minecraftforge.srg2source.rangeapplier.RangeApplier" output="${temp.dir}/applyRanges.log">
+            <classpath refid="class.path" />
+            <arg value="--srcRoot=${src.dir}" />
+            <arg value="--srcRangeMap=${map.file}" />
+            <arg value="--srgFiles=${outsrg.file}" />
+            <arg value="--outDir=${out.dir}" />
+        </java>
+    </target>
+    
+    <target name="jar" depends="applyRanges">
+        <echo message="Building src jar..." />
+        
+        <jar destfile="${artefact}" duplicate="preserve" index="true" manifestencoding="UTF-8">
+            <manifest>
+                <attribute name="Implementation-Vendor" value="${author}" />
+                <attribute name="Implementation-Title" value="${ant.project.name}" />
+                <attribute name="Implementation-Version" value="${version}" />
+            </manifest>
+            <fileset dir="${out.dir}">
+            	<exclude name="net/minecraft/**" />
+            </fileset>
+        </jar>
+    </target>
+</project>
 \ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    <info organisation="com.mumfrey" module="liteloader" status="integration">
+        <ivyauthor name="Adam Mummery-Smith" />
+    </info>
+    <dependencies>
+        <dependency org="org.ow2.asm" name="asm-debug-all" rev="4.1" />
+        <dependency org="com.google.guava" name="guava" rev="15.0" />
+        <dependency org="net.sf.opencsv" name="opencsv" rev="2.3" />
+        <dependency org="net.sf.jopt-simple" name="jopt-simple" rev="4.6" />
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="3.2.0.201312181205-r" />
+        <dependency org="org.eclipse.core" name="contenttype" rev="3.4.200-v20130326-1255" />
+        <dependency org="org.eclipse.core" name="jobs" rev="3.5.300-v20130429-1813" />
+        <dependency org="org.eclipse.core" name="runtime" rev="3.9.0-v20130326-1255" />
+        <dependency org="org.eclipse" name="osgi" rev="3.9.1-v20130814-1242" />
+        <dependency org="org.eclipse.text" name="org.eclipse.text" rev="3.5.101" />
+        <dependency org="org.eclipse.equinox" name="common" rev="3.6.200-v20130402-1505" />
+        <dependency org="org.eclipse.equinox" name="preferences" rev="3.5.100-v20130422-1538" />
+        <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.10.0.v20131029-1755" />
+        <dependency org="net.minecraftforge.srg2source" name="Srg2Source" rev="3.2-SNAPSHOT" />
+    </dependencies>
+</ivy-module>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ivysettings>
+    <settings defaultResolver="srg2source" />
+    <resolvers>
+        <chain name="srg2source">
+	        <ibiblio name="m2" m2compatible="true" />
+	        <ibiblio name="forge" m2compatible="true" root="http://files.minecraftforge.net/maven/"/>
+	        <ibiblio name="eclipse" m2compatible="true" root="https://repo.eclipse.org/content/groups/eclipse/"/>
+        </chain>
+    </resolvers>
+</ivysettings>
 \ No newline at end of file