From 09d37f87b0e9ba72efe823b51718f1bd5625b488 Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Thu, 5 Apr 2012 21:40:16 -0400
Subject: [PATCH] New build script- version the src dist as well

---
 fml/build.xml                                 |  19 ++++++++++++++++--
 .../.plugins/org.eclipse.core.resources/.snap | Bin 5906 -> 0 bytes
 2 files changed, 17 insertions(+), 2 deletions(-)
 delete mode 100644 fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap

diff --git a/fml/build.xml b/fml/build.xml
index 0e7e74dd7..12e84a82b 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -136,7 +136,7 @@
     <zip destfile="${basedir}/target/${jarname}.zip">
       <fileset dir="${output}" includes="**/*.class" />
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
-      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" prefix=""/>
+      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" prefix="/"/>
       <mappedresources>
         <concat>
           <fileset dir="${basedir}/install" includes="README.txt" />
@@ -159,9 +159,24 @@
     <property name="jarname" value="${modname}-src-${version}" />
     <zip destfile="${basedir}/target/${jarname}.zip">
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt" prefix="fml" />
-      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/src/minecraft_server" />
+      <zipfileset dir="${common.src.dir}" includes="**/*.java" excludes="**/Loader.java" prefix="fml/src/minecraft_server" />
       <zipfileset dir="${server.src.dir}" includes="**/*.java" prefix="fml/src/minecraft_server" />
       <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
+      <mappedresources>
+        <concat>
+          <fileset dir="${common.src.dir}" includes="cpw/mods/fml/common/Loader.java" />
+          <filterchain>
+            <replacetokens>
+              <token key="MAJOR" value="${version.major}" />
+              <token key="MINOR" value="${version.minor}" />
+              <token key="REV" value="${version.rev}" />
+              <token key="BUILD" value="${version.build}" />
+              <token key="MCVERSION" value="${version.minecraft}" />
+            </replacetokens>
+          </filterchain>
+        </concat>
+        <mergemapper to="fml/cpw/mods/fml/common/Loader.java" />
+      </mappedresources>
       <mappedresources>
         <concat>
           <fileset dir="${basedir}/install" includes="README.txt" />
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap
deleted file mode 100644
index 3d59c8f9f5472e86dae6268c475e4dbbeb56b980..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5906
zcmd6rOHUL*5XXCH-i#RDhz3DK`yfU=7>^hdUxE1G06wA)FvP{(9b8s0AqvRGAmSsE
za3b;GC-AH>p1hd&3A}rhgo8$7w7R;chlj%q>=<@JcA8}WRa5`^b<cLUzj-p%@{UzE
zv@U#oJ^#KjpXcQ<ysY2q?tT_F$&mqnMjk6Y)z#V75s%r)G|ywaFP7v6<Nd>9aLZ3P
z10(X^!9*Nxh5b$<;Uqa{<(-Z-V5jyUJ=`C+Mn(*XbrO;p$ETN?hE*Cd3HO~ee!*BJ
zNxIWk+V+>3y&$PlGBeJYsbm`ndf>~|p1^&`pdt)bMxlqSQ41=luAmC`%&2I*1n!kI
zzRZ+U-F9l!PDSg~5aghe#e>jJiP#F+{SZ!x+aMsPWOpKTN<d_CD!-V0=>4^fBwk#e
z8-F|Yu{|fq{CN%@QeH@A1&v<@`K@J0W{r}WNq@gRfh4om6J+hTj*MhdC;8RL$<%p-
zB$G;(u5CPrJ((oal}&_j3dtm=#KQ>4)Q`d?ndDUQVvdse=i3E%O1O|rnnz+j$Zst}
zGF{Ldf4@C}B(n}vG7|(@lc^&knbdlIEpjq-9wgHxW-7E(xMsSt$q-H<ndFq1j?^hh
zCOK8Ml$&H`iar%9N{~!<N-qTX?a7eLT?AUn*Y6bqNoIp5$d*hmGLl)ZBJ&$jlbI>{
zyrg0ynN+gK1UjW<a?NyQ0GiM5o)vlI+nk&dkFqCog;SDDa;l;rN6D<TevsdjaNkYi
z#UQ`649VQ9Wad48zdeB@v&j==O{R{FWHzeE+>V?~od?OJlErLjr*O@5WsgHRg=;1`
zCFUX^Q&)g*b8@QcdybM>Uv@<G64y+6TJb8#Z!JSI_Yr90{(gG`NoI>D$eK(Y8Odx`
zk@>C2$<%p}Oe$GC4eb<?>B;~!zctg#BiBrFN<5E%OdT1?B&TWzw~<VPRdzW89ZoWB
z#gcYv?Y=qFI59({$lsiWGzNmgQ&X`jfxCN#qXgLhd-3@Wh+UxKbJ*SDIm705&!KA(
zeO@gRipXm@<keF0Y#Y1FS<TrVClwz!Z9{Xdw6ng!twk_V<z>Q=1<S`FGq1y>TGh5S
z=Qf$<WAyvQlw1^%tQR)0m+Zl~-Jgy*$uo9*_#a3$--WNq%RCPsr8s2fmGEugta@!#
zYpBvi@nQ(iRSIr0wjqnUCS;LV=dc^BSyz*rPn`i}bV<A%a*-RnZc7wzre`7!>8NMo
zPUxN?|MZk{E!{-VgasMPl%XQ=e|mNh!c)%*;NT==&*YqQ*QfeT^{fq)ZqH`3nXM<J
zFUFS7NsZvydf<zYIcT=J<=zb62ROI%n>)m^PJwgBU6Fz7Ev?9b>yJ){EK@~dB$A5g
R9ivllNfuR9*s-qDe*uaAd@%q3