Skip to content

Commit

Permalink
Modify workflow and README to reflect new changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kwvg committed Apr 12, 2020
1 parent be26730 commit 6ef283b
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
curl https://autohotkey.com/download/ahk.zip -o ahk.zip
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('ahk.zip', 'AutoHotKey'); }"
- name: Run AutoHotKey compiler to generate binary
run: .\AutoHotKey\Compiler\Ahk2Exe.exe /in LiveEnhancementSuite.ahk /out "Live Enhancement Suite.exe" /icon resources\les_icon.ico
run: .\AutoHotKey\Compiler\Ahk2Exe.exe /in script\Main.ahk /out "Live Enhancement Suite.exe" /icon script\resources\les_icon.ico
- name: Install Inno Setup 6.0.4 for Installer Creation
run: |
curl http://files.jrsoftware.org/is/6/innosetup-6.0.4.exe -o innosetup-6.0.4.exe
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Create Release

on:
push:
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

jobs:
build:
runs-on: windows-latest
steps:
- name: Clone GitHub repository
uses: actions/checkout@v2
- name: Download and extract AutoHotKey
run: |
curl https://autohotkey.com/download/ahk.zip -o ahk.zip
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('ahk.zip', 'AutoHotKey'); }"
- name: Run AutoHotKey compiler to generate binary
run: .\AutoHotKey\Compiler\Ahk2Exe.exe /in script\Main.ahk /out "Live Enhancement Suite.exe" /icon script\resources\les_icon.ico
- name: Install Inno Setup 6.0.4 for Installer Creation
run: |
curl http://files.jrsoftware.org/is/6/innosetup-6.0.4.exe -o innosetup-6.0.4.exe
./innosetup-6.0.4.exe /VERYSILENT /SUPPRESSMSGBOXES
- name: Run Inno Setup script to generate installer
run: |
$InnoSetupCmdLocation="C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
& $InnoSetupCmdLocation /q innoSetupScript.iss
CertUtil -hashfile .\Output\LiveEnhancementSuiteSetup-x64.exe SHA256 | Select -SkipLast 1 >> chksm
(Get-Content chksm) -join ' ' >> .\Output\CHECKSUM.txt
Compress-Archive -LiteralPath .\Output\LiveEnhancementSuiteSetup-x64.exe .\Output\CHECKSUM.txt -DestinationPath .\LiveEnhancementSuiteSetup-x64.zip
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\LiveEnhancementSuiteSetup-x64.zip
asset_name: LiveEnhancementSuiteSetup-x64.zip
asset_content_type: application/zip
16 changes: 2 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@

