Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build script updates #2589

Merged
merged 12 commits into from
Jun 27, 2019
Merged

Conversation

alschmiedt
Copy link
Contributor

The basics

  • I branched from develop
  • My pull request is against develop
  • My code follows the style guide

The details

Resolves

  1. We were not able to have folders inside of core.
  2. We want to be able to change between different renderers at build time.

Proposed Changes

  1. Move all files in the subfolders to a temp folder when running compile.sh.
  2. Pass in a flag to the build.py file (-renderer RENDERNAME) and the compile.sh file (RENDERNAME).

Reason for Changes

  1. The closure compiler treats different sub directories as different packages.
  2. We want to add new renderers so we need a way to choose between the different renderers at build time.

Test Coverage

Tested on:

Additional Information

Copy link
Contributor

@RoboErikG RoboErikG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty good. Only a couple minor comments from me.

build.py Outdated
render_path = 'core/renderers/' + args.render_name
core_search_paths = calcdeps.ExpandDirectories(directories)
for path in core_search_paths:
#If it is the desired renderer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit space after # here and below

echo "Compiling Blockly..."
COMPILATION_COMMAND="java -jar $COMPILER --js='$BLOCKLY_ROOT/tests/compile/main.js' \
--js='$BLOCKLY_ROOT/core/**.js' \
--js='$BLOCKLY_ROOT/tests/compile/temp_core/**.js' \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should reference the tempPath variable -> '$tempPath/**.js'

fi


tempPath="$BLOCKLY_ROOT/tests/compile/temp_core"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this under tests? It's more common to see an output or a build directory at the root of the project.

@alschmiedt alschmiedt merged commit fbd5c91 into google:render/collab Jun 27, 2019
@alschmiedt alschmiedt deleted the build_script_updates branch May 29, 2020 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants