keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Reenabled replacement of the eclipse folder.

This commit is contained in:
LexManos 2012-12-10 14:56:23 -08:00
parent 41e899dcea
commit 5753eb0738
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fml/install/fml.py
View File

@ -731,13 +731,12 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
print 'Copying FML conf'
shutil.copytree(fml_conf, mcp_conf)
# #update workspace
# print 'Fixing MCP Workspace'
# if not os.path.isdir(os.path.join(fml_dir, 'eclipse', 'Clean-Client')):
# mcp_eclipse = os.path.join(mcp_dir, 'eclipse')
# if os.path.isdir(mcp_eclipse):
# shutil.rmtree(mcp_eclipse)
# shutil.copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse)
#update workspace
if not os.path.isfile(os.path.join(fml_dir, 'fmlbuild.properties-sample')):
mcp_eclipse = os.path.join(mcp_dir, 'eclipse')
if not os.path.isdir(mcp_eclipse) and os.path.isdir(os.path.join(fml_dir, 'eclipse')):
print 'Fixing MCP Workspace'
copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse)
def normaliselines(in_filename):
in_filename = os.path.normpath(in_filename)