Skip to content

Commit b6c16bf

Browse files
authored
Merge pull request #35 from RamesTheGeneric/main
Better build script ig idk
2 parents 9c9bb79 + 260c796 commit b6c16bf

6 files changed

+18
-18
lines changed

BabbleApp/algo_settings_widget.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
125125

126126
self.cancellation_event = Event() # Set the event until start is called, otherwise we can block if shutdown is called.
127127
self.cancellation_event.set()
128-
self.image_queue = Queue(maxsize=1)
128+
self.image_queue = Queue(maxsize=2)
129129

130130

131131
def started(self):

BabbleApp/babbleapp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def main():
9595
# Check to see if we have an ROI. If not, bring up ROI finder GUI.
9696

9797
# Spawn worker threads
98-
osc_queue: queue.Queue[tuple[bool, int, int]] = queue.Queue(maxsize=5)
98+
osc_queue: queue.Queue[tuple[bool, int, int]] = queue.Queue(maxsize=2)
9999
osc = VRChatOSC(cancellation_event, osc_queue, config)
100100
osc_thread = threading.Thread(target=osc.run)
101101
# start worker threads

BabbleApp/babbleapp.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ block_cipher = None
66
a = Analysis(['babbleapp.py'],
77
pathex=[],
88
binaries=[],
9-
datas=[("Audio/*", "Audio"), ("Images/*", "Images/"), ("Models/*/*/*", "Models/")],
9+
datas=[("Audio/*", "Audio"), ("Images/*", "Images/")],
1010
hiddenimports=[],
1111
hookspath=[],
1212
hooksconfig={},

BabbleApp/general_settings_widget.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
155155

156156
self.cancellation_event = Event() # Set the event until start is called, otherwise we can block if shutdown is called.
157157
self.cancellation_event.set()
158-
self.image_queue = Queue(maxsize=1)
158+
self.image_queue = Queue(maxsize=2)
159159

160160

161161
def started(self):

scripts/build_app_and_installer.bat

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
:: File paths will all need to be updated to your setup
2+
3+
set babblepath=X:\Documents\GitHub\ProjectBabble
4+
set innopath="C:\Program Files (x86)\Inno Setup 6"
5+
6+
cd /d %babblepath%\BabbleApp
7+
pyinstaller babbleapp.spec --noconfirm
8+
:: Copy the Models directory + content into dist because I can't get pyinstaller to not flatten the file structure
9+
cd /d %babblepath%\BabbleApp\dist\Babble_App\Models
10+
robocopy %babblepath%\BabbleApp\Models %babblepath%\BabbleApp\dist\Babble_App\Models\ /E
11+
cd %babblepath%\BabbleApp\dist\Babble_App\Models
12+
rmdir /s /q dev
13+
14+
start /D %innopath% cmd /k ISCC %babblepath%\scripts\installer.iss

scripts/example_build_app_and_installer.bat

-14
This file was deleted.

0 commit comments

Comments
 (0)