update make file to work with mac

Author: Stephanie Reeder

ODMTools.py

@@ -17,10 +17,16 @@
 from odmtools.common.logger import LoggerTool
 from multiprocessing import cpu_count, freeze_support
 from odmtools.odmdata import MemoryDatabase
+
+import pyodbc
+import pymysql
+import psycopg2
+
 tool = LoggerTool()
 logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
 wx.Log.SetLogLevel(0)
 
+
 class MyApp(wx.App):
     """
     A Simple App class, modified to hold the processes and task queues

doc/developer_docs/source/build/executable.rst

@@ -39,6 +39,7 @@ Installing using pyinstaller
         git clone https://github.com/pyinstaller/pyinstaller.git
 
 
+
     Install pywin32 if you are using Python 2.6+
 
         Install pywin32 from `here <http://sourceforge.net/projects/pywin32/>`_

setup.py

@@ -28,7 +28,7 @@
 						<key>Mode</key>
 						<integer>1</integer>
 						<key>Path</key>
-						<string>/Volumes/stephanie/Releases/License.txt</string>
+						<string>/Users/stephanie/DEV/ODMToolsPython/LICENSE.txt</string>
 						<key>Path Type</key>
 						<integer>1</integer>
 					</dict>
@@ -52,7 +52,7 @@
 						<key>Mode</key>
 						<integer>1</integer>
 						<key>Path</key>
-						<string>/Volumes/stephanie/Releases/Welcome.rtf</string>
+						<string>/Users/stephanie/DEV/ODMToolsPython/LICENSE.txt</string>
 						<key>Path Type</key>
 						<integer>1</integer>
 					</dict>
@@ -61,14 +61,30 @@
 			<key>Files</key>
 			<dict>
 				<key>Compress</key>
-				<false/>
+				<true/>
 				<key>Hierarchy</key>
 				<dict>
 					<key>Children</key>
 					<array>
 						<dict>
 							<key>Children</key>
 							<array>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>/Users/stephanie/DEV/ODMToolsPython/setup/Mac/ODMTools.app</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>3</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
 								<dict>
 									<key>Children</key>
 									<array/>
@@ -550,9 +566,9 @@
 						<key>IFPkgDescriptionDescription</key>
 						<string></string>
 						<key>IFPkgDescriptionTitle</key>
-						<string>ODMTools_v1.3.0-beta_setup</string>
+						<string>ODMTools_v1.2.0-beta_setup</string>
 						<key>IFPkgDescriptionVersion</key>
-						<string>1.3.0 Beta</string>
+						<string>1.2.0 Beta</string>
 					</dict>
 				</dict>
 				<key>Display Information</key>
@@ -568,14 +584,14 @@
 					<key>CFBundleName</key>
 					<string>ODMTools</string>
 					<key>CFBundleShortVersionString</key>
-					<string>1.3.0</string>
+					<string>1.4.0</string>
 				</dict>
 				<key>Options</key>
 				<dict>
 					<key>IFPkgFlagAllowBackRev</key>
 					<false/>
 					<key>IFPkgFlagAuthorizationAction</key>
-					<integer>1</integer>
+					<integer>0</integer>
 					<key>IFPkgFlagFollowLinks</key>
 					<false/>
 					<key>IFPkgFlagIsRequired</key>
@@ -596,7 +612,7 @@
 					<key>IFMajorVersion</key>
 					<integer>1</integer>
 					<key>IFMinorVersion</key>
-					<integer>3</integer>
+					<integer>4</integer>
 				</dict>
 			</dict>
 		</dict>

setup/Mac/ODMTools.packproj

@@ -3,13 +3,16 @@
 
 WIN_DIR = os.path.join(BASE_DIR, "Windows")
 MAC_DIR = os.path.join(BASE_DIR, "Mac")
+
+MAC_WORK_DIR = os.path.join(MAC_DIR, "Temp")
 WORK_DIR = os.path.join(WIN_DIR, "Temp")
 
 ICON_DIR = os.path.join("..", 'odmtools', 'common', "icons")
 WIN_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.ico")
 MAC_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.icns")
-EXE_DIR = os.path.join(WIN_DIR, "ODMTools")
 
+EXE_DIR = os.path.join(WIN_DIR, "ODMTools")
+APP_DIR = os.path.join(MAC_DIR, "ODMTools.app")
 # Location of Windows files
 APP_FILE = os.path.join("..", "ODMTools.py")
 VERSION_FILE = os.path.join(BASE_DIR, "version.txt")
@@ -18,7 +21,7 @@
 INNO_SCRIPT = os.path.join(WIN_DIR, "odmtools_setup.iss")
 INNO_EXECUTABLE = '"C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe"'
 ICE_SCRIPT = os.path.join(MAC_DIR, "ODMTools.packproj")
-ICE_EXECUTABLE =''
+ICE_EXECUTABLE ='freeze'
 
 print (BASE_DIR)
 
@@ -79,14 +82,19 @@ def mac_pyinstaller():
         os.system('pyinstaller '
             '--clean '
             '--distpath=%s ' % MAC_DIR +
-            '--workpath=%s ' % WORK_DIR +
-            '--specpath=%s ' % WIN_DIR +
+            '--workpath=%s ' % MAC_WORK_DIR +
+            '--specpath=%s ' % MAC_DIR +
             '--upx-dir=%s ' % BASE_DIR +
-            '--icon_file=%s ' % MAC_ICON_FILE +
+            '--icon=%s ' % MAC_ICON_FILE +
             '--version-file=%s ' % VERSION_FILE +
-            # '--windowed '
+            '--windowed '
+            #'--onefile '
+            #'--hidden-import="libwx_osx_cocoau-3.0.0.0.0.dylib" '
             '--noconfirm ' + APP_FILE)
 
+
+        os.system("cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/"))
+        #copy "libwx_osx_cocoau-3.0.0.0.0.dylib"
         return True
     except Exception as e:
         print (e)
@@ -97,7 +105,8 @@ def run_inno():
     os.system(INNO_EXECUTABLE + " " + INNO_SCRIPT)
 
 def run_iceberg():
-    pass
+    os.system(ICE_EXECUTABLE + " "+ ICE_SCRIPT)
+
 
 def main():
     delete_old_out_dir()