Compiled code for Mac OSX

cianfrocco-lab · Apr 27, 2017 · f42a354 · f42a354
1 parent 8cb885f
commit f42a354
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 2,549 deletions.
diff --git a/aws_build_osx/kill_instance.py b/aws_build_osx/kill_instance.py
diff --git a/aws_build_osx/launch_AWS_S3Movie_Alignment.py b/aws_build_osx/launch_AWS_S3Movie_Alignment.py
diff --git a/aws_build_osx/launch_AWS_instance.py b/aws_build_osx/launch_AWS_instance.py
diff --git a/aws_build_osx/qsub_aws b/aws_build_osx/qsub_aws
diff --git a/compile_repo.py b/compile_repo.py
@@ -5,7 +5,7 @@
 import subprocess
 
 notincluded=['aws_init.sh','rclone','rclone_mac','aws_init.sh','s3tmpout.txt']
-outdirname='aws_build_linux' #Choices: aws_build_linux, aws_build_osx
+outdirname='aws_build_osx' #Choices: aws_build_linux, aws_build_osx
 filelist=glob.glob('aws/*')
 
 for f in filelist: 
@@ -41,6 +41,8 @@
 if outdirname == 'aws_build_linux':  
 	cmd='mv dist/install_cloud_tools install_cloud_tools/install_cloud_tools_Linux'
 	subprocess.Popen(cmd,shell=True).wait()
-
+if outdirname == 'aws_build_osx':
+	cmd='mv dist/install_cloud_tools install_cloud_tools/install_cloud_tools_macOSX'
+	subprocess.Popen(cmd,shell=True).wait()
 shutil.rmtree('dist')
 shutil.rmtree('build')
diff --git a/install_cloud_tools.py b/install_cloud_tools.py
@@ -17,12 +17,7 @@
 		print '\nBy default, the program will install the software into %s/CloudSoftwareTools.' %(homepath)
 		print '\nTo specify an alternative installation path, specify --prefix {new install path}'
 		print '\nThis program will check if the following programs are installed and then install any missing packages:'
-		print '\t* relion2.0'
-		print '\t* openmpi'
 		print '\t* cryoem-cloud-tools'
-		print '\t* fabric'
-		print '\t* awscli' 
-		print '\nIf you only want to install cryoem-cloud-tools (not relion, openmpi, etc.), include the option --cloudToolsOnly\n'
 		sys.exit()
 
 	if sys.argv[1] != '-h':
@@ -32,12 +27,7 @@
 	                print '\nBy default, the program will install the software into %s/CloudSoftwareTools.' %(homepath)
         	        print '\nTo specify an alternative installation path, specify --prefix {new install path}'
                 	print '\nThis program will check if the following programs are installed and then install any missing packages:'
-	                print '\t* relion2.0'
-        	        print '\t* openmpi'
                 	print '\t* cryoem-cloud-tools'
-	                print '\t* fabric'
-        	        print '\t* awscli'
-                	print '\nIf you only want to install cryoem-cloud-tools (not relion, openmpi, etc.), include the option --cloudToolsOnly\n'
                 	sys.exit()
 
 		if sys.argv[1] == '--cloudToolsOnly': 

diff --git a/install_cloud_tools/install_cloud_tools_macOSX b/install_cloud_tools/install_cloud_tools_macOSX
diff --git a/s3.log b/s3.log
diff --git a/s3b.log b/s3b.log