Build installer package for the new client launcher.

fml/.gitignore

@@ -16,3 +16,4 @@ fmlbranding.properties
 /mcp_data/
 /map_client.txt
 /*.lzma
+/installer_base.jar

fml/build.xml

@@ -191,6 +191,33 @@
     </zip>
   </target>
 
+  <target name="build-installer" depends="build-universal">
+    <condition property="version.fullname" value="${version.minecraft}-${version}" else="${version.minecraft}-${version}-${version.branch}">
+      <equals arg1="${version.branch}" arg2="master" />
+    </condition>
+    <tstamp>
+      <format property="current.time" pattern="yyyy-MM-dd'T'HH:mm:ssZ" />
+    </tstamp>
+  
+    <delete file="${basedir}/installer_base.jar" />
+    <delete file="${basedir}/install_profile.json" />
+    <get src="http://files.minecraftforge.net/installer/forge-installer-1.0.jar" dest="${basedir}/installer_base.jar" />
+    <copy file="${basedir}/jsons/${version.minecraft}-rel.json" tofile="${basedir}/install_profile.json" />
+    <copy file="${basedir}/installer_base.jar" tofile="${basedir}/target/${modname}-installer-${version.fullname}.jar" />
+    <replace file="${basedir}/install_profile.json">
+      <replaceFilter token="@version@" value="${version}" />
+      <replaceFilter token="@minecraft_version@" value="${version.minecraft}" />
+      <replaceFilter token="@timestamp@" value="${current.time}" />
+      <replaceFilter token="@universal_jar@" value="${modname}-universal-${version.fullname}.jar" />
+    </replace>
+    <jar destfile="${basedir}/target/${modname}-installer-${version.fullname}.jar" update="true">
+      <zipfileset dir="${basedir}" includes="install_profile.json" />
+      <zipfileset dir="${basedir}/jsons" includes="big_logo.png" />
+      <zipfileset dir="${basedir}/target" includes="${modname}-universal-${version.fullname}.jar" />
+    </jar>
+    <delete file="${basedir}/install_profile.json" />
+  </target>
+
   <target name="build-source-pack" depends="makeversion">
     <property name="srcpack.jarname" value="${modname}-src-${version.minecraft}-${version}-${version.branch}" />
     <zip destfile="${basedir}/target/${srcpack.jarname}.zip">
@@ -245,7 +272,7 @@
     <delete dir="build-tmp-deobf" />
   </target>
 
-  <target name="build" depends="buildenvsetup,build-deobf-data,merge-client,merge-common,build-universal,build-source-pack" />
+  <target name="build" depends="buildenvsetup,build-deobf-data,merge-client,merge-common,build-universal,build-installer,build-source-pack" />
 
   <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build" />
 

fml/jsons/1.6.1-rel.json

@@ -1,22 +1,39 @@
 {
-  "id": "FML{version}",
+  "install": {
-  "time": "{timestamp}",
+    "profileName": "FML",
-  "releaseTime": "{timestamp}",
+    "target":"FML@version@",
+    "path":"cpw.mods:fml:@version@",
+    "version":"FML @version@",
+    "filePath":"@universal_jar@",
+    "welcome":"Welcome to the simple FML installer.",
+    "minecraft":"@minecraft_version@",
+    "logo":"/big_logo.png"
+  },
+  "versionInfo": {
+    "id": "FML@version@",
+    "time": "@timestamp@",
+    "releaseTime": "@timestamp@",
     "type": "release",
     "processArguments": "username_session_version",
     "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
     "minimumLauncherVersion": 2,
     "libraries": [
       {
-      "name": "cpw.mods:fml:{version}",
+        "name": "cpw.mods:fml:@version@",
-      "devdl" : "false"
+        "url": "http://files.minecraftforge.net/maven/"
       },
       {
         "name": "net.minecraft:launchwrapper:1.3"
       },
+      {
+        "name": "org.ow2.asm:asm-all:4.1"
+      },
       {
         "name": "net.sf.jopt-simple:jopt-simple:4.5"
       },
+      {
+        "name": "lzma:lzma:0.0.1"
+      },
       {
         "name": "com.paulscode:codecjorbis:20101023"
       },
@@ -89,5 +106,6 @@
         }
       }
     ],
-  "mainClass": "net.minecraft.client.main.Main"
+    "mainClass": "net.minecraft.launchwrapper.Launch"
+  }
 }