misc: rename editor exectuable from zquest to zeditor

Author: connorjclark

.github/workflows/build.yml

@@ -59,7 +59,7 @@ env:
   CCACHE_DIR: ${{ github.workspace }}/.ccache
   CCACHE_MAXSIZE: 400M
   CCACHE_SLOPPINESS: time_macros
-  TARGET: zplayer zquest zscript zlauncher zupdater
+  TARGET: zplayer zeditor zscript zlauncher zupdater
 
 jobs:
   build:

CMakeLists.txt

@@ -661,18 +661,18 @@ if(UNITY_BUILD)
 	enable_unity_build(ZQuestZScript PARSER_SOURCES)
 endif()
 
-add_executable(zquest ${ZQUEST_CORE_SOURCES} ${ZQUEST_GUI_SOURCES} ${ZQUEST_MISC_SOURCES} ${ZQUESTEXTRASOURCES} ${ZQUEST_MODULES})
-set_property(TARGET zquest PROPERTY VS_DPI_AWARE "PerMonitor")
+add_executable(zeditor ${ZQUEST_CORE_SOURCES} ${ZQUEST_GUI_SOURCES} ${ZQUEST_MISC_SOURCES} ${ZQUESTEXTRASOURCES} ${ZQUEST_MODULES})
+set_property(TARGET zeditor PROPERTY VS_DPI_AWARE "PerMonitor")
 
-target_link_libraries(zquest PUBLIC allegro_with_legacy zconsolelogger zcbase zcgui zcsound ${IMAGELIBS} ${ZQUESTLIBSEXTRA})
-target_include_directories(zquest PRIVATE src)
+target_link_libraries(zeditor PUBLIC allegro_with_legacy zconsolelogger zcbase zcgui zcsound ${IMAGELIBS} ${ZQUESTLIBSEXTRA})
+target_include_directories(zeditor PRIVATE src)
 
 if(MSVC)
 	target_compile_definitions(zcsound PRIVATE ZCM_DLL)
 	target_compile_definitions(zplayer PRIVATE ZCM_DLL_IMPORT)
-	target_compile_definitions(zquest PRIVATE ZCM_DLL_IMPORT)
+	target_compile_definitions(zeditor PRIVATE ZCM_DLL_IMPORT)
 endif()
