This repository has been archived by the owner on Jun 24, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 146
JDK-8195669 Cross Compile Arm Swing no longer fails #58
Merged
johanvos
merged 4 commits into
javafxports:develop
from
dellgreen:upstreamfork-dpg-54-armSwingBuildFail
Apr 19, 2018
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d88ee34
add script used by jenkins job to sync with openjfx mercurial repository
tiainen 6845172
Merge pull request #57 from tiainen/master
johanvos 435a27e
Merge branch 'master' of github.com:javafxports/openjdk-jfx
javafxports-github-bot f03cf79
Fixes #54: Cross compile armv6hf build no longer fails with swing errors
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?