Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ardublockly
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
ardublockly
Commits
7ecf7df1
Commit
7ecf7df1
authored
Sep 21, 2015
by
Neil Fraser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't leave blockly_uncompressed.js empty for a long period during build.
parent
c00f95f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
18 deletions
+19
-18
build.py
build.py
+18
-17
core/workspace_svg.js
core/workspace_svg.js
+1
-1
No files found.
build.py
View file @
7ecf7df1
...
...
@@ -75,6 +75,24 @@ class Gen_uncompressed(threading.Thread):
self
.
search_paths
=
search_paths
def
run
(
self
):
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
)
provides
=
[]
for
dep
in
calcdeps
.
BuildDependenciesFromFiles
(
self
.
search_paths
):
if
not
dep
.
filename
.
startswith
(
os
.
pardir
+
os
.
sep
):
# "../"
provides
.
extend
(
dep
.
provides
)
provides
.
sort
()
target_filename
=
"blockly_uncompressed.js"
f
=
open
(
target_filename
,
"w"
)
f
.
write
(
HEADER
)
...
...
@@ -104,24 +122,7 @@ if (!this.goog) {
// Build map of all dependencies (used and unused).
var dir = this.BLOCKLY_DIR.match(/[^
\\
/]+$/)[0];
"""
)
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
:
...
...
core/workspace_svg.js
View file @
7ecf7df1
...
...
@@ -832,7 +832,7 @@ Blockly.WorkspaceSvg.prototype.updateToolbox = function(tree) {
*/
Blockly
.
WorkspaceSvg
.
prototype
.
addChangeListener
=
function
(
func
)
{
var
wrapper
=
Blockly
.
bindEvent_
(
this
.
getCanvas
(),
'
blocklyWorkspaceChange
'
,
null
,
func
);
'
blocklyWorkspaceChange
'
,
null
,
func
);
Array
.
prototype
.
push
.
apply
(
this
.
eventWrappers_
,
wrapper
);
return
wrapper
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment