Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

JDK-8195669 Cross Compile Arm Swing no longer fails #58

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/sync_upstream.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/bash

echo "Enter hg"
cd hg

pushd openjfx/jfx-dev/rt/root
echo "Update openjfx/jfx-dev/rt -> (root)"
git hg fetch "http://hg.openjdk.java.net/openjfx/jfx-dev/rt"
git hg pull "http://hg.openjdk.java.net/openjfx/jfx-dev/rt"
popd

echo "Exit hg"
echo "Enter combined"

cd ../combined

echo "Check out master"
git checkout master

echo "Fetch (root)"
git fetch "imports/openjfx/jfx-dev/rt/root"

echo "Merge (root)"
git merge "imports/openjfx/jfx-dev/rt/root/master" -m "Merge from (root)" --no-ff

echo "Push master (github)"
git push github master --tags

echo "Check out develop"
git checkout develop

echo "Pull (github)"
git pull github develop

echo "Merge (master)"
git merge master -m "Merge from master" --no-ff

echo "Push develop (github)"
git push github develop --tags
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2158,13 +2158,11 @@ project(":controls") {
}

project(":swing") {
// Now that JMX is gone, we can likely uncomment the following as
Copy link
Collaborator

Choose a reason for hiding this comment

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

can you remove this comment?

// a fix for JDK-8195669
/* should not be built, but needed in JMX

tasks.all {
if (!COMPILE_SWING) it.enabled = false
}
*/

project.ext.buildModule = COMPILE_SWING
project.ext.includeSources = true
project.ext.moduleRuntime = true
Expand Down