Fixes to build system to aid debugging.

Author: ILOVEPIE

build/.gitignore debugbin/.gitignore

@@ -5,7 +5,7 @@ export PROJECT_INCLUDE_DIR="$PROJECT_ROOT/include"
 export SCRIPT_BIN_DIR="$PROJECT_ROOT/sbin"
 export TOOL_BIN_DIR="$PROJECT_ROOT/tbin"
 export TOOL_DATA_DIR="$PROJECT_ROOT/tdata"
-export BUILD_DATA_DIR="$PROJECT_ROOT/build"
 export BIN_DIR="$PROJECT_ROOT/bin"
+export DEBUG_BIN_DIR="$PROJECT_ROOT/debugbin"
 export TEST_DIR="$PROJECT_ROOT/test"
 export TEMP_DIR="$PROJECT_ROOT/temp_files"

sbin/bootstrap.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 . "$PWD/sbin/bootstrap.sh"
 
-find "$BUILD_DATA_DIR/" -type f -not -name .gitignore | xargs rm -f 
+find "$DEBUG_BIN_DIR/" -type f -not -name .gitignore | xargs rm -f 
 find "$BIN_DIR/" -type f -not -name .gitignore | xargs rm -f 
 find "$TEMP_DIR/" -type f -not -name .gitignore | xargs rm -f 
 rm -f "$TOOL_DATA_DIR/changes.cfg"

sbin/commands/clean.sh

@@ -30,14 +30,25 @@ for f in $FILES_TO_COMPILE
 do
     if $SCRIPT_BIN_DIR/helpers/file-modification-test.sh test "$f" $FILE_COUNT; then
         OUTPUT_FILE="$BIN_DIR/$(echo "$f" | sed -n 's|\.js|.min.js|p')"
+        OUTPUT_FILE_DEBUG="$DEBUG_BIN_DIR/$f"
         OUTPUT_SOURCEMAP="$BIN_DIR/$(echo "$f" | sed -n 's|\.js|.map|p')"
         rm -rf "$OUTPUT_FILE" > /dev/null 2>&1
+        echo "Packaging debug version of $f as $OUTPUT_FILE_DEBUG..." | tee -a $LOG_FILE
         echo "Compiling $f as $OUTPUT_FILE..." | tee -a $LOG_FILE
         mkdir -p "$(dirname "$OUTPUT_FILE")/"
+        mkdir -p "$(dirname "$OUTPUT_FILE_DEBUG")/"
         if [ ! -f "$PROJECT_INCLUDE_DIR/$f" ]; then
             mkdir -p "$(dirname "$PROJECT_INCLUDE_DIR/$f")"
             touch "$PROJECT_INCLUDE_DIR/$f"
         fi
+
+        WRAPPER="$CLOSURE_OUTPUT_WRAPPER_PREFIX$FILE_COUNT$CLOSURE_OUTPUT_WRAPPER_SUFFIX"
+        DEBUG_PREFIX="$(echo "$WRAPPER" | sed 's/^\(.*\)%output%.*$/\1/g')"
+        DEBUG_SUFFIX="$(echo "$WRAPPER" | sed 's/^.*%output%\(.*\)$/\1/g')"
+        echo "$DEBUG_PREFIX" > "$OUTPUT_FILE_DEBUG"
+        cat "$PROJECT_SOURCE_DIR/$f" >> "$OUTPUT_FILE_DEBUG"
+        echo "$DEBUG_SUFFIX" >> "$OUTPUT_FILE_DEBUG"
+
 		INCLUDE_LIST="--externs '$PROJECT_INCLUDE_DIR/shared.include.js' --externs '$PROJECT_INCLUDE_DIR/include.js'"
 		FILES_TO_INCLUDE="$(cat "$PROJECT_SOURCE_DIR/$f" | grep -E "//@include \[..*?\]" | sed -E "s|//@include \[(..*?)\]|\1|g" | tr '\r\n' ' ' | tr '\n' ' ')"
 		for include in $FILES_TO_INCLUDE
@@ -46,7 +57,7 @@ do
 				INCLUDE_LIST="$INCLUDE_LIST --externs '$PROJECT_INCLUDE_DIR/$include'"
 			fi
 		done
