Strip absolute paths from binaries #302

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,7 @@
+# WIP
+
+- Strip absolute paths from binaries #302
+
 # 0.4.23 - Jan 18, 2025
 
 - Don't reset DirectContext on LayerGLSkija resize #301 via @dzaima

linux/CMakeLists.txt

@@ -36,6 +36,9 @@ endif()
 target_include_directories(jwm PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../shared/cc ${JAVA_HOME}/include ${JAVA_HOME}/include/linux)
 set_target_properties(jwm PROPERTIES OUTPUT_NAME "jwm_${JWM_ARCH}")
 
+# https://github.com/HumbleUI/JWM/issues/302
+target_compile_options(jwm PRIVATE -ffile-prefix-map=${CMAKE_SOURCE_DIR}/=)
+
 
 target_link_libraries(jwm PRIVATE X11::X11 X11::Xrandr X11::Xcursor X11::Xi)
 target_link_libraries(jwm PRIVATE OpenGL::GL)

macos/CMakeLists.txt

@@ -18,6 +18,9 @@ add_library(jwm SHARED ${SOURCES_OBJC} ${SOURCES_CXX} ${SOURCES_CXX_IMPL})
 target_include_directories(jwm PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../shared/cc $ENV{JAVA_HOME}/include $ENV{JAVA_HOME}/include/darwin)
 set_target_properties(jwm PROPERTIES OUTPUT_NAME "jwm_${JWM_ARCH}")
 
+# https://github.com/HumbleUI/JWM/issues/302
+target_compile_options(jwm PRIVATE -ffile-prefix-map=${CMAKE_SOURCE_DIR}/=)
+
 target_link_libraries(jwm
     "-framework AppKit"
     "-framework Cocoa"

shared/cc/Log.cc

@@ -22,17 +22,8 @@ namespace jwm {
 
         void notify(const LogEntry& entry) const {
             std::wstringstream finalMessageBuilder;
-            const std::string& file = entry.getFile();
-
-#ifdef WIN32
-            const char sep[] = "\\";
-#else
-            const char sep[] = "/";
-#endif
-
-            auto pos = file.find_last_of(sep);
             finalMessageBuilder
-                << (pos == std::string::npos? file.c_str(): file.substr(pos + 1).c_str()) << ":"
+                << entry.getFile().c_str() << ":"
                 << entry.getLine() << " "
                 << entry.getMessage();
 

shared/cc/Log.hh

@@ -1,4 +1,5 @@
 #pragma once
+#include <cstring>
 #include <string>
 #include <sstream>
 #include <vector>
@@ -79,14 +80,18 @@ namespace jwm {
 #define JWM_LEVEL_VERBOSE true
 #define JWM_LEVEL_LOG false
 
+// https://github.com/HumbleUI/JWM/issues/302
+#define JWM_FILENAME (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : \
+                      strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
+
 // Macro to check if message can be logged, if can than
 // create builder and assemble message
 #define JWM_LOG_CAT(verbose, message)                       \
     do {                                                    \
         auto& __log = ::jwm::Log::getInstance();            \
         if (__log.checkLevel(verbose)) {                    \
             ::jwm::LogBuilder __builder(                           \
-                __FILE__,                                   \
+                JWM_FILENAME,                               \
                 __FUNCTION__,                               \
                 static_cast<unsigned long int>(__LINE__),   \
                 verbose,                                    \

windows/CMakeLists.txt

@@ -102,8 +102,10 @@ target_compile_definitions(jwm
     PRIVATE _CRT_SECURE_NO_WARNINGS
     PRIVATE _SCL_SECURE_NO_WARNINGS)
 
+# https://github.com/HumbleUI/JWM/issues/302
 target_compile_options(jwm
-    PRIVATE /source-charset:utf-8)
+    PRIVATE /source-charset:utf-8
+    PRIVATE "/d1trimfile:${CMAKE_SOURCE_DIR}/")
 
 target_link_options(jwm
     PRIVATE /INCREMENTAL:NO