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

Moved setting up eclipse to setup_mcp

Browse source
This commit is contained in:
LexManos 2012-08-03 16:56:00 -07:00
parent b572c6a038
commit 34706d6acf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fml/install/fml.py
View file

@ -295,10 +295,6 @@ def finish_setup_fml(fml_dir, mcp_dir):
updatemd5(None, True)
reset_logger()
os.chdir(fml_dir)
#update workspace
print 'Fixing MCP Workspace'
merge_tree(os.path.join(fml_dir, 'eclipse'), os.path.join(mcp_dir, 'eclipse'))
def apply_patches(mcp_dir, patch_dir, target_dir, find=None, rep=None):
sys.path.append(mcp_dir)
@ -475,3 +471,7 @@ def setup_mcp(fml_dir, mcp_dir):
if os.path.isfile(temp):
os.remove(temp)
#update workspace
print 'Fixing MCP Workspace'
merge_tree(os.path.join(fml_dir, 'eclipse'), os.path.join(mcp_dir, 'eclipse'))