Expanding make.py to do a no install

Author: jmeline

setup/make.py make.pysetup/make.py renamed to make.py

@@ -1,39 +1,29 @@
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
-import os, sys, shutil, zipfile
+import os, sys, shutil, zipfile, platform
 from contextlib import closing
 from zipfile import ZipFile, ZIP_DEFLATED
-import os
-
-def zipdir(basedir, archivename):
-    assert os.path.isdir(basedir)
-    with closing(ZipFile(archivename, "w", ZIP_DEFLATED)) as z:
-        for root, dirs, files in os.walk(basedir):
-            #NOTE: ignore empty directories
-            for fn in files:
-                absfn = os.path.join(root, fn)
-                zfn = absfn[len(basedir)+len(os.sep):]
-                z.write(absfn, zfn)
-## Update this for each new release ##
-
 
+## Update odmtools.meta.data whenever creating a release
+from odmtools.meta import data
 
-
-##
 BASE_DIR = os.path.dirname(os.path.realpath(__file__))
-WIN_DIR = os.path.join(BASE_DIR, "Windows")
-MAC_DIR = os.path.join(BASE_DIR, "Mac")
+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_WORK_DIR = os.path.join(MAC_DIR, "Temp")
 WORK_DIR = os.path.join(WIN_DIR, "Temp")
 
-ICON_DIR = os.path.join("..", 'odmtools', 'common', "icons")
+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")
 APP_DIR = os.path.join(MAC_DIR, "ODMTools.app")
 # Location of Windows files
-APP_FILE = os.path.join("..", "ODMTools.py")
+APP_FILE = os.path.join(BASE_DIR, "ODMTools.py")
+MAKE_FILE = os.path.realpath(__file__)
 VERSION_FILE = os.path.join(BASE_DIR, "version.txt")
 
 # Location of Innosetup Installer
@@ -42,41 +32,97 @@ def zipdir(basedir, archivename):
 ICE_SCRIPT = os.path.join(MAC_DIR, "ODMTools.packproj")
 ICE_EXECUTABLE ='freeze'
 
-print (BASE_DIR)
-
 def check_if_dirs_exist():
     try:
-
         if sys.platform == 'win32':
             print "Trying to open WIN_DIR: ",
-            assert os.path.exists(WIN_DIR)
+            if not os.path.exists(WIN_DIR):
+                os.mkdir(WIN_DIR)
+                print "Created: ", WIN_DIR
             print "Success"
+
+            print "Trying to confirm that INNO_SCRIPT exists: ",
+            assert os.path.exists(INNO_SCRIPT)
+            print "Success: ", INNO_SCRIPT
         elif sys.platform =="darwin":
             print "Trying to open MAC_DIR: "
             assert os.path.exists(MAC_DIR)
             print "Success"
 
         print "Trying to open WORK_DIR: ",
-        assert os.path.exists(WORK_DIR)
+        if not os.path.exists(WORK_DIR):
+            print "Failed... Trying to create the folder...",
+            os.mkdir(WORK_DIR)
+            print "Created: ", WORK_DIR
         print "Success"
 
-        print "Trying to open ICON_DIR: ",
-        assert os.path.exists(ICON_DIR)
+
+        print "Trying to open DIST_DIR: ",
+        if not os.path.exists(DIST_DIR):
+            print "Failed... Trying to create the folder...",
+            os.mkdir(DIST_DIR)
+            print "Created: ", DIST_DIR
         print "Success"
 
-        print "Trying to open EXE_DIR: ",
-        assert os.path.exists(EXE_DIR)
+        print "Trying to open ICON_DIR: ",
+        assert os.path.exists(ICON_DIR)
         print "Success"
 
     except Exception as e:
         print e
 
