Embed resources, fix build_blink

plotly · Feb 24, 2021 · 81d6122 · 81d6122
1 parent 00d3b3e
commit 81d6122
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/repos/mac_scripts/args_arm64.gn b/repos/mac_scripts/args_arm64.gn
@@ -1,6 +1,6 @@
 # Copied mac compatible options from //build/args/headless.gn
 # Embed resource.pak into binary to simplify deployment.
-headless_use_embedded_resources = false
+headless_use_embedded_resources = true
 
 # Use embedded data instead external files for headless in order
 # to simplify deployment.

diff --git a/repos/mac_scripts/args_x64.gn b/repos/mac_scripts/args_x64.gn
@@ -1,6 +1,6 @@
 # Copied mac compatible options from //build/args/headless.gn
 # Embed resource.pak into binary to simplify deployment.
-headless_use_embedded_resources = false
+headless_use_embedded_resources = true
 
 # Use embedded data instead external files for headless in order
 # to simplify deployment.

diff --git a/repos/mac_scripts/build_blink b/repos/mac_scripts/build_blink
@@ -19,14 +19,14 @@ cd $DIR/..
 # Add depot_tools directory to PATH
 export PATH="$PATH:`pwd`/depot_tools"
 
-# cd to repos/src
-cd src
-
 # Make output directory
-mkdir -p out/Kaleido_mac_$KALEIDO_ARCH
+mkdir -p ./src/out/Kaleido_mac_$KALEIDO_ARCH/
 
 # Write out/Kaleido_mac_$KALEIDO_ARCH/args.gn
-cp /repos/mac_scripts/args_$KALEIDO_ARCH.gn out/Kaleido_mac_$KALEIDO_ARCH/args.gn
+cp ./mac_scripts/args_$KALEIDO_ARCH.gn ./src/out/Kaleido_mac_$KALEIDO_ARCH/args.gn
+
+# cd to repos/src
+cd src
 
 # 4) Perform build, result will be out/Kaleido_mac_$KALEIDO_ARCH/kaleido
 gn gen out/Kaleido_mac_$KALEIDO_ARCH

diff --git a/repos/mac_scripts/build_kaleido b/repos/mac_scripts/build_kaleido
@@ -27,15 +27,15 @@ cp ./CREDITS.html ./kaleido/
 # Add depot_tools directory to PATH
 export PATH="$PATH:`pwd`/depot_tools"
 
+# Make output directory
+mkdir -p ./src/out/Kaleido_mac_$KALEIDO_ARCH/
+
 # Write out/Kaleido_mac_$KALEIDO_ARCH/args.gn
 cp ./mac_scripts/args_$KALEIDO_ARCH.gn ./src/out/Kaleido_mac_$KALEIDO_ARCH/args.gn
 
 # cd to repos/src
 cd src
 
-# Make output directory
-mkdir -p out/Kaleido_mac_$KALEIDO_ARCH
-
 # 1) Reset headless/BUILD.gn
 git checkout HEAD -- headless/BUILD.gn
 
@@ -66,10 +66,6 @@ cp out/Kaleido_mac_$KALEIDO_ARCH/kaleido ../build/kaleido/bin
 
 # Copy icudtl.dat and settings.dat
 cp ./out/Kaleido_mac_$KALEIDO_ARCH/icudtl.dat ../build/kaleido/bin
-cp ./out/Kaleido_mac_$KALEIDO_ARCH/settings.dat ../build/kaleido/bin
-
-# Copy Resources directory
-cp -r ./out/Kaleido_mac_$KALEIDO_ARCH/Resources ../build/kaleido/
 
 # Copy dynamic libraries
 cp ./out/Kaleido_mac_$KALEIDO_ARCH/libswiftshader*.dylib ../build/kaleido/bin