64-bit Macintosh Application, executable bit set on droplet, Updated release script, Version set to 6.6.2

1 files changed, 28 insertions, 54 deletions

diff --git a/make_release.py b/make_release.py
index 20bb001..5c050c4 100755
--- a/make_release.py
+++ b/make_release.py
@@ -13,93 +13,67 @@ import os
 import shutil
 
 
-SRC_DIR = 'src'
-CONTRIB_BASE = 'contrib'
-BUILD_BASE = 'build'
-DIST_BASE = 'dist'
-
+DEDRM_SRC_DIR = 'dedrm_src'
+OBOK_SRC_DIR = 'obok_src'
+SHELLS_BASE = 'contrib'
 
 def make_calibre_plugin():
+    calibre_plugin_dir = os.path.join(SHELLS_BASE, 'DeDRM_calibre_plugin')
+    core_dir = os.path.join(calibre_plugin_dir, 'DeDRM_plugin')
 
-    contrib_dir = os.path.join(CONTRIB_BASE, 'calibre')
+    shutil.copytree(DEDRM_SRC_DIR, core_dir)
+    shutil.make_archive(core_dir, 'zip', core_dir)
+    shutil.rmtree(core_dir)
 
-    build_dir = os.path.join(BUILD_BASE, 'DeDRM_calibre_plugin')
-    core_dir = os.path.join(build_dir, 'DeDRM_plugin')
-    plugin_name = os.path.join(build_dir, 'DeDRM_plugin')
 
-    shutil.copytree(contrib_dir, build_dir)
-    shutil.copytree(SRC_DIR, core_dir)
+def make_obok_plugin():
+    obok_plugin_dir = os.path.join(SHELLS_BASE, 'Obok_calibre_plugin')
+    core_dir = os.path.join(obok_plugin_dir, 'obok_plugin')
 
-    shutil.make_archive(plugin_name, 'zip', core_dir)
+    shutil.copytree(OBOK_SRC_DIR, core_dir)
+    shutil.make_archive(core_dir, 'zip', core_dir)
     shutil.rmtree(core_dir)
 
 
 def make_windows_app():
+    windows_app_dir = os.path.join(SHELLS_BASE, 'DeDRM_Windows_Application')
+    core_dir = os.path.join(windows_app_dir, 'DeDRM_App', 'DeDRM_lib', 'lib')
 
-    contrib_dir = os.path.join(CONTRIB_BASE, 'windows')
-
-    build_dir = os.path.join(BUILD_BASE, 'DeDRM_Windows_Application')
-    core_dir = os.path.join(build_dir, 'DeDRM_App', 'DeDRM_lib', 'lib')
+    # delete any existing core_dir
+    try:
+        shutil.rmtree(core_dir)
+    except OSError:
+        pass
 
-    shutil.copytree(contrib_dir, build_dir)
-    shutil.copytree(SRC_DIR, core_dir)
+    shutil.copytree(DEDRM_SRC_DIR, core_dir)
 
 
 def make_macos_app():
+    macos_app_dir = os.path.join(SHELLS_BASE, 'DeDRM_Macintosh_Application')
+    core_dir = os.path.join(macos_app_dir, 'DeDRM.app', 'Contents', 'Resources')
 
-    contrib_dir = os.path.join(CONTRIB_BASE, 'macos')
-    build_dir = os.path.join(BUILD_BASE, 'DeDRM_Macintosh_Application')
-    core_dir = os.path.join(build_dir, 'DeDRM.app', 'Contents', 'Resources')
-
-    shutil.copytree(contrib_dir, build_dir)
-
-    _, dirs, files = next(os.walk(SRC_DIR))
+    # Resources already exists - copy contents to contents.
+    _, dirs, files = next(os.walk(DEDRM_SRC_DIR))
     for name in dirs:
         shutil.copyfile(
-            os.path.join(SRC_DIR, name),
+            os.path.join(DEDRM_SRC_DIR, name),
             os.path.join(core_dir, name)
         )
     for name in files:
         shutil.copy2(
-            os.path.join(SRC_DIR, name),
+            os.path.join(DEDRM_SRC_DIR, name),
             os.path.join(core_dir, name)
         )
 
 
-def make_obok_plugin():
-
-    build_dir = os.path.join(BUILD_BASE, 'Obok_calibre_plugin')
-    core_dir = os.path.join(build_dir, 'obok_plugin')
-    plugin_name = os.path.join(build_dir, 'obok_plugin')
-
-    shutil.copytree('Obok_calibre_plugin', build_dir)
-    shutil.make_archive(plugin_name, 'zip', core_dir)
-
-
-def make_misc():
-
-    for name in ('Other_Tools',):
-        shutil.copytree(name, os.path.join(BUILD_BASE, name))
-    for name in ('FAQs.md', 'README.md', 'ReadMe_First.txt',):
-        shutil.copy2(name, os.path.join(BUILD_BASE, name))
-
-
 def make_release(version):
-
-    try:
-        shutil.rmtree(BUILD_BASE)
-    except OSError:
-        pass
-
     make_calibre_plugin()
     make_windows_app()
     make_macos_app()
     make_obok_plugin()
-    make_misc()
 
     release_name = 'DeDRM_tools_{}'.format(version)
-    release_path = os.path.join(DIST_BASE, release_name)
-    return shutil.make_archive(release_path, 'zip', BUILD_BASE)
+    return shutil.make_archive(release_name, 'zip', SHELLS_BASE)
 
 
 if __name__ == '__main__':