mirror of
https://github.com/scratchfoundation/scratch-blocks.git
synced 2025-08-28 22:10:31 -04:00
fixed code order
This commit is contained in:
parent
9a69dff34b
commit
7cc0b42c49
1 changed files with 22 additions and 29 deletions
51
build.py
51
build.py
|
@ -75,32 +75,8 @@ class Gen_uncompressed(threading.Thread):
|
|||
self.search_paths = search_paths
|
||||
|
||||
def run(self):
|
||||
target_filename = "blockly_uncompressed.js"
|
||||
add_dependency = []
|
||||
base_path = calcdeps.FindClosureBasePath(self.search_paths)
|
||||
deps = calcdeps.BuildDependenciesFromFiles(self.search_paths)
|
||||
filenames = calcdeps.CalculateDependencies(self.search_paths,
|
||||
[os.path.join("core", "blockly.js")])
|
||||
|
||||
for dep in deps:
|
||||
if dep.filename in filenames:
|
||||
add_dependency.append(calcdeps.GetDepsLine(dep, base_path))
|
||||
add_dependency = "\n".join(add_dependency)
|
||||
# Find the Blockly directory name and replace it with a JS variable.
|
||||
# This allows blockly_uncompressed.js to be compiled on one computer and be
|
||||
# used on another, even if the directory name differs.
|
||||
m = re.search("[\\/]([^\\/]+)[\\/]core[\\/]blockly.js", add_dependency)
|
||||
add_dependency = re.sub("([\\/])" + re.escape(m.group(1)) +
|
||||
"([\\/]core[\\/])", '\\1" + dir + "\\2', add_dependency)
|
||||
|
||||
provides = []
|
||||
for dep in deps:
|
||||
if dep.filename in filenames:
|
||||
if not dep.filename.startswith(os.pardir + os.sep): # "../"
|
||||
provides.extend(dep.provides)
|
||||
provides.sort()
|
||||
|
||||
f = open(target_filename, "w")
|
||||
target_filename = 'blockly_uncompressed.js'
|
||||
f = open(target_filename, 'w')
|
||||
f.write(HEADER)
|
||||
f.write("""
|
||||
var isNodeJS = !!(typeof module !== 'undefined' && module.exports);
|
||||
|
@ -141,9 +117,26 @@ window.BLOCKLY_BOOT = function() {
|
|||
dir = window.BLOCKLY_DIR.match(/[^\\/]+$/)[0];
|
||||
}
|
||||
""")
|
||||
f.write(add_dependency + "\n")
|
||||
f.write("\n")
|
||||
f.write("// Load Blockly.\n")
|
||||
add_dependency = []
|
||||
base_path = calcdeps.FindClosureBasePath(self.search_paths)
|
||||
for dep in calcdeps.BuildDependenciesFromFiles(self.search_paths):
|
||||
add_dependency.append(calcdeps.GetDepsLine(dep, base_path))
|
||||
add_dependency = '\n'.join(add_dependency)
|
||||
# Find the Blockly directory name and replace it with a JS variable.
|
||||
# This allows blockly_uncompressed.js to be compiled on one computer and be
|
||||
# used on another, even if the directory name differs.
|
||||
m = re.search('[\\/]([^\\/]+)[\\/]core[\\/]blockly.js', add_dependency)
|
||||
add_dependency = re.sub('([\\/])' + re.escape(m.group(1)) +
|
||||
'([\\/]core[\\/])', '\\1" + dir + "\\2', add_dependency)
|
||||
f.write(add_dependency + '\n')
|
||||
|
||||
provides = []
|
||||
for dep in calcdeps.BuildDependenciesFromFiles(self.search_paths):
|
||||
if not dep.filename.startswith(os.pardir + os.sep): # '../'
|
||||
provides.extend(dep.provides)
|
||||
provides.sort()
|
||||
f.write('\n')
|
||||
f.write('// Load Blockly.\n')
|
||||
for provide in provides:
|
||||
f.write("goog.require('%s');\n" % provide)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue