Merge pull request #1896 from julescubtree/fix-build

Fix build

blocks_vertical/procedures.js

@@ -23,14 +23,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.Blocks.procedures');
+goog.provide('Blockly.ScratchBlocks.ProcedureUtils');
 
 goog.require('Blockly.Blocks');
+goog.require('Blockly.Colours');
 goog.require('Blockly.constants');
-
-
-// TODO: Create a namespace properly.
-Blockly.ScratchBlocks.ProcedureUtils = {};
+goog.require('Blockly.ScratchBlocks.VerticalExtensions');
 
 // Serialization and deserialization.
 

build.py

@@ -272,6 +272,10 @@ def gen_blocks(self, block_type):
     elif block_type == "common":
       target_filename = "blocks_compressed.js"
       filenames = glob.glob(os.path.join("blocks_common", "*.js"))
+
+    # glob.glob ordering is platform-dependent and not necessary deterministic
+    filenames.sort()  # Deterministic build.
+
     # Define the parameters for the POST request.
     params = [
       ("compilation_level", "SIMPLE"),
@@ -283,6 +287,7 @@ def gen_blocks(self, block_type):
     # Add Blockly.Colours for use of centralized colour bank
     filenames.append(os.path.join("core", "colours.js"))
     filenames.append(os.path.join("core", "constants.js"))
+
     for filename in filenames:
       # Append filenames as false arguments the step before compiling will
       # either transform them into arguments for local or remote compilation