DO NOT MERGE! Vice 4 Changes

.gitignore

@@ -0,0 +1,73 @@
+*.a
+*.o
+.aclocal.out
+.autoconf.out
+.autoheader.out
+.automake.out
+.deps
+.opendiff-*
+CMakeFiles
+CMakeLists.txt
+Makefile
+Makefile.in
+_build
+aclocal.m4
+autom4te.cache
+compile
+config.h
+config.h.in
+config.log
+config.status
+configure
+depcomp
+missing
+vice/data/common/vice.gresource
+vice/doc/.vice-texi-charset-ok
+vice/doc/vice.pdf
+vice/src/arch/android/AnVICE/AndroidManifest.xml
+vice/src/arch/gtk3/novte/box_drawing.h
+vice/src/arch/gtk3/novte/marshal.cc
+vice/src/arch/gtk3/novte/marshal.h
+vice/src/arch/gtk3/novte/vtetypebuiltins.cc
+vice/src/arch/gtk3/novte/vtetypebuiltins.h
+vice/src/c1541
+vice/src/c64/psiddrv.h
+vice/src/c64/psiddrv.o65
+vice/src/debug.h
+vice/src/infocontrib.h
+vice/src/monitor/mon_lex.c
+vice/src/monitor/mon_parse.c
+vice/src/monitor/mon_parse.h
+vice/src/resid-dtv/COPYING
+vice/src/resid-dtv/INSTALL
+vice/src/resid-dtv/siddtvdefs.h
+vice/src/resid/COPYING
+vice/src/resid/INSTALL
+vice/src/resid/siddefs.h
+vice/src/resid/wave6581_PST.h
+vice/src/resid/wave6581_PS_.h
+vice/src/resid/wave6581_P_T.h
+vice/src/resid/wave6581__ST.h
+vice/src/resid/wave8580_PST.h
+vice/src/resid/wave8580_PS_.h
+vice/src/resid/wave8580_P_T.h
+vice/src/resid/wave8580__ST.h
+vice/src/stamp-h1
+vice/src/tools/cartconv/cartconv
+vice/src/tools/petcat/petcat
+vice/src/version.h
+vice/src/vice-version.sh
+vice/src/vsid
+vice/src/x128
+vice/src/x64dtv
+vice/src/x64sc
+vice/src/xcbm2
+vice/src/xcbm5x0
+vice/src/xpet
+vice/src/xplus4
+vice/src/xscpu64
+vice/src/xvic
+ylwrap
+settings.json
+vice/src/arch/headless/uiclient/uiclientmachine.h
+vice/src/arch/headless/uiclient/uiclienttest

README.md

