Browse Source

Remove log tab under windows, ship a CarlaDebug.exe instead

tags/1.9.7
falkTX 7 years ago
parent
commit
a184b0af1f
7 changed files with 47 additions and 3 deletions
  1. +31
    -0
      data/windows/app-console.py
  2. +0
    -0
      data/windows/app-gui.py
  3. +4
    -1
      data/windows/build-win32.sh
  4. +4
    -1
      data/windows/build-win64.sh
  5. +3
    -0
      source/carla_host.py
  6. +4
    -0
      source/carla_settings.py
  7. +1
    -1
      source/carla_shared.py

+ 31
- 0
data/windows/app-console.py View File

@@ -0,0 +1,31 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

# ------------------------------------------------------------------------------------------------------------
# Imports (cx_Freeze)

from cx_Freeze import setup, Executable

# ------------------------------------------------------------------------------------------------------------
# Imports (Custom Stuff)

from carla_host import VERSION

# ------------------------------------------------------------------------------------------------------------

options = {
"icon": ".\\resources\\ico\\carla.ico",
"packages": [],
"includes": ["re", "sip", "subprocess", "inspect"],
"build_exe": ".\\data\\windows\\Carla\\",
"optimize": True,
"compressed": True
}

setup(name = "Carla",
version = VERSION,
description = "Carla Plugin Host",
options = {"build_exe": options},
executables = [Executable(".\\source\\carla")])

# ------------------------------------------------------------------------------------------------------------

data/windows/app.py → data/windows/app-gui.py View File


+ 4
- 1
data/windows/build-win32.sh View File

@@ -43,8 +43,11 @@ make BUILDING_FOR_WINDOWS=true $JOBS
export PYTHONPATH=`pwd`/source export PYTHONPATH=`pwd`/source


rm -rf ./data/windows/Carla rm -rf ./data/windows/Carla
mkdir -p ./data/windows/Carla/Debug
cp ./source/carla ./source/Carla.pyw cp ./source/carla ./source/Carla.pyw
$PYTHON_EXE ./data/windows/app.py build_exe
$PYTHON_EXE ./data/windows/app-console.py build_exe
mv ./data/windows/Carla/carla.exe ./data/windows/Carla/Debug/Carla.exe
$PYTHON_EXE ./data/windows/app-gui.py build_exe
rm -f ./source/Carla.pyw rm -f ./source/Carla.pyw


cd data/windows/ cd data/windows/


+ 4
- 1
data/windows/build-win64.sh View File

@@ -45,8 +45,11 @@ make BUILDING_FOR_WINDOWS=true LDFLAGS="-L/opt/mingw32/i686-w64-mingw32/lib/" wi
export PYTHONPATH=`pwd`/source export PYTHONPATH=`pwd`/source


rm -rf ./data/windows/Carla rm -rf ./data/windows/Carla
mkdir -p ./data/windows/Carla/Debug
cp ./source/carla ./source/Carla.pyw cp ./source/carla ./source/Carla.pyw
$PYTHON_EXE ./data/windows/app.py build_exe
$PYTHON_EXE ./data/windows/app-console.py build_exe
mv ./data/windows/Carla/carla.exe ./data/windows/Carla/Debug/Carla.exe
$PYTHON_EXE ./data/windows/app-gui.py build_exe
rm -f ./source/Carla.pyw rm -f ./source/Carla.pyw


cd data/windows/ cd data/windows/


+ 3
- 0
source/carla_host.py View File

@@ -199,6 +199,9 @@ class HostWindow(QMainWindow):
else: else:
self.ui.act_engine_start.setEnabled(True) self.ui.act_engine_start.setEnabled(True)


if WINDOWS:
self.ui.tabWidget.removeTab(2)

if not self.host.isControl: if not self.host.isControl:
self.ui.act_file_connect.setEnabled(False) self.ui.act_file_connect.setEnabled(False)
self.ui.act_file_connect.setVisible(False) self.ui.act_file_connect.setVisible(False)


+ 4
- 0
source/carla_settings.py View File

@@ -242,6 +242,10 @@ class CarlaSettingsW(QDialog):
self.ui.ch_main_manage_uis.setEnabled(False) self.ui.ch_main_manage_uis.setEnabled(False)
self.ui.ch_main_manage_uis.setVisible(False) self.ui.ch_main_manage_uis.setVisible(False)


if WINDOWS:
self.ui.ch_main_show_logs.setEnabled(False)
self.ui.ch_main_show_logs.setVisible(False)

if host.isControl: if host.isControl:
self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS) self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)
self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE) self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)


+ 1
- 1
source/carla_shared.py View File

@@ -238,7 +238,7 @@ CARLA_DEFAULT_MAIN_PRO_THEME_COLOR = "Black"
CARLA_DEFAULT_MAIN_REFRESH_INTERVAL = 20 CARLA_DEFAULT_MAIN_REFRESH_INTERVAL = 20
CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS = True CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS = True
CARLA_DEFAULT_MAIN_MANAGE_UIS = True CARLA_DEFAULT_MAIN_MANAGE_UIS = True
CARLA_DEFAULT_MAIN_SHOW_LOGS = True
CARLA_DEFAULT_MAIN_SHOW_LOGS = bool(not WINDOWS)


# Canvas # Canvas
CARLA_DEFAULT_CANVAS_THEME = "Modern Dark" CARLA_DEFAULT_CANVAS_THEME = "Modern Dark"


Loading…
Cancel
Save