Permalink
Browse files

Improved consistency of variable naming across project modules.

  • Loading branch information...
rjust committed Jan 20, 2019
1 parent 95e27d8 commit fcf6b9bb030e0f5f03ebab112eb4d4b622f2f315
Showing with 6 additions and 6 deletions.
  1. +6 −6 framework/core/Project/Mockito.pm
@@ -57,7 +57,7 @@ sub new {
}

sub _post_checkout {
my ($self, $rev_id, $prog_root) = @_;
my ($self, $rev_id, $work_dir) = @_;

# Fix Mockito's test runners
my $vid = $self->{_vcs}->lookup_vid($rev_id);
@@ -66,12 +66,12 @@ sub _post_checkout {
# affected revision id.
my $mockito_junit_runner_patch_file = "$PROJECTS_DIR/$PID/mockito_test_runners.patch";
if ($vid == 16 || $vid == 17 || ($vid >= 34 && $vid <= 38)) {
$self->apply_patch($prog_root, "$mockito_junit_runner_patch_file")
$self->apply_patch($work_dir, "$mockito_junit_runner_patch_file")
or confess("Couldn't apply patch ($mockito_junit_runner_patch_file): $!");
}

# Change Url to Gradle distribution
my $prop = "$prog_root/gradle/wrapper/gradle-wrapper.properties";
my $prop = "$work_dir/gradle/wrapper/gradle-wrapper.properties";
my $lib_dir = "$BUILD_SYSTEMS_LIB_DIR/gradle/dists";

# Read existing Gradle properties file, if it exists
@@ -93,12 +93,12 @@ sub _post_checkout {
close(OUT);

# Disable the Gradle daemon
if (-e "$prog_root/gradle.properties") {
system("sed -i.bak s/org.gradle.daemon=true/org.gradle.daemon=false/g \"$prog_root/gradle.properties\"");
if (-e "$work_dir/gradle.properties") {
system("sed -i.bak s/org.gradle.daemon=true/org.gradle.daemon=false/g \"$work_dir/gradle.properties\"");
}

# Enable local repository
system("find $prog_root -type f -name \"build.gradle\" -exec sed -i.bak 's|jcenter()|maven { url \"$BUILD_SYSTEMS_LIB_DIR/gradle/deps\" }\\\n jcenter()\\\n|g' {} \\;");
system("find $work_dir -type f -name \"build.gradle\" -exec sed -i.bak 's|jcenter()|maven { url \"$BUILD_SYSTEMS_LIB_DIR/gradle/deps\" }\\\n jcenter()\\\n|g' {} \\;");
}

sub determine_layout {

0 comments on commit fcf6b9b

Please sign in to comment.