MSGQ refactor: cleanup outstanding issues (#32685)

* Rm sim dockerfile from bad merge

* Add watch back

* Fix watch3 compilation

SConstruct

@@ -224,10 +224,8 @@ env = Environment(
   CFLAGS=["-std=gnu11"] + cflags,
   CXXFLAGS=["-std=c++1z"] + cxxflags,
   LIBPATH=libpath + [
-    "#cereal",
+    "#msgq_repo",
-    "#msgq",
     "#third_party",
-    "#opendbc/can",
     "#selfdrive/pandad",
     "#common",
     "#rednose/helpers",

selfdrive/controls/lib/lateral_mpc_lib/SConscript

@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'messaging', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
 
 gen = "c_generated_code"
 

selfdrive/controls/lib/longitudinal_mpc_lib/SConscript

@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'messaging', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
 
 gen = "c_generated_code"
 

selfdrive/ui/SConscript

@@ -125,6 +125,5 @@ if GetOption('extras') and arch != "Darwin":
     assert f[0].get_size() < 350*1e3
 
 # build watch3
-#FIXME
+if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
-#if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
+  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'msgq', 'visionipc'])
-#  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'zmq', 'visionipc', 'msgq'])

tools/sim/Dockerfile.sim

@@ -1,39 +0,0 @@
-FROM ghcr.io/commaai/openpilot-base:latest
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-      tmux \
-      vim \
-    && rm -rf /var/lib/apt/lists/*
-
-# get same tmux config used on NEOS for debugging
-RUN cd $HOME && \
-    curl -O https://raw.githubusercontent.com/commaai/eon-neos-builder/master/devices/eon/home/.tmux.conf
-
-ENV OPENPILOT_PATH /tmp/openpilot
-ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
-
-RUN mkdir -p ${OPENPILOT_PATH}
-WORKDIR ${OPENPILOT_PATH}
-
-COPY SConstruct ${OPENPILOT_PATH}
-
-COPY ./openpilot ${OPENPILOT_PATH}/openpilot
-COPY ./body ${OPENPILOT_PATH}/body
-COPY ./third_party ${OPENPILOT_PATH}/third_party
-COPY ./site_scons ${OPENPILOT_PATH}/site_scons
-COPY ./rednose ${OPENPILOT_PATH}/rednose
-COPY ./rednose_repo/site_scons ${OPENPILOT_PATH}/rednose_repo/site_scons
-COPY ./common ${OPENPILOT_PATH}/common
-COPY ./opendbc ${OPENPILOT_PATH}/opendbc
-COPY ./cereal ${OPENPILOT_PATH}/cereal
-COPY ./msgq_repo ${OPENPILOT_PATH}/msgq_repo
-COPY ./msgq ${OPENPILOT_PATH}/msgq
-COPY ./panda ${OPENPILOT_PATH}/panda
-COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
-COPY ./system ${OPENPILOT_PATH}/system
-COPY ./tools ${OPENPILOT_PATH}/tools
-COPY ./release ${OPENPILOT_PATH}/release
-
-RUN --mount=type=bind,source=.ci_cache/scons_cache,target=/tmp/scons_cache,rw scons -j$(nproc) --cache-readonly
-
-RUN python -c "from openpilot.selfdrive.test.helpers import set_params_enabled; set_params_enabled()"