Skip to content

Commit

Permalink
Enabling compiler arguments for Arduino environment.
Browse files Browse the repository at this point in the history
  • Loading branch information
krulis-martin committed Feb 3, 2023
1 parent 792065d commit dfe7c19
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import Icon, { ExpandCollapseIcon, WarningIcon } from '../../icons';
import { SelectField, ExpandingInputFilesField, ExpandingSelectField, ExpandingTextField } from '../Fields';
import Confirm from '../../forms/Confirm';
import Explanation from '../../widgets/Explanation';
import { ENV_JAVA_ID, ENV_C_GCC_ID, ENV_CPP_GCC_ID } from '../../../helpers/exercise/environments';
import { ENV_ARDUINO_ID, ENV_JAVA_ID, ENV_C_GCC_ID, ENV_CPP_GCC_ID } from '../../../helpers/exercise/environments';

const COMPILER_ARGS_ENVS = [ENV_C_GCC_ID, ENV_CPP_GCC_ID, ENV_ARDUINO_ID];

class EditExerciseSimpleConfigTestCompilation extends Component {
constructor(props) {
Expand Down Expand Up @@ -126,7 +128,7 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
}

{
(env.id === ENV_C_GCC_ID || env.id === ENV_CPP_GCC_ID) && (
COMPILER_ARGS_ENVS.includes(env.id) && (
/*
* A special case for C/C++ only !!!
*/
Expand Down Expand Up @@ -175,7 +177,7 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
<Col
lg={
exercise.runtimeEnvironments.length === 1 &&
(env.id === ENV_JAVA_ID || env.id === ENV_C_GCC_ID || env.id === ENV_CPP_GCC_ID)
(env.id === ENV_JAVA_ID || COMPILER_ARGS_ENVS.includes(env.id))
? 6
: 12
}>
Expand Down
3 changes: 2 additions & 1 deletion src/helpers/exercise/configSimple.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
ENV_HASKELL_ID,
ENV_C_GCC_ID,
ENV_CPP_GCC_ID,
ENV_ARDUINO_ID,
} from './environments';

/**
Expand Down Expand Up @@ -303,7 +304,7 @@ const _PIPELINE_DEFAULT_VARS_DESCRIPTORS = [
new Variable('compile-args', 'string[]', [])
.individualEnvs()
.forCompilation()
.setRuntimeFilter([ENV_C_GCC_ID, ENV_CPP_GCC_ID]),
.setRuntimeFilter([ENV_C_GCC_ID, ENV_CPP_GCC_ID, ENV_ARDUINO_ID]),
new Variable('entry-point', 'file')
.individualEnvs()
.setPipelineFilter('hasEntryPoint')
Expand Down

0 comments on commit dfe7c19

Please sign in to comment.