thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Modify Travis build to use IDE 1.6.4

Richard Wackerbarth 9 years ago
parent
cfb416fda9
commit
8c760f1c31
1 changed files with 43 additions and 46 deletions
Split View Show Diff Stats
  1. 43
    46
      .travis.yml

+ 43
- 46
.travis.yml View File 

@@ -7,37 +7,34 @@ before_install:
7 7 
   # Also tags for the root(s) of the minor version(s)
8 8 
   - git fetch origin --tags
9 9 
   - mkdir ~/bin
10 
-  - wget https://bootstrap.pypa.io/get-pip.py
11 
-  - wget https://bintray.com/artifact/download/olikraus/u8glib/u8glib_arduino_v1.17.zip
12 10 
 install:
11 
+  # Install arduino 1.6.4
12 
+  - wget http://downloads-02.arduino.cc/arduino-1.6.4-linux64.tar.xz
13 
+  - tar Jxf arduino-1.6.4-linux64.tar.xz
14 
+  - sudo mv arduino-1.6.4 /usr/local/share/arduino
15 
+  - ln -s /usr/local/share/arduino/arduino ~/bin/arduino
16 
+  # Our custom build commands
13 17 
   - mv LinuxAddons/bin/*  ~/bin/
14 
-  - sudo python get-pip.py
15 
-  - sudo pip install ino
16 
-  # add ppa for newer version of Arduino than available in ubuntu 12.04
17 
-  - sudo add-apt-repository ppa:michael-gruz/elektronik -y
18 
-  - sudo apt-get update -q
19 
-  - sudo apt-get install arduino
18 
+  - ls -la ~/bin
19 
+  # install our platform
20 
+  - cp -r ArduinoAddons/Arduino_1.6.x/hardware/* /usr/local/share/arduino/hardware
21 
+  # copy libraries to arduino dir, as conditional includes do not work in .ino files
22 
+  - cp -r /usr/local/share/arduino/hardware/marlin/avr/libraries/* /usr/local/share/arduino/libraries/
23 
+  - cp -r ArduinoAddons/Arduino_1.6.x/libraries/* /usr/local/share/arduino/libraries/
24 
+  # add LiquidCrystal_I2C & LiquidTWI2 libraries
25 
+  - git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git
26 
+  - mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C
27 
+  - git clone https://github.com/lincomatic/LiquidTWI2.git
28 
+  - mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
20 29 
 before_script:
21 
-  # copy TMC and L6470 libraries to arduino dir, as conditional includes do not work in .ino files
22 
-  - sudo cp -r ArduinoAddons/Arduino_1.x.x/libraries/ /usr/share/arduino
23 
-  # add U8glib, LiquidCrystal_I2C & LiquidTWI2 libraries
24 
-  - sudo unzip u8glib_arduino_v1.17.zip -d /usr/share/arduino/libraries/
25 
-  - cd /usr/share/arduino/libraries/
26 
-  - sudo git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git
27 
-  - ls -la
28 
-  - ls -la LiquidCrystal_I2C/
29 
-  - sudo git clone https://github.com/lincomatic/LiquidTWI2.git
30 
-  # remove Robot_Control library to stop compile error!
31 
-  - sudo rm -rf /usr/share/arduino/libraries/Robot_Control
30 
+  # arduino requires an X server even with command line
31 
+  # https://github.com/arduino/Arduino/issues/1981
32 
+  - Xvfb :1 -screen 0 1024x768x16 &> xvfb.log &
32 33 
   # change back to home directory for compiling
33 34 
   - cd $TRAVIS_BUILD_DIR
34 
-  # ino needs files in src directory
35 
-  - ln -s Marlin src
36 
-  - generate_version_header_for_marlin . Marlin/_Version.h
37 
-  - cat Marlin/_Version.h
38 35 
 script:
39 36 
   # build default config
40 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
37 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
41 38 
   # backup configuration.h
42 39 
   - cp Marlin/Configuration.h Marlin/Configuration.h.backup
43 40 
   - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
 
@@ -45,55 +42,55 @@ script:
45 42 
   # commented out for the moment fails build but compiles fine in Arduino
46 43 
   #- sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/g' Marlin/Configuration.h
47 44 
   #- rm -rf .build/
48 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
45 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
49 46 
   # change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h
50 47 
   #- sed -i 's/#define MOTHERBOARD BOARD_ULTIMAKER/#define MOTHERBOARD BOARD_AZTEEG_X3_PRO/g' Marlin/Configuration.h
51 48 
   #- sed -i 's/#define EXTRUDERS 2/#define EXTRUDERS 3/g' Marlin/Configuration.h
52 49 
   #- rm -rf .build/
53 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
50 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
54 51 
   # enable PIDTEMPBED
55 52 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
56 53 
   - sed -i 's/\/\/#define PIDTEMPBED/#define PIDTEMPBED/g' Marlin/Configuration.h
57 54 
   - rm -rf .build/
58 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
55 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
59 56 
   # enable AUTO_BED_LEVELING
60 57 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
61 58 
   - sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h
62 59 
   - rm -rf .build/
63 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
60 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
64 61 
   # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
65 62 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
66 63 
   - sed -i 's/\/\/#define EEPROM_SETTINGS/#define EEPROM_SETTINGS/g' Marlin/Configuration.h
67 64 
   - sed -i 's/\/\/#define EEPROM_CHITCHAT/#define EEPROM_CHITCHAT/g' Marlin/Configuration.h
68 65 
   - rm -rf .build/
69 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
66 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
70 67 
   ### LCDS ###
71 68 
   # ULTIMAKERCONTROLLER
72 69 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
73 70 
   - sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
74 71 
   - rm -rf .build/
75 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
72 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
76 73 
   # MAKRPANEL
77 74 
   # Needs to use melzi and sanguino hardware
78 75 
   #- cp Marlin/Configuration.h.backup Marlin/Configuration.h
79 76 
   #- sed -i 's/\/\/#define MAKRPANEL/#define MAKRPANEL/g' Marlin/Configuration.h
80 77 
   #- rm -rf .build/
81 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
78 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
82 79 
   # REPRAP_DISCOUNT_SMART_CONTROLLER
83 80 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
84 81 
   - sed -i 's/\/\/#define REPRAP_DISCOUNT_SMART_CONTROLLER/#define REPRAP_DISCOUNT_SMART_CONTROLLER/g' Marlin/Configuration.h
85 82 
   - rm -rf .build/
86 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
83 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
87 84 
   # G3D_PANE
88 85 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
89 86 
   - sed -i 's/\/\/#define G3D_PANEL/#define G3D_PANEL/g' Marlin/Configuration.h
90 87 
   - rm -rf .build/
91 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
88 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
92 89 
   # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
93 90 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
94 91 
   - sed -i 's/\/\/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/g' Marlin/Configuration.h
95 92 
   - rm -rf .build/
96 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
93 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
97 94 
   # REPRAPWORLD_KEYPAD
98 95 
   # Cant find configuration details to get it to compile
99 96 
   #- cp Marlin/Configuration.h.backup Marlin/Configuration.h
 
@@ -101,60 +98,60 @@ script:
101 98 
   #- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD/#define REPRAPWORLD_KEYPAD/g' Marlin/Configuration.h
102 99 
   #- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/g' Marlin/Configuration.h
103 100 
   #- rm -rf .build/
104 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
101 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
105 102 
   # RA_CONTROL_PANEL
106 103 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
107 104 
   - sed -i 's/\/\/#define RA_CONTROL_PANEL/#define RA_CONTROL_PANEL/g' Marlin/Configuration.h
108 105 
   - rm -rf .build/
109 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
106 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
110 107 
   ### I2C PANELS ###
111 108 
   # LCD_I2C_SAINSMART_YWROBOT
112 109 
   # Failing at the moment needs different library
113 110 
   #- cp Marlin/Configuration.h.backup Marlin/Configuration.h
114 111 
   #- sed -i 's/\/\/#define LCD_I2C_SAINSMART_YWROBOT/#define LCD_I2C_SAINSMART_YWROBOT/g' Marlin/Configuration.h
115 112 
   #- rm -rf .build/
116 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
113 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
117 114 
   # LCD_I2C_PANELOLU2
118 115 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
119 116 
   - sed -i 's/\/\/#define LCD_I2C_PANELOLU2/#define LCD_I2C_PANELOLU2/g' Marlin/Configuration.h
120 117 
   - rm -rf .build/
121 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
118 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
122 119 
   # LCD_I2C_VIKI
123 120 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
124 121 
   - sed -i 's/\/\/#define LCD_I2C_VIKI/#define LCD_I2C_VIKI/g' Marlin/Configuration.h
125 122 
   - rm -rf .build/
126 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
123 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
127 124 
   # Enable filament sensor
128 125 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
129 126 
   - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
130 127 
   - rm -rf .build/
131 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
128 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
132 129 
    # Enable filament sensor with LCD display
133 130 
   - cp Marlin/Configuration.h.backup Marlin/Configuration.h
134 131 
   - sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
135 132 
   - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
136 133 
   - sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h
137 134 
   - rm -rf .build/
138 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
135 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
139 136 
   ######## Example Configurations ##############
140 137 
   # Delta Config (generic)
141 138 
   - cp Marlin/example_configurations/delta/generic/Configuration* Marlin/
142 139 
   - rm -rf .build/
143 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
140 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
144 141 
   # Delta Config (Mini Kossel)
145 142 
   - cp Marlin/example_configurations/delta/kossel_mini/Configuration* Marlin/
146 143 
   - rm -rf .build/
147 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
144 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
148 145 
   # Makibox Config  need to check board type for Teensy++ 2.0
149 146 
   #- cp Marlin/example_configurations/makibox/Configuration* Marlin/
150 147 
   #- rm -rf .build/
151 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
148 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
152 149 
   # SCARA Config
153 150 
   - cp Marlin/example_configurations/SCARA/Configuration* Marlin/
154 151 
   - rm -rf .build/
155 
-  - ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
152 
+  - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
156 153 
   # tvrrug Config need to check board type for sanguino atmega644p
157 154 
   #- cp Marlin/example_configurations/tvrrug/Round2/Configuration* Marlin/
158 155 
   #- rm -rf .build/
159 
-  #- ino build -m mega2560 --cppflags="-DHAS_AUTOMATIC_VERSIONING -ffunction-sections -fdata-sections -g -Os -w"
156 
+  #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega  Marlin/Marlin.ino
160 157 
   ######## Board Types #############

Write Preview
Loading…
Cancel
Save