updated windows setup-packager script

snowy1220 · Sep 21, 2019 · bec936a · bec936a
1 parent 43e7a7d
commit bec936a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -78,16 +78,19 @@ script:
  - "make test"
  - "make test-integration"
  - "make package"
+ - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+     ./scripts/package/package-windows-installer.sh;
+   fi
 
 before_deploy:
    # Remove the folder from which the zip was created
- - find dist/ -type f | grep -v "activitywatch[^/]*\.zip" | xargs --no-run-if-empty rm -r
+ - find dist/ -type f | grep -v "activitywatch-[^/]*" | xargs --no-run-if-empty rm -r
 
 deploy:
  - provider: releases
    skip_cleanup: true
    file_glob: true
-   file: dist/activitywatch-*.zip
+   file: dist/activitywatch-*.*
    api_key:
      secure: PSkaHT7bhmCBFutBhfIyHd/j784e0bgzVrahA9+IrEZQqHmJzGvkytf4mQ+EWz0lYDX/Jko7aIFfuCQ8yoVNnnwCu8SwTKXcwrkwuJrymupIK+Xxau6C4rMBLK81mphZs8t2YjJK720EquZ54Tt5Y79Dh2tk9ZxdgqWgVLVhhZziD2/I5BfpsqRgCFqZc4UKAOAf5jpe1lgCOz4zkLP3vgQUyIJgkc9A1BT01f5v860hAlH8HchBAlIMklzPJt3ps9ch8dLRtCC3ZQRWIQpNGjw10P4BO3DqjF4ASeo0ZtbLGIFZeWnnAbQxRIztPUqiYnTQckvHcHYAKG8cyO8SBKQj1au5FRTCHbafpOOzLDWkXx+fqaYakxmPlW6YGp+zaiDQsmNCIdCWWsFU8+gUgZL8Owf4eYc2LI4LW7SI/RC7HjllqNP8WVbZSbQRcvQrK9ZN6fiOixTLni2cXyKy6SxVaDd/+iji8YwPW8JrOawTsXIoZRDE6vq41Y47tO/MU9yLm8RkRkApBGgsc+5RJCEEiDyghJ3op+rWIavcMmSZQ3TBo5e00XyPBd7dGkxoLk9WUSuaZgTmi7FSfDDxWW9TiE7tP2ruIV4fcAlOOkM5ll3K6XIo61JM0JAuAKsg7g32lOnr2DEGDk8XlV3QqIEzwjXLjdVrk3ALabp8HjI=
    on:

diff --git a/Makefile b/Makefile
@@ -145,7 +145,6 @@ package:
 	rm -rf dist/activitywatch/pytz
 #
 	bash scripts/package/package-zip.sh
-	bash scripts/package/package-windows-installer.sh
 
 clean:
 	rm -rf build dist

diff --git a/scripts/package/activitywatch-setup.iss b/scripts/package/activitywatch-setup.iss
@@ -6,6 +6,10 @@
 #define MyAppPublisher "ActivityWatch Contributors"
 #define MyAppURL "https://activitywatch.net/"
 #define MyAppExeName "aw-qt.exe"
+#define RootDir "..\.."
+#define DistDir "..\..\dist"
+
+#pragma verboselevel 9
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -24,7 +28,7 @@ DisableProgramGroupPage=yes
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputBaseFilename=activitywatch-setup
-SetupIconFile=activitywatch-logo.ico
+SetupIconFile="{#RootDir}\aw-qt\media\logo\logo.ico"
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -37,8 +41,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "StartMenuEntry" ; Description: "Start ActivityWatch when Windows starts"; GroupDescription: "Windows Startup"; MinVersion: 4,4;
 
 [Files]
-Source: "C:\Users\Shadow\Downloads\activitywatch\aw-qt.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Shadow\Downloads\activitywatch\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#DistDir}\activitywatch\aw-qt.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#DistDir}\activitywatch\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/scripts/package/package-windows-installer.sh b/scripts/package/package-windows-installer.sh
@@ -2,4 +2,4 @@
 
 choco install -y innosetup
 
-# TODO: Run innosetup
+iscc scripts/package/activitywatch-setup.iss
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		choco install -y innosetup

		# TODO: Run innosetup
		iscc scripts/package/activitywatch-setup.iss