working on Goma for windows

unfoldingWord · Jan 15, 2023 · ef21662 · ef21662
1 parent 2fa1efc
commit ef21662
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/docs/development/Electronite/electronite-tools-goma-3.bat b/docs/development/Electronite/electronite-tools-goma-3.bat
@@ -2,7 +2,7 @@ echo on
 
 rem Base Build script to do one of: getting sources, building Electronite executable, packaging Electronite as dist.zip
 rem
-rem Uses Chromium build tools.
+rem Uses Electronite build tools.
 rem
 rem need to set paths before running this script.
 rem     `set Path=%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\third_party\depot_tools;%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\src;%Path%`
@@ -40,6 +40,8 @@ if %GOMA%.==. (
   echo "GOMA is set to %GOMA%"
 )
 
+setlocal
+
 rem ------------------------
 rem check command to execute
 rem ------------------------

diff --git a/docs/development/Electronite/meta_builds/build_all_goma_win.bat b/docs/development/Electronite/meta_builds/build_all_goma_win.bat
@@ -4,11 +4,13 @@ set DEST=%2
 rem Meta Build script to get sources, and then build for x64, x86, and arm64 by calling build_target_win.bat
 rem     for each architecture.  The dist.zip files are stored at %DEST%
 rem
-rem Uses Chromium build tools.
+rem Uses Electronite build tools.
 rem
 rem need to set paths before running this script.
 rem     `set Path=%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\third_party\depot_tools;%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\src;%Path%`
 rem
+rem to enable goma, do `set GOMA=cache-only` before running script
+rem
 rem to troubleshoot build problems, do build logging by doing `set BUILD_EXTRAS=-vvvvv` before running
 rem
 rem Example `build_all_goma_win.bat electronite-v22.0.1-beta results\win\v22.0.1`
@@ -17,7 +19,7 @@ echo "Building %BRANCH% to: %DEST%"
 
 if not exist src (
     echo "Getting sources from %BRANCH%"
-    call electronite-tools-goma_3.bat get %BRANCH%
+    call electronite-tools-goma-3.bat get %BRANCH%
 )
 
 set TARGET=x64

diff --git a/docs/development/Electronite/meta_builds/build_target_goma_win.bat b/docs/development/Electronite/meta_builds/build_target_goma_win.bat
@@ -3,7 +3,7 @@ set DEST=%2
 
 rem Build script to do build build and release for %TARGET% if not present at %DEST%
 rem
-rem Uses Chromium build tools.
+rem Uses Electronite build tools.
 rem
 rem need to set paths before running this script.
 rem     `set Path=%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\third_party\depot_tools;%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\src;%Path%`
@@ -28,7 +28,7 @@ if exist %BUILD_TARGET% (
 if exist %BUILD_TARGET% (
     echo "Target built: %BUILD_TARGET%"
 ) else (
-    echo "Target failed: %BUILD_TARGET%"
+    echo "Target build failed: %BUILD_TARGET%"
     exit /b 10
 )
 
@@ -44,7 +44,7 @@ if exist %RELEASE_TARGET% (
 if exist %RELEASE_TARGET% (
     echo "Target released: %RELEASE_TARGET%"
 ) else (
-    echo "Target failed: %RELEASE_TARGET%"
+    echo "Target release failed: %RELEASE_TARGET%"
     exit /b 10
 )