fixed issues with PyInstaller multipackaging by moving modules to sub…

…dirs
snowy1220 · Nov 13, 2019 · 95de6cd · 95de6cd
1 parent adc44f7
commit 95de6cd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -129,13 +129,13 @@ package:
 	mkdir -p dist/activitywatch
 #
 	make --directory=aw-watcher-afk package
-	cp -r aw-watcher-afk/dist/aw-watcher-afk/. dist/activitywatch
+	cp -r aw-watcher-afk/dist/aw-watcher-afk dist/activitywatch
 #
 	make --directory=aw-watcher-window package
-	cp -r aw-watcher-window/dist/aw-watcher-window/. dist/activitywatch
+	cp -r aw-watcher-window/dist/aw-watcher-window dist/activitywatch
 #
 	make --directory=aw-server package
-	cp -r aw-server/dist/aw-server/. dist/activitywatch
+	cp -r aw-server/dist/aw-server dist/activitywatch
 #
 	make --directory=aw-qt package
 	cp -r aw-qt/dist/aw-qt/. dist/activitywatch

diff --git a/aw-qt b/aw-qt
diff --git a/scripts/package/activitywatch-setup.iss b/scripts/package/activitywatch-setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ActivityWatch"
-#define MyAppVersion "v0.8.0b9"
+#define MyAppVersion GetEnv('AW_VERSION')
 #define MyAppPublisher "ActivityWatch Contributors"
 #define MyAppURL "https://activitywatch.net/"
 #define MyAppExeName "aw-qt.exe"

diff --git a/scripts/package/package-all.sh b/scripts/package/package-all.sh
@@ -72,7 +72,7 @@ function build_setup() {
 
     choco install -y innosetup
 
-    "/c/Program Files (x86)/Inno Setup 6/iscc.exe" scripts/package/activitywatch-setup.iss
+    env AW_VERSION=$version "/c/Program Files (x86)/Inno Setup 6/iscc.exe" scripts/package/activitywatch-setup.iss
     mv dist/activitywatch-setup.exe dist/$filename
     echo "Setup built!"
 }