The Live Enhancement Suite is a self-managing compiled [AutoHotKey](https://www.autohotkey.com/) script. At its core, is a script that uses the power to AutoHotKey to enhance your Ableton Live experience.

## What are all these files?

| Name | Purpose |
| ---------------------------------------------------- | ------------------------------------------------------------ |
| `LiveEnhancementSuite.ahk` | The heart of LES, this is the actual AutoHotKey script that drives the Live Enhancement Suite |
| `MenuIndex.ahk` | This is menu index file that assists `LiveEnhancementSuite.ahk` |
| `MIndexGen.ahk` | This is the file that used to generate `MenuIndex.ahk` |
| `menuconfig.ini` | The default menu configuration file that is placed in every new LES install |
| `settings.ini` | The default settings file that is placed in every new LES install |
| `logos\` | The folder that contains all logos for the Live Enhancement Suite (with different colors for developer releases and stable releases) |
| *Everything Else that isn't GitHub related or legal* | Just some little fun |

## Sounds cool, how can I help?

* Read our [Code of Conduct](https://github.com/LiveEnhancementSuite/LESforMacOS/blob/master/CODE_OF_CONDUCT.md) and get started contributing to the Live Enhancement Suite
Expand All @@ -31,12 +19,12 @@ The Live Enhancement Suite is a self-managing compiled [AutoHotKey](https://www.

* Go to the folder of the repository `cd LESforWindows`

* Run the AutoHotKey compiler `C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe /in LiveEnhancementSuite.ahk /out "Live Enhancement Suite.exe"`
* Run the AutoHotKey compiler `"C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in script\Main.ahk /out "Live Enhancement Suite.exe" /icon script\resources\les_icon.ico`

***Sidenote: If you are trying to debug the LiveEnhancementSuite script, you may run it as a normal AutoHotKey script, building is generally reserved for releases***

## Anything else?

**LESforMacOS and HSModule are released under the MIT License**

Copyright © 2019-2020 [Dylan Tallchief](https://twitter.com/dylantallchief) and [Inverted Silence](https://twitter.com/invertedsilence)
Copyright © 2019-2020 [Dylan Tallchief](https://twitter.com/dylantallchief) and [Inverted Silence](https://twitter.com/invertedsilence)
107 changes: 53 additions & 54 deletions innoSetupScript.iss
Original file line number Diff line number Diff line change
@@ -1,54 +1,53 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Live Enhancement Suite"
#define MyAppVersion "0.1.3.0"
#define MyAppPublisher "The Live Enhancement Suite Developers"
#define MyAppURL "https://enhancementsuite.me/"
#define MyAppExeName "Live Enhancement Suite.exe"

[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{80FF9C6F-1B0D-41E1-B303-C2795327996E}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\{#MyAppName}
DisableProgramGroupPage=yes
; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check.
UsedUserAreasWarning=no
LicenseFile=LICENSE.txt
; Uncomment the following line to run in non administrative install mode (install for current user only.)
;PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
OutputBaseFilename=LiveEnhancementSuiteSetup-x64
SetupIconFile=resources\les_icon.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode

[Files]
Source: "Live Enhancement Suite.exe"; DestDir: "{app}"; Flags: ignoreversion

[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon

[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Live Enhancement Suite"
#define MyAppVersion "0.1.3.0"
#define MyAppPublisher "The Live Enhancement Suite Developers"
#define MyAppURL "https://enhancementsuite.me/"
#define MyAppExeName "Live Enhancement Suite.exe"

[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{80FF9C6F-1B0D-41E1-B303-C2795327996E}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\{#MyAppName}
DisableProgramGroupPage=yes
; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check.
UsedUserAreasWarning=no
LicenseFile=LICENSE.txt
; Uncomment the following line to run in non administrative install mode (install for current user only.)
PrivilegesRequired=lowest
;PrivilegesRequiredOverridesAllowed=dialog
OutputBaseFilename=LiveEnhancementSuiteSetup-x64
SetupIconFile=script\resources\les_icon.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode

[Files]
Source: "Live Enhancement Suite.exe"; DestDir: "{app}"; Flags: ignoreversion

[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon

[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
6 changes: 3 additions & 3 deletions script/Timers.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ requesttime:
if (timer_%trackname% = 0 or timer_%trackname% = ""){
currenttime := "0 hours, 0 minutes, and 0 seconds"
} else {
hh := floor(timer_%trackname%\3600)
mm := floor(timer_%trackname%\60 - (hh*60))
hh := floor(timer_%trackname%/3600)
mm := floor(timer_%trackname%/60 - (hh*60))
ss := floor(timer_%trackname% - (hh*3600) - (mm*60))
if (hh = 1){
hhh := "hour"
Expand Down Expand Up @@ -218,4 +218,4 @@ exitfunc:
gosub coolfunc
FileDelete,%A_ScriptDir%\resources\activecheat.txt
exitapp
Return
Return
2 changes: 1 addition & 1 deletion script/validation/MenuConfig.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ createpluginmenu:
; I printed out a 4000 line AHK script that's nothing but goto markers with two lines of repeated code each.
; None of this code is actually executed unless a menu item is clicked; so I moved it to a library to debloat my code.
; I would be greatful if you could figure out a better way to do this, but right now; I'm going to keep sinning. Sinning hard forever.
#include MenuIndex.ahk
#include validation\MenuIndex.ahk
}
klaar:
Return

0 comments on commit 6ef283b

Please sign in to comment.