diff --git a/fre/make/gfdlfremake/checkout.py b/fre/make/gfdlfremake/checkout.py index 9afd0ef9..d3fa5d4e 100644 --- a/fre/make/gfdlfremake/checkout.py +++ b/fre/make/gfdlfremake/checkout.py @@ -111,7 +111,7 @@ def finish (self,pc): ## TODO: batch script building def run (self): """ - Brief: Changes the permission on the checkout script and runs it + Brief: Runs the checkout script Param: - self The checkout script object """ diff --git a/fre/make/runFremake.py b/fre/make/runFremake.py index 14fa5ec1..ffe2ec96 100644 --- a/fre/make/runFremake.py +++ b/fre/make/runFremake.py @@ -15,7 +15,7 @@ targetfre, varsfre, yamlfre, checkout, makefilefre, buildDocker, buildBaremetal ) -def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose): +def fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose): ''' run fremake via click''' yml = yamlfile name = yamlfile.split(".")[0] @@ -86,6 +86,7 @@ def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,ver freCheckout = checkout.checkout("checkout.sh",srcDir) freCheckout.writeCheckout(modelYaml.compile.getCompileYaml(),jobs,pc) freCheckout.finish(pc) + os.chmod(srcDir+"/checkout.sh", 0o744) ## TODO: Options for running on login cluster? freCheckout.run() @@ -200,12 +201,12 @@ def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,ver pool.map(buildBaremetal.fremake_parallel,fremakeBuildList) @click.command() -def fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose): +def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose): ''' Decorator for calling _fremake_run - allows the decorated version of the function to be separate from the undecorated version ''' - return _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose) + return fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose) if __name__ == "__main__": fremake_run()