update mac setup info

Author: Stephanie Reeder

make.py

@@ -18,18 +18,21 @@
 
 BASE_DIR = os.path.dirname(os.path.realpath(__file__))
 SETUP_DIR = os.path.join(BASE_DIR, 'setup')
-DIST_DIR = os.path.join(SETUP_DIR, 'Dist')
 WIN_DIR = os.path.join(SETUP_DIR, "Windows")
 MAC_DIR = os.path.join(SETUP_DIR, "Mac")
 
+MAC_DIST_DIR = os.path.join(MAC_DIR, "Dist")
+DIST_DIR = os.path.join(WIN_DIR, 'Dist')
+
+
 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")
 
-APP_DIR = os.path.join(MAC_DIR, "ODMTools.app")
+APP_DIR = os.path.join(MAC_DIR, 'Dist', "ODMTools.app")
 # Location of Windows files
 APP_FILE = os.path.join(BASE_DIR, "ODMTools.py")
 MAKE_FILE = os.path.realpath(__file__)
@@ -177,7 +180,7 @@ def mac_pyinstaller():
     try:
         os.system('pyinstaller '
             '--clean '
-            '--distpath=%s ' % DIST_DIR +
+            '--distpath=%s ' % MAC_DIST_DIR +
             '--workpath=%s ' % MAC_WORK_DIR +
             '--specpath=%s ' % MAC_DIR +
             '--upx-dir=%s ' % BASE_DIR +
@@ -190,6 +193,7 @@ def mac_pyinstaller():
 
 
         os.system("cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/"))
+        # 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:

setup/Mac/ODMTools.packproj

@@ -28,9 +28,9 @@
 						<key>Mode</key>
 						<integer>1</integer>
 						<key>Path</key>
-						<string>/Users/stephanie/DEV/ODMToolsPython/LICENSE.txt</string>
+						<string>../../LICENSE.txt</string>
 						<key>Path Type</key>
-						<integer>1</integer>
+						<integer>2</integer>
 					</dict>
 				</dict>
 				<key>ReadMe</key>
@@ -52,9 +52,9 @@
 						<key>Mode</key>
 						<integer>1</integer>
 						<key>Path</key>
-						<string>/Users/stephanie/DEV/ODMToolsPython/setup/Mac/Welcome.rtf</string>
+						<string>Welcome.rtf</string>
 						<key>Path Type</key>
-						<integer>1</integer>
+						<integer>2</integer>
 					</dict>
 				</dict>
 			</dict>
@@ -75,9 +75,9 @@
 									<key>GID</key>
 									<integer>80</integer>
 									<key>Path</key>
-									<string>/Users/stephanie/DEV/ODMToolsPython/setup/Mac/ODMTools.app</string>
+									<string>Dist/ODMTools.app</string>
 									<key>Path Type</key>
-									<integer>1</integer>
+									<integer>2</integer>
 									<key>Privileges</key>
 									<integer>493</integer>
 									<key>Type</key>
@@ -566,9 +566,9 @@
 						<key>IFPkgDescriptionDescription</key>
 						<string></string>
 						<key>IFPkgDescriptionTitle</key>
-						<string>ODMTools_v1.2.0-beta_setup</string>
+						<string>ODMTools_v1.2.1</string>
 						<key>IFPkgDescriptionVersion</key>
-						<string>1.2.0 Beta</string>
+						<string>1.2.1 Beta</string>
 					</dict>
 				</dict>
 				<key>Display Information</key>
@@ -584,7 +584,7 @@
 					<key>CFBundleName</key>
 					<string>ODMTools</string>
 					<key>CFBundleShortVersionString</key>
-					<string>1.2.0</string>
+					<string>1.2.1</string>
 				</dict>
 				<key>Options</key>
 				<dict>
@@ -619,7 +619,7 @@
 		<key>IFPkgFlagPackageSelection</key>
 		<integer>0</integer>
 		<key>Name</key>
-		<string>ODMTools</string>
+		<string>ODMTools_v1.2.1-beta_Mac_installer</string>
 		<key>Status</key>
 		<integer>1</integer>
 		<key>Type</key>