@@ -0,0 +1,12 @@
+# VICE GitHub Mirror
+This is a git mirror of the [official VICE subversion trunk](https://sourceforge.net/p/vice-emu/code/HEAD/tree/).
+
+For official releases, documentation, developer information, [visit the VICE website](https://vice-emu.sourceforge.io/).
+
+## Download VICE
+* [Official Releases](https://vice-emu.sourceforge.io/)
+* [Snapshot builds of the latest code](https://github.com/VICE-Team/svn-mirror/releases)
+
+## Current Clang Static Analysis Results
+* [GTK3](https://vice-team.github.io/svn-mirror/analysis/GTK3/)
+* [SDL2](https://vice-team.github.io/svn-mirror/analysis/SDL2/)

vice/.gitignore

@@ -0,0 +1,14 @@
+.cmake_bootstrap_makefile_hash
+_sdl2
+_sdl
+_gtk3
+_headless
+aclocal.m4
+autom4te.cache/
+compile
+config.log
+config.status
+configure
+depcomp
+missing
+ylwrap

vice/Makefile.am

@@ -98,14 +98,6 @@ if MAKE_BINDIST
 
 if BEOS_COMPILE
 
-if USE_SDLUI
-bindist:
-	$(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(top_srcdir) 1
-
-bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ zip $(XSCPU64_INCLUDED) $(top_srcdir) 1
-endif USE_SDLUI
-
 if USE_SDL2UI
 bindist:
 	$(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(top_srcdir) 2
@@ -126,14 +118,6 @@ bindistzip:
 	/bin/bash @ARCH_SRC_DIR@/../gtk3/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip
 endif USE_GTK3UI
 
-if USE_SDLUI
-bindist:
-	FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip 1
-
-bindistzip:
-	FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip 1
-endif USE_SDLUI
-
 if USE_SDL2UI
 bindist:
 	FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip 2
@@ -157,17 +141,6 @@ bindist7zip:
 	$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
 endif USE_GTK3UI
 
-if USE_SDLUI
-bindist:
-	$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) 1 "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
-
-bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) 1 "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
-
-bindist7zip:
-	$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) 1 "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
-endif USE_SDLUI
-
 if USE_SDL2UI
 bindist:
 	$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) 2 "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)

vice/README

@@ -87,7 +87,6 @@
    - in the doc/readmes directory:
 
      - Readme-GTK3.txt, GTK3 specific documentation;
-     - Readme-SDL.txt, SDL specific documentation;
      - Readme-SDL2.txt, SDL2 specific documentation;
 
    - in the doc/building directory:

vice/cmake-bootstrap.sh

@@ -33,6 +33,8 @@ set -o errexit
 set -o nounset
 set -o allexport
 
+BUILDING_UICLIENTTEST=false
+
 function hash_all_makefiles() {
 	echo -n "$(find . -name Makefile -exec cat {} \; | openssl dgst -md5 -binary | xxd -p)"
 }
@@ -63,15 +65,15 @@ then
 	fi
 fi
 
+echo -n "$MAKEFILE_HASH" > .cmake_bootstrap_makefile_hash
+
 # Remove any previous run
 find . -type f -name 'CMakeLists.txt' -exec rm {} \;
 find . -type f -name 'CMakeCache.txt' -exec rm {} \;
 find . -type f -name 'cmake_install.cmake' -exec rm {} \;
 find . -type d -name 'CMakeFiles' | xargs -IQQQ rm -rf "QQQ"
 find . -type d -name '.cmake_bootstrap_cache' | xargs -IQQQ rm -rf "QQQ"
 
-echo -n "$MAKEFILE_HASH" > .cmake_bootstrap_makefile_hash
-
 # Extracting values out of makefiles is a heavy operation, so we use a filesystem
 # cache to optimise the process. At the end of this script, remove the cache.
 function cleanup {
@@ -531,6 +533,10 @@ function external_lib_label {
 function generate_executable_target {
 	local executable=$1
 
+	if [ "$executable" = "uiclienttest" ]; then
+		BUILDING_UICLIENTTEST=true
+	fi
+
 	#
 	# Each executable has its own list of external libs to be linked with.
 	#
@@ -604,6 +610,7 @@ function generate_executable_target {
 		    PRIVATE
 		    	$LIB_LIST
 		    )
+
 	HEREDOC
 }
 
@@ -663,10 +670,17 @@ PARALLEL_JOBS=""
 for executable in $EMULATORS
 do
 	if $USE_PARALLEL; then
-		PARALLEL_JOBS="${PARALLEL_JOBS}cd $(pwd); >&2 echo \"Emulator: ${executable}\"; generate_executable_target ${executable}\n"
+		JOB="cd $(pwd); >&2 echo \"Emulator: ${executable}\"; generate_executable_target ${executable};"
+		if $BUILDING_UICLIENTTEST; then
+			JOB="${JOB} echo \"add_dependencies(${executable} uiclienttest)\";"
+		fi
+		PARALLEL_JOBS="${PARALLEL_JOBS}${JOB}\n"
 	else
 		echo "Emulator: $executable"
 		generate_executable_target $executable >> CMakeLists.txt
+		if $BUILDING_UICLIENTTEST; then
+			echo "add_dependencies(${executable} uiclienttest)" >> CMakeLists.txt
+		fi
 	fi
 done
 
@@ -696,6 +710,14 @@ fi
 
 popdq
 
+#
+# Test program for uiclient
+#
+
+pushdq src/arch/headless/uiclient
+generate_executable_target uiclienttest >> CMakeLists.txt
+popdq
+
 #
 # Finally, create the top level project CMakeLists.txt
 #