ci: cleanup

.appveyor.yml

@@ -49,15 +49,16 @@ after_test:
   - python setup.py sdist
   - ps: "ls dist"
   # Run pyinstaller
-  - pyinstaller -y --log-level=WARN build-recipes\\win_PyJibe.spec
+  - cd build-recipes
+  - pyinstaller -y --log-level=WARN win_PyJibe.spec
   # Run the binary (the most simple test)
   - dist\\pyjibe\\PyJibe.exe --version
   # Create InnoSetup installers
   # Generate iss file
-  - python build-recipes\\win_make_iss.py
+  - python win_make_iss.py
   # Set InnoSetup path here, because Cython complained about it.
   - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
-  - iscc /Q build-recipes\\win_pyjibe.iss
+  - iscc /Q win_pyjibe.iss
 
 artifacts:
   # InnoSetup files

.github/workflows/deploy_github.yml

@@ -48,7 +48,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-        asset_path: ./build-recipes/dist_app/PyJibe_${{ env.RELEASE_VERSION }}.dmg
+        asset_path: ./build-recipes/dist/PyJibe_${{ env.RELEASE_VERSION }}.dmg
         asset_name: PyJibe_${{ env.RELEASE_VERSION }}.dmg
         asset_content_type: application/zip
     - name: Upload Release Asset PGK
@@ -58,6 +58,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-        asset_path: ./build-recipes/dist_app/PyJibe.pkg
+        asset_path: ./build-recipes/dist/PyJibe.pkg
         asset_name: PyJibe.pkg
         asset_content_type: application/zip

CHANGELOG

@@ -1,5 +1,6 @@
 0.8.5
  - build: migrate from travisCI to GitHub Actions
+ - build: overhauled build pipeline (#9)
 0.8.4
  - build: add pyinstaller hooks for afmformats
 0.8.3

build-recipes/win_PyJibe.spec

@@ -1,25 +1,18 @@
-import os
-from os.path import abspath, exists, join, dirname, relpath
-import platform
-import sys
+# -*- mode: python ; coding: utf-8 -*-
+from os.path import exists
 import warnings
 
-cdir = abspath(".")
-sys.path.insert(0, cdir)
 
-if not exists(join(cdir, "pyjibe")):
-	warnings.warn("Cannot find 'pyjibe'! Please run pyinstaller "+
-                  "from git root folder.")
+NAME = "PyJibe"
 
-pyinstdir = os.path.realpath(cdir + "/build-recipes/")
-script = os.path.join(pyinstdir, "PyJibeLauncher.py")
+if not exists("./{}Launcher.py".format(NAME)):
+    warnings.warn("Cannot find {}Launcher.py'! ".format(NAME) +
+                  "Please run pyinstaller from the 'build-recipes' directory.")
 
-# Icon
-icofile = os.path.join(pyinstdir, "PyJibe.ico")
 
-a = Analysis([script],
-             pathex=[cdir],
-             hookspath=[pyinstdir],
+a = Analysis([NAME * "Launcher.py"],
+             pathex=["."],
+             hookspath=["."],
              runtime_hooks=None)
 
 options = [ ('u', None, 'OPTION'), ('W ignore', None, 'OPTION') ]
@@ -29,11 +22,11 @@ exe = EXE(pyz,
           a.scripts,
           options,
           exclude_binaries=True,
-          name="PyJibe.exe",
+          name=NAME + ".exe",
           debug=False,
           strip=False,
           upx=False,
-          icon=icofile,
+          icon=NAME * ".ico",
           console=False)
 
 coll = COLLECT(exe,
@@ -42,4 +35,4 @@ coll = COLLECT(exe,
                a.datas,
                strip=False,
                upx=False,
-               name="PyJibe")
+               name=NAME)