Skip to content

Commit

Permalink
fix windows build on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
ricardojlrufino committed May 10, 2020
1 parent 7fa1619 commit 7a323aa
Show file tree
Hide file tree
Showing 11 changed files with 432 additions and 278 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ build/windows/work/
build/windows/*.zip
build/windows/*.tgz
build/windows/*.tar.bz2
build/windows/*.tar.gz
build/windows/work/
build/windows/jre1.8*/
build/windows/libastylej*
build/windows/liblistSerials*
build/windows/arduino-*.zip
Expand Down
53 changes: 53 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
language: java
dist: trusty

before_install:
- sudo apt-get -y install lib32z1 lib32ncurses5 lib32bz2-1.0
# - ln -sf /usr/bin/x86_64-w64-mingw32-ld /home/javydreamercsw/NetBeansProjects/pcgen/build/tmp/launch4j/bin-launch4j-3.9/bin/ld
# - ln -sf /usr/bin/x86_64-w64-mingw32-windres /home/javydreamercsw/NetBeansProjects/pcgen/build/tmp/launch4j/bin-launch4j-3.9/bin/windres
# - /var/lib/dpkg/info/ca-certificates-java.postinst configure
matrix:
include:
- name: "Linux Build"
env:
- TARGET=linux64
- TARGET_FOLDER=linux
- TARGET_PKG=tar.xz
- name: "Windows Build"
env:
- TARGET=windows
- TARGET_FOLDER=windows
- TARGET_PKG=zip

# - env:
# - TARGET=macosx

before_script:
- export VERSION=$(grep "VERSION_NAME" arduino-core/src/processing/app/BaseNoGui.java | head -n 1 | awk '{print $7}' |sed 's/^"\(.*\)".*/\1/')
- export VERSION=${VERSION}-BETA-rjlr

script: cd ./build && ant -Dversion=${VERSION} -Dplatform=$TARGET dist
# script: cd ./build && echo "$VERSION"

before_deploy:
# - export VERSION=$(grep "VERSION_NAME" ../arduino-core/src/processing/app/BaseNoGui.java | head -n 1 | awk '{print $7}' |sed 's/^"\(.*\)".*/\1/')
- echo " ========== Deploy version - $VERSION"
- git config --local user.name "Ricardo JL Rufino"
- git config --local user.email "[email protected]"
# - export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)}
# - export TRAVIS_TAG=$VERSION-$(date +'%Y%m%d%H%M%S')
- export TRAVIS_TAG="preview"
- git tag $TRAVIS_TAG


deploy:
provider: releases
api_key:
secure: s3UsHvegodagPUvfoPoIvXiWoApGjWj7ggRQFw3tphiE8oK+uL3t1JQMKPLTNL2Zu4xJCNYTOdMH7WOwuoz2W8OIMhbcmfjJgDA9OnFi6x1RsW6fGHfnZpk3jjJ5SsS0ySv2v7bbfxzLtmj50R8k/kEYMoAMSycwOXdz61qchZrbp/Uhv8f8lV9AgxXzcEhkmrMwBqpFSMfkdIPUlJElHgJIfTBphXodpfhXblW5FJZ3GjmASj2vm3ra03uFlxioIdLi1oXUqmwQq3YDvZaxyx1vk15RrB33r1MMXwk6jGpg5wGj2PGj6VanGfqOapsN74IKdlC2fBafGzvjUWcYpINiObE4oZ+u8rtyFp1ysi99YZJo3/DrZzvLqmr9hv3ULiXwJFWPibR8zj0Nhf1W+oCpOL01mUc8TIMw8UBODnCfT5lMQRuj3WAh7kOfYGF3zpdfI6g3aisexJKXur3C74EuZ8m4yd3sucpDHUBmHx7POZ0uz7npZIUWm+GO46tM/h9h1z3ltPwfL/TPUIkPcPHBnEnqzga4aIeyRwyV0ZnzeiRocaQ8pu8XdrnQxre3eHzTA/PLDsPUFDHwhQ++ybGBpewI1H0Mfz9r206vBKLH32OIwTFC0HiEwM23YGuhqcHhwzVw+PfRkiZ5a0HhyaTlH5yVDJlu+n9sboU8Rzc=
file: "/home/travis/build/ricardojlrufino/Arduino/build/$TARGET_FOLDER/arduino-${VERSION}-*"
skip_cleanup: true
draft: true
overwrite: true
file_glob: true
on:
all_branches: true
10 changes: 8 additions & 2 deletions app/src/cc/arduino/view/treeselector/SketchTreeRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;

import org.fife.ui.rsyntaxtextarea.Theme;

import processing.app.BaseNoGui;

public class SketchTreeRenderer extends DefaultTreeCellRenderer {
private static final String SPAN_FORMAT = "<span style='color:%s;'>%s</span>";
private static final String SPAN_CATEGORY_FORMAT = "<span style='color:%s;'> --- %s ---</span>";
Expand All @@ -21,8 +25,10 @@ public class SketchTreeRenderer extends DefaultTreeCellRenderer {

public SketchTreeRenderer(Supplier<String> filterTextSupplier) {
this.filterTextSupplier = filterTextSupplier;
Icon leafIcon = new ImageIcon(getClass().getResource("script.png"));
Icon folder = new ImageIcon(getClass().getResource("folder.png"));

File dir = new File(BaseNoGui.getContentFile("lib"), "icons/16x16");
Icon leafIcon = new ImageIcon(new File(dir, "script.png").getAbsolutePath());
Icon folder = new ImageIcon(new File(dir, "folder.png").getAbsolutePath());
setClosedIcon(folder);
setOpenIcon(folder);
setLeafIcon(leafIcon);
Expand Down
Binary file removed app/src/cc/arduino/view/treeselector/loading1.gif
Binary file not shown.
Binary file removed app/src/cc/arduino/view/treeselector/loading2.gif
Binary file not shown.
Binary file removed app/src/cc/arduino/view/treeselector/loading3.gif
Binary file not shown.
Loading

0 comments on commit 7a323aa

Please sign in to comment.