-target_compile_definitions(zquest PRIVATE IS_ZQUEST)
+target_compile_definitions(zeditor PRIVATE IS_EDITOR)
 
 if(WIN32)
 	set_source_files_properties(
@@ -718,7 +718,7 @@ target_link_libraries(zlauncher PRIVATE allegro_with_legacy zcbase zcgui zconsol
 if(WIN32)
 	add_executable(zstandalone src/standalone/standalone.cpp)
 	target_link_options(zstandalone PRIVATE "/SUBSYSTEM:WINDOWS")
-	add_dependencies(zquest zstandalone)
+	add_dependencies(zeditor zstandalone)
 endif()
 
 #############################################################
@@ -775,7 +775,7 @@ endif()
 
 if (EMSCRIPTEN)
 	target_link_options(zplayer PRIVATE "SHELL:-s EXPORTED_FUNCTIONS=_main,_get_shareable_url,_create_synthetic_key_event")
-	target_link_options(zquest PRIVATE "SHELL:-s EXPORTED_FUNCTIONS=_main,_get_shareable_url,_create_synthetic_key_event,_open_test_mode")
+	target_link_options(zeditor PRIVATE "SHELL:-s EXPORTED_FUNCTIONS=_main,_get_shareable_url,_create_synthetic_key_event,_open_test_mode")
 	target_link_options(zscript PRIVATE "SHELL:-s PTHREAD_POOL_SIZE=1" "SHELL:-s EXTRA_EXPORTED_RUNTIME_METHODS=['FS','PROXYFS']")
 	set_target_properties(zscript PROPERTIES SUFFIX ".mjs")
 endif()
@@ -784,7 +784,7 @@ endif()
 # Misc.
 #############################################################
 
-set(zc_targets zquest zplayer zlauncher zcbase zcgui zcsound zscript zconsolelogger zupdater)
+set(zc_targets zeditor zplayer zlauncher zcbase zcgui zcsound zscript zconsolelogger zupdater)
 set(zc_clang_errors
 	-Werror=array-bounds
 	-Werror=format
@@ -986,14 +986,14 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio")
 	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
 
-	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT zquest)
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT zeditor)
 
 	# Configure "Debug" option in VS to use the correct working directory, otherwise it fails to load zc configuration files
 	set_property(TARGET ${zc_targets} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
 
 	# Organize into folders
 	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-	set_target_properties(zplayer zquest zscript zlauncher zupdater package package_no_archive PROPERTIES FOLDER "")
+	set_target_properties(zplayer zeditor zscript zlauncher zupdater package package_no_archive PROPERTIES FOLDER "")
 	set_target_properties(run_replay_tests_all run_replay_tests_basic run_replay_tests_all_1s run_replay_tests_all_10s run_replay_tests_all_100s PROPERTIES FOLDER "Replay Tests")
 	set_target_properties(zcbase zcgui zcsound PROPERTIES FOLDER "Our Libraries")
 	set_target_properties(gme dumb aldmb PROPERTIES FOLDER Sound)

scripts/analyze_quest_rules.py

@@ -17,7 +17,7 @@
 from zquest.section_utils import SECTION_IDS
 from zquest import constants
 
-logging.getLogger('zquest').setLevel(logging.FATAL)
+logging.getLogger('zc').setLevel(logging.FATAL)
 
 script_dir = Path(os.path.dirname(os.path.realpath(__file__)))
 root_dir = script_dir.parent
@@ -51,7 +51,7 @@ def get_pzc_id_number(path: Path):
 
 def get_post_compat_rules(path: Path):
     tmp_path = tmp_dir / 'tmp.qst'
-    exe_name = 'zquest.exe' if os.name == 'nt' else 'zquest'
+    exe_name = 'zeditor.exe' if os.name == 'nt' else 'zeditor'
     args = [
         build_folder / exe_name,
         '-copy-qst', path, tmp_path,

scripts/bisect_builds.py

@@ -300,15 +300,15 @@ def get_revision_binaries(revision: Revision):
     if channel == 'mac':
         zc_app_path = next(dir.glob('*.app'))
         binaries['zc'] = find_path(zc_app_path / 'Contents/Resources', ['zplayer', 'zelda'])
-        binaries['zq'] = zc_app_path / 'Contents/Resources/zquest'
+        binaries['zq'] = find_path(zc_app_path / 'Contents/Resources', ['zeditor', 'zquest'])
         binaries['zl'] = zc_app_path / 'Contents/MacOS/zlauncher'
     elif channel == 'windows':
         binaries['zc'] = find_path(dir, ['zplayer.exe', 'zelda.exe'])
-        binaries['zq'] = dir / 'zquest.exe'
+        binaries['zq'] = find_path(dir, ['zeditor.exe', 'zquest.exe'])
         binaries['zl'] = dir / 'zlauncher.exe'
     elif channel == 'linux':
         binaries['zc'] = find_path(dir, ['zplayer', 'zelda'])
-        binaries['zq'] = dir / 'zquest'
+        binaries['zq'] = find_path(dir, ['zeditor', 'zquest'])
         binaries['zl'] = dir / 'zlauncher'
 
     return binaries

scripts/build_emscripten.sh

@@ -198,7 +198,7 @@ bash ../web/patches/apply.sh
 embuilder build sdl2-mt
 embuilder build sdl2_mixer_mid
 
-TARGETS="${@:-zplayer zquest zscript}"
+TARGETS="${@:-zplayer zeditor zscript}"
 cmake --build . --config $CONFIG -t $TARGETS
 cd $CONFIG
 
@@ -260,13 +260,14 @@ if [[ "${TARGETS[*]}" =~ "zplayer" ]]; then
     sed -i -e 's/__IS_CI__/false/' zelda.html
   fi
 fi
-if [[ "${TARGETS[*]}" =~ "zquest" ]]; then
+if [[ "${TARGETS[*]}" =~ "zeditor" ]]; then
   cp ../../web/index.html zquest.html
   sed -i -e 's/__TARGET__/zquest/' zquest.html
   sed -i -e 's|__DATA__|<script src="zc.data.js"></script><script src="zq.data.js"></script>|' zquest.html
   sed -i -e 's|__SCRIPT__|<script async src="zquest.js"></script>|' zquest.html
   set_files zquest.html
   insert_css zquest.html
+  mv zeditor.js zquest.js
   if [[ "$ZC_PACKAGE_REPLAYS" ]]; then
     sed -i -e 's/__IS_CI__/true/' zquest.html
   else

scripts/package.py

@@ -243,7 +243,7 @@ def do_packaging(package_dir: Path, files, include_licenses=False):
     if not args.skip_binaries:
         files.extend([
             binary_file(build_dir / 'zplayer'),
-            binary_file(build_dir / 'zquest'),
+            binary_file(build_dir / 'zeditor'),
             binary_file(build_dir / 'zscript'),
             binary_file(build_dir / 'zlauncher'),
             binary_file(build_dir / 'zconsole') if system == 'Windows' else None,

scripts/package_mac.sh

@@ -25,7 +25,7 @@ python scripts/package.py --build_folder "$build_dir" --skip_archive
 # Set SKIP_APP_BUNDLE=1 to skip building an osx application bundle.
 # This won't be able to distribute easily, because OSX will prevent users from running
 # unverified binaries unless they right-click->Open and ignore a scary warning. Even then,
-# when zlauncher/zquest opens other ZC processes OSX will prevent it without a way to ignore
+# when zlauncher/zeditor opens other ZC processes OSX will prevent it without a way to ignore
 # the intervention, so some features won't work.
 if test "${SKIP_APP_BUNDLE+x}"; then
   rm -rf "$mac_package_dir"
@@ -70,7 +70,7 @@ find "$contents/Resources" -name "*.dylib" -exec mv {} "$tmp_libs_dir" \;
 
 # Correct the library paths in the executable, and codesign.
 dylibbundler -od -b -d "$contents/libs/" -s "$tmp_libs_dir" \
-    -x "$contents/Resources/zlauncher" -x "$contents/Resources/zquest" \
+    -x "$contents/Resources/zlauncher" -x "$contents/Resources/zeditor" \
     -x "$contents/Resources/zplayer" -x "$contents/Resources/zscript" \
     -x "$contents/Resources/zupdater"
 rm -rf "$tmp_libs_dir"
@@ -82,7 +82,7 @@ if test "${PACKAGE_DEBUG_INFO+x}"; then
   xcrun dsymutil \
     "$contents/Resources/zlauncher" \
     "$contents/Resources/zplayer" \
-    "$contents/Resources/zquest" \
+    "$contents/Resources/zeditor" \
     "$contents/Resources/zscript" \
     "$contents/Resources/zupdater" \
     $(find "$contents/libs" -name '*.dylib' -type f -printf "\"%p\" ") \

scripts/run_target.py

@@ -84,7 +84,7 @@ def get_build_folder():
             root_dir / 'build/Release',
             root_dir / 'build/Debug',
         ]
-        targets = [get_exe_name(x) for x in ['zplayer', 'zquest', 'zlauncher', 'zscript', 'zupdater']]
+        targets = [get_exe_name(x) for x in ['zplayer', 'zeditor', 'zlauncher', 'zscript', 'zupdater']]
         def get_mtime(path: Path):
             if path.exists():
                 return path.stat().st_mtime
@@ -178,7 +178,7 @@ def _run(target_name: str, args: List, build_folder: Optional[str] = None):
 
 def run(target_name: str, args: List, build_folder: Optional[Path] = None, **kwargs):
     """
-    Runs target (ex: zplayer, zscript, zquest, zlauncher), from env.BUILD_FOLDER or the provided build_folder.
+    Runs target (ex: zplayer, zeditor, zscript, zlauncher), from env.BUILD_FOLDER or the provided build_folder.
 
     Returns subprocess.CompletedProcess[str], even if command fails.
 

src/EditboxView.cpp

@@ -17,7 +17,7 @@ extern int32_t scheme[];
 extern volatile int32_t myvsync;
 void update_hw_screen(bool force);
 
-extern bool is_zquest();
+extern bool is_editor();
 
 void EditboxView::update()
 {

src/base/process_management.h

@@ -22,14 +22,14 @@ static uint32_t __dummy_;
 
 #ifdef _WIN32
 	#define ZPLAYER_FILE "zplayer.exe"
-	#define ZQUEST_FILE "zquest.exe"
+	#define ZEDITOR_FILE "zeditor.exe"
 	#define ZSCRIPT_FILE "zscript.exe"
 	#define ZLAUNCHER_FILE "zlauncher.exe"
 	#define ZUPDATER_FILE "zupdater.exe"
 	#define PYTHON "pythonw"
 #else
 	#define ZPLAYER_FILE "./zplayer"
-	#define ZQUEST_FILE "./zquest"
+	#define ZEDITOR_FILE "./zeditor"
 	#define ZSCRIPT_FILE "./zscript"
 	#define ZLAUNCHER_FILE "./zlauncher"
 	#define ZUPDATER_FILE "./zupdater"