From 3d2651132294de13394ff8cb0bab878e17b326a2 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Wed, 8 Aug 2012 23:44:32 -0700
Subject: [PATCH] Include conf folder and merge config in source zip

---
 fml/build.xml          | 4 +++-
 fml/install/install.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index 2084f4bde2..6fb13f2e04 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -64,6 +64,7 @@
     <property name="client.src.dir" location="${basedir}/client" />
     <property name="server.src.dir" location="${basedir}/server" />
     <property name="patch.src.dir" location="${basedir}/patches" />
+    <property name="fml.conf.dir" location="${basedir}/conf" />
     <condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
       <isset property="env.BUILD_NUMBER" />
     </condition>
@@ -224,13 +225,14 @@
   <target name="build-source-pack" depends="makeversion">
     <property name="srcpack.jarname" value="${modname}-src-${version}" />
     <zip destfile="${basedir}/target/${srcpack.jarname}.zip">
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch" prefix="fml" />
+      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg" prefix="fml" />
       <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
       <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/client" />
       <zipfileset dir="${server.src.dir}" includes="**/*.java" prefix="fml/server" />
       <zipfileset dir="${basedir}" includes="fmlversion.properties" prefix="fml/common" />
       <zipfileset dir="${common.src.dir}" includes="*.cfg" prefix="fml/common" />
       <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
+      <zipfileset dir="${fml.conf.dir}" prefix="fml/conf" />
       <mappedresources>
         <concat>
           <fileset dir="${basedir}/install" includes="README.txt" />
diff --git a/fml/install/install.py b/fml/install/install.py
index 3317bcaa43..3705ebd5b2 100644
--- a/fml/install/install.py
+++ b/fml/install/install.py
@@ -2,9 +2,9 @@ import os, os.path, sys
 
 from fml import setup_fml, finish_setup_fml, apply_fml_patches, setup_mcp
 
-def fml_main(fml_dir, mcp_dir):
+def fml_main(fml_dir, mcp_dir, dont_gen_conf=True):
     print '================ Forge ModLoader Setup Start ==================='
-    setup_mcp(fml_dir, mcp_dir)
+    setup_mcp(fml_dir, mcp_dir, dont_gen_conf)
     setup_fml(fml_dir, mcp_dir)
     apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src'))
     finish_setup_fml(fml_dir, mcp_dir)