-def delete_old_out_dir():
-    if os.path.exists(EXE_DIR):
-        shutil.rmtree(EXE_DIR)
+def zipdir(basedir, archivename):
+    assert os.path.isdir(basedir)
+    with closing(ZipFile(archivename, "w", ZIP_DEFLATED)) as z:
+        for root, dirs, files in os.walk(basedir):
+            #NOTE: ignore empty directories
+            for fn in files:
+                absfn = os.path.join(root, fn)
+                zfn = absfn[len(basedir)+len(os.sep):]
+                z.write(absfn, zfn)
+def printInfo():
+    print "============================================================="
+    print "=             ODMTools Installer                             "
+    print "= Be sure to update odmtools/meta/data with every release    "
+    print "= Building release: {version}".format(version=data.version),
+    print "\n= Platform: {platform}, {architecture}".format(platform=sys.platform, architecture=platform.architecture()), "\n="
+    print "============================================================="
+    print "Environment Variables: "
+    print ("APP_FILE: ", APP_FILE)
+    print ("MAKE_FILE: ", MAKE_FILE)
+    print ("BASE_DIR: ", BASE_DIR)
+    print ("SETUP_DIR: ", SETUP_DIR)
+    print ("DIST_DIR: ", DIST_DIR)
+
+    ## Windows Specific Files/Directories
+    print ("WIN_DIR: ", WIN_DIR)
+    print ("WIN_ICON_FILE: ", WIN_ICON_FILE)
+    print ("WORK_DIR: ", WORK_DIR)
+    print ("INNO_SCRIPT: ", INNO_SCRIPT)
+    print ("INNO_EXECUTABLE: ", INNO_EXECUTABLE)
+
+    ## OSX Specific Files/Directories
+    print ("MAC_DIR: ", MAC_DIR)
+    print ("MAC_ICON_FILE: ", MAC_ICON_FILE)
+    print ("MAC_WORK_DIR: ", MAC_WORK_DIR)
+
+    print "============================================================="
+    print "Checking if the required directories exist"
+
+    check_if_dirs_exist()
 
-    if os.path.exists(WORK_DIR):
-        shutil.rmtree(WORK_DIR)
+def delete_old_out_dir():
+    loc_exists = os.path.exists(DIST_DIR)
+    isFile = os.path.isfile(DIST_DIR)
+    isDir = os.path.isdir(DIST_DIR)
+    if loc_exists and isFile:
+        print "Removing file DIST_DIR"
+        os.remove(DIST_DIR)
+    elif loc_exists and isDir:
+        print "Removing directory DIST_DIR"
+        shutil.rmtree(DIST_DIR)
+    else:
+        print "Nothing to remove"
 
 def run_pyinstaller():
     try:
@@ -119,33 +165,50 @@ def mac_pyinstaller():
         print (e)
         return False
 
+def move_to_dist(filename):
+    assert filename
+
+    if not os.path.isdir(DIST_DIR):
+        os.mkdir(DIST_DIR)
+
+    print "Moving {filename} to {dist}".format(filename=os.path.abspath(filename), dist=DIST_DIR),
+    try:
+        shutil.move(os.path.abspath(filename), DIST_DIR)
+        print "Success"
+    except shutil.Error as e:
+        print (e)
+
 
 def run_inno():
     os.system(INNO_EXECUTABLE + " " + INNO_SCRIPT)
 
 def run_no_installer():
     # pass
-    zipdir(os.path.join('..', 'odmtools'), "Windows_Test_zip.zip")
+    filename = "{app}_{version}_{os}_{arch}_{type}.zip".format(app=data.app_name,
+        version=data.version, os=sys.platform, arch='x86_64', type="No_Install")
+
+    zipdir(os.path.join('odmtools'), filename)
+    move_to_dist(filename)
 
-    # zf = zipfile.ZipFile('')
 
 def run_iceberg():
     os.system(ICE_EXECUTABLE + " "+ ICE_SCRIPT)
 
-
 def main():
-    # delete_old_out_dir()
-    # check_if_dirs_exist()
+    delete_old_out_dir()
+    printInfo()
 
     if sys.platform == 'win32':
         print "Creating Windows Executable..."
         if (run_pyinstaller()):
             run_inno()
 
-    if sys.platform =='darwin':
+    elif sys.platform =='darwin':
         if(mac_pyinstaller()):
             run_iceberg()
-    else:
+
+    elif sys.platform == 'linux2':
+        ## Testing, not officially supported
         run_no_installer()