-        $SCRIPT_BIN_DIR/helpers/execute-java.sh -jar "\"$TOOL_BIN_DIR/closure.jar\"" $CLOSURE_TYPE_INF --jscomp_off=globalThis --jscomp_error=visibility --assume_function_wrapper --compilation_level=$CLOSURE_COMPILATION_LEVEL --warning_level=$CLOSURE_LOGGING_DETAIL --language_in=$CLOSURE_INPUT_LANGUAGE_VERSION --language_out=$CLOSURE_OUTPUT_LANGUAGE_VERSION --use_types_for_optimization=$CLOSURE_ENABLE_TYPED_OPTIMIZATION --assume_function_wrapper --output_wrapper="\"$CLOSURE_OUTPUT_WRAPPER_PREFIX$FILE_COUNT$CLOSURE_OUTPUT_WRAPPER_SUFFIX\"" $INCLUDE_LIST --js "\"$PROJECT_SOURCE_DIR/$f\"" --create_source_map "\"$OUTPUT_SOURCEMAP\"" --js_output_file "\"$OUTPUT_FILE\"" 2>&1 | $SCRIPT_BIN_DIR/helpers/error_formatter.sh closure | tee -a $LOG_FILE
+        $SCRIPT_BIN_DIR/helpers/execute-java.sh -jar "\"$TOOL_BIN_DIR/closure.jar\"" $CLOSURE_TYPE_INF --define='ENABLE_DEBUG=false' --jscomp_off=unknownDefines --jscomp_off=globalThis --jscomp_error=visibility --assume_function_wrapper --compilation_level=$CLOSURE_COMPILATION_LEVEL --warning_level=$CLOSURE_LOGGING_DETAIL --language_in=$CLOSURE_INPUT_LANGUAGE_VERSION --language_out=$CLOSURE_OUTPUT_LANGUAGE_VERSION --use_types_for_optimization=$CLOSURE_ENABLE_TYPED_OPTIMIZATION --assume_function_wrapper --output_wrapper="\"$CLOSURE_OUTPUT_WRAPPER_PREFIX$FILE_COUNT$CLOSURE_OUTPUT_WRAPPER_SUFFIX\"" $INCLUDE_LIST --js "\"$PROJECT_SOURCE_DIR/$f\"" --create_source_map "\"$OUTPUT_SOURCEMAP\"" --js_output_file "\"$OUTPUT_FILE\"" 2>&1 | $SCRIPT_BIN_DIR/helpers/error_formatter.sh closure | tee -a $LOG_FILE
 
         sed -i "s|$OUTPUT_FILE|$(basename $OUTPUT_FILE)|g" "$OUTPUT_SOURCEMAP"
         sed -i "s|$PROJECT_SOURCE_DIR/$f|$(basename $f)|g" "$OUTPUT_SOURCEMAP"
@@ -61,8 +72,12 @@ for f in $FILES_TO_COPY
 do
     INPUT_FILE="$PROJECT_SOURCE_DIR/$f"
     OUTPUT_FILE="$BIN_DIR/$f"
+    OUTPUT_FILE_DEBUG="$DEBUG_BIN_DIR/$f"
     rm -rf "$OUTPUT_FILE" > /dev/null 2>&1
     mkdir -p "$(dirname "$OUTPUT_FILE")" > /dev/null 2>&1
     cp "$INPUT_FILE" "$OUTPUT_FILE"
+    rm -rf "$OUTPUT_FILE_DEBUG" > /dev/null 2>&1
+    mkdir -p "$(dirname "$OUTPUT_FILE_DEBUG")" > /dev/null 2>&1
+    cp "$INPUT_FILE" "$OUTPUT_FILE_DEBUG"
 done
 $SCRIPT_BIN_DIR/helpers/file-modification-test.sh init "$FILES_TO_COMPILE"

sbin/commands/local-compile.sh

@@ -4,8 +4,8 @@
 
 LOG_FILE="$PROJECT_ROOT/debug.log"
 rm -f $LOG_FILE
-find "$TEST_DIR/" \( -type f -and -name "*.min.js" \) -or \( -type f -and -name "*.glsl" \) -or \( -type f -and -name "*.map" \) | xargs rm -f > /dev/null 2>&1
-cp -r $BIN_DIR/* "$TEST_DIR" > /dev/null 2>&1
+find "$TEST_DIR/" \( -type f -and -name "*.js" \) -or \( -type f -and -name "*.glsl" \) -or \( -type f -and -name "*.map" \) | xargs rm -f > /dev/null 2>&1
+cp -r $DEBUG_BIN_DIR/* "$TEST_DIR" > /dev/null 2>&1
 $SCRIPT_BIN_DIR/helpers/execute-node.sh http-server "$TEST_DIR" -p 8081 -r --no-dotfiles | tee -a "$LOG_FILE" &
 PID=$!
 echo "$(xdg-open "http://localhost:8081" 2>&1 > /dev/null || kde-open "http://localhost:8081" 2>&1 > /dev/null || gnome-open "http://localhost:8081" 2>&1 > /dev/null)" > /dev/null 2>&1

sbin/commands/local-debug.sh

@@ -6,8 +6,8 @@
 		<meta name="description" content="Sabre.js Debug Page">
         <meta name="author" content="Patrick 'ILOVEPIE' Rhodes Martin">
         <script src="https://spectorcdn.babylonjs.com/spector.bundle.js"></script>
-        <script src="/include.min.js"></script>
-        <script async src="/sabre.min.js"></script>
+        <script src="/include.js"></script>
+        <script async src="/sabre.js"></script>
 	</head>
 	<body>
 		<div style="width:100%; display: flex; align-items: center; justify-content: center;">