Skip to content

Commit

Permalink
fix issue 630 (#634)
Browse files Browse the repository at this point in the history
  • Loading branch information
markro49 authored Jan 7, 2025
1 parent 6d54320 commit 88c6225
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
16 changes: 10 additions & 6 deletions framework/core/Project/Closure.pm
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,16 @@ sub _post_checkout {
close FH;

# Set default Java target to 6.
# either these:
Utils::sed_cmd("s/source-level: 1\.[1-5]/source-level ${jvm_version}/", "$work_dir/lib/rhino/build.properties");
Utils::sed_cmd("s/target-jvm: 1\.[1-5]/target-jvm ${jvm_version}/", "$work_dir/lib/rhino/build.properties");
# or these:
Utils::sed_cmd("s/source-level: 1\.[1-5]/source-level ${jvm_version}/", "$work_dir/lib/rhino/src/mozilla/js/rhino/build.properties");
Utils::sed_cmd("s/target-jvm: 1\.[1-5]/target-jvm ${jvm_version}/", "$work_dir/lib/rhino/src/mozilla/js/rhino/build.properties");
if (-e "$work_dir/lib/rhino/build.properties") {
# either these:
Utils::sed_cmd("s/source-level: 1\.[1-5]/source-level ${jvm_version}/", "$work_dir/lib/rhino/build.properties");
Utils::sed_cmd("s/target-jvm: 1\.[1-5]/target-jvm ${jvm_version}/", "$work_dir/lib/rhino/build.properties");
}
if (-e "$work_dir/lib/rhino/src/mozilla/js/rhino/build.properties") {
# or these:
Utils::sed_cmd("s/source-level: 1\.[1-5]/source-level ${jvm_version}/", "$work_dir/lib/rhino/src/mozilla/js/rhino/build.properties");
Utils::sed_cmd("s/target-jvm: 1\.[1-5]/target-jvm ${jvm_version}/", "$work_dir/lib/rhino/src/mozilla/js/rhino/build.properties");
}
}

1;
4 changes: 3 additions & 1 deletion framework/core/Project/Codec.pm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ sub _post_checkout {
}

# Set default Java target to 6.
Utils::sed_cmd("s/1\.[1-5]/1.6/", "$work_dir/default.properties");
if (-e "$work_dir/default.properties") {
Utils::sed_cmd("s/1\.[1-5]/1.6/", "$work_dir/default.properties");
}
}

#
Expand Down

0 comments on commit 88c6225

Please sign in to comment.