diff options
| author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 20:31:47 +0300 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 20:31:47 +0300 |
| commit | c8fe3761b1e28770e0895733c409c581830e1112 (patch) | |
| tree | 09558b06503e5a9ed2c298f4427b439f0a2f15bb /package.sh | |
| parent | 81831e568dc116305da0ebc06b6f81e7e5abd070 (diff) | |
| parent | 27fe37595c12315e930fe52f683b19d35ec31844 (diff) | |
Merge tag '15.01-RC7' into upstream
Conflicts:
Cura/gui/firmwareInstall.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py
Diffstat (limited to 'package.sh')
| -rwxr-xr-x | package.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/package.sh b/package.sh index 7330f7ac6e..1969b9deb7 100755 --- a/package.sh +++ b/package.sh @@ -19,7 +19,7 @@ BUILD_TARGET=${1:-none} ##Do we need to create the final archive ARCHIVE_FOR_DISTRIBUTION=1 ##Which version name are we appending to the final archive -export BUILD_NAME=15.01-RC6 +export BUILD_NAME=15.01-RC7 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET} ##Revision @@ -164,8 +164,14 @@ cd - gitClone git@github.com:Ultimaker/Ultimaker2Marlin.git _Ultimaker2Marlin cd _Ultimaker2Marlin/Marlin +git checkout master $MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_Ultimaker2 DEFINES="'STRING_CONFIG_H_AUTHOR=\"Version:_${BUILD_NAME}\"' TEMP_SENSOR_1=0 EXTRUDERS=1" $MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_Ultimaker2Dual DEFINES="'STRING_CONFIG_H_AUTHOR=\"Version:_${BUILD_NAME}\"' TEMP_SENSOR_1=20 EXTRUDERS=2" +git checkout UM2go +$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_Ultimaker2go DEFINES="'STRING_CONFIG_H_AUTHOR=\"Version:_${BUILD_NAME}go\"' TEMP_SENSOR_1=0 EXTRUDERS=1" +git checkout UM2extended +$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_Ultimaker2extended DEFINES="'STRING_CONFIG_H_AUTHOR=\"Version:_${BUILD_NAME}ex\"' TEMP_SENSOR_1=0 EXTRUDERS=1" +$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_Ultimaker2extendedDual DEFINES="'STRING_CONFIG_H_AUTHOR=\"Version:_${BUILD_NAME}ex\"' TEMP_SENSOR_1=20 EXTRUDERS=2" cd - cp _UltimakerMarlin/Marlin/_UltimakerMarlin_250000/Marlin.hex resources/firmware/MarlinUltimaker-250000.hex @@ -182,6 +188,9 @@ cp _UltimakerMarlin/Marlin/_UltimakerMarlin_Plus_Dual_250000/Marlin.hex resource cp _UltimakerMarlin/Marlin/_UltimakerMarlin_Plus_Dual_115200/Marlin.hex resources/firmware/MarlinUltimaker-UMOP-115200-dual.hex cp _Ultimaker2Marlin/Marlin/_Ultimaker2/Marlin.hex resources/firmware/MarlinUltimaker2.hex cp _Ultimaker2Marlin/Marlin/_Ultimaker2Dual/Marlin.hex resources/firmware/MarlinUltimaker2-dual.hex +cp _Ultimaker2Marlin/Marlin/_Ultimaker2go/Marlin.hex resources/firmware/MarlinUltimaker2go.hex +cp _Ultimaker2Marlin/Marlin/_Ultimaker2extended/Marlin.hex resources/firmware/MarlinUltimaker2extended.hex +cp _Ultimaker2Marlin/Marlin/_Ultimaker2extendedDual/Marlin.hex resources/firmware/MarlinUltimaker2extended-dual.hex ############################# # Darwin |