Moved setting up eclipse to setup_mcp
This commit is contained in:
parent
b572c6a038
commit
34706d6acf
|
@ -296,10 +296,6 @@ def finish_setup_fml(fml_dir, mcp_dir):
|
||||||
reset_logger()
|
reset_logger()
|
||||||
os.chdir(fml_dir)
|
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):
|
def apply_patches(mcp_dir, patch_dir, target_dir, find=None, rep=None):
|
||||||
sys.path.append(mcp_dir)
|
sys.path.append(mcp_dir)
|
||||||
from runtime.commands import cmdsplit
|
from runtime.commands import cmdsplit
|
||||||
|
@ -475,3 +471,7 @@ def setup_mcp(fml_dir, mcp_dir):
|
||||||
|
|
||||||
if os.path.isfile(temp):
|
if os.path.isfile(temp):
|
||||||
os.remove(temp)
|
os.remove(temp)
|
||||||
|
|
||||||
|
#update workspace
|
||||||
|
print 'Fixing MCP Workspace'
|
||||||
|
merge_tree(os.path.join(fml_dir, 'eclipse'), os.path.join(mcp_dir, 'eclipse'))
|
||||||
|
|
Loading…
Reference in New Issue