[ultimaker-marlin-firmware] New release, also build for dual extruders

[Miro Hrončok]

commit cbe5826d75090daf15d56b1ef1acd47e3db731b8
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Wed Oct 16 15:25:42 2013 +0200

    New release, also build for dual extruders

 .gitignore                     |    1 +
 sources                        |    2 +-
 ultimaker-marlin-firmware.spec |   63 +++++++++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1d00e5..b161ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ultimaker-marlin-firmware-12.12-ec97307.tar.gz
+/ultimaker-marlin-firmware-13.03-c1b839a.tar.gz
diff --git a/sources b/sources
index 50aa8fb..0654d10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-277046b05e5dfc2b63b2047f402ddd21  ultimaker-marlin-firmware-12.12-ec97307.tar.gz
+a733658b05c076f008bb2a0d4b97fc66  ultimaker-marlin-firmware-13.03-c1b839a.tar.gz
diff --git a/ultimaker-marlin-firmware.spec b/ultimaker-marlin-firmware.spec
index f83f459..bf7237c 100644
--- a/ultimaker-marlin-firmware.spec
+++ b/ultimaker-marlin-firmware.spec
@@ -1,8 +1,8 @@
-%global commit ec97307ce17c34c05c958034aafb0b135135cd27
+%global commit c1b839a043c606234610fb5eea201d0487a3b928
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 Name:           ultimaker-marlin-firmware
-Version:        12.12
-Release:        0.6.RC1%{?dist}
+Version:        13.03
+Release:        1%{?dist}
 Summary:        Ultimaker firmware for the 3D printer
 #this uses the arduino cross-compiler, so the output is arch-independent
 BuildArch:      noarch
@@ -15,6 +15,8 @@ BuildRequires:  dos2unix
 %description
 %{summary}.
 
+%global platform mega2560
+
 %prep
 %setup -qn Marlin-%{commit}
 
@@ -22,32 +24,61 @@ BuildRequires:  dos2unix
 mv Marlin src
 mkdir lib
 
-# Chnage the BAUDRATE
-sed -i25 's/#define BAUDRATE 250000/#define BAUDRATE 115200/' src/Configuration.h
+# Prepare the build variants
+# This is a bit dirty, but as far as I know ino doesn't support redefining things
+cd src
+for E in 1 2; do
+  for B in 250000 115200; do
+    configuration=Configuration.h.$B-$E
+    configuration_adv=Configuration_adv.h.$B-$E
+    cp Configuration.h $configuration
+    cp Configuration_adv.h $configuration_adv
+    sed -i 's/#define VERSION_PROFILE "Github checkout"/#define VERSION_PROFILE "'$B-$E'"/' $configuration
+    [ $B -eq 115200 ] && \
+    sed -i 's/#define BAUDRATE 250000/#define BAUDRATE 115200/' $configuration
+    [ $E -eq 2 ] && \
+    sed -i 's/#define TEMP_SENSOR_1 0/#define TEMP_SENSOR_1 -1/' $configuration && \
+    sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/' $configuration_adv
+  done
+done
+
+cd -
 
 iconv -f iso8859-1 -t utf-8 src/COPYING > src/COPYING.conv && mv -f src/COPYING.conv src/COPYING
 dos2unix README.md
 
 %build
-# build for BAUDRATE 115200
-ino build -m mega
-mv .build/mega/firmware.hex firmware-115200.hex
-rm -rf .build
-
-# build for BAUDRATE 250000
-mv -f src/Configuration.h{25,}
-ino build -m mega
-mv .build/mega/firmware.hex firmware-250000.hex
+for E in 1 2; do
+  for B in 250000 115200; do
+    echo "Building for $E extruders with $B baudrate..."
+    configuration=Configuration.h.$B-$E
+    configuration_adv=Configuration_adv.h.$B-$E
+    cp -f src/$configuration src/Configuration.h
+    cp -f src/$configuration_adv src/Configuration_adv.h
+    ino build -m %{platform}
+    mv .build/%{platform}/firmware.hex firmware-$B-$E.hex
+    rm -rf .build
+  done
+done
 
 %install
-install -Dpm0644 firmware-115200.hex %{buildroot}%{_datadir}/%{name}/MarlinUltimaker-115200.hex
-install -Dpm0644 firmware-250000.hex %{buildroot}%{_datadir}/%{name}/MarlinUltimaker-250000.hex
+install -Dpm0644 firmware-115200-1.hex %{buildroot}%{_datadir}/%{name}/MarlinUltimaker-115200.hex
+install -Dpm0644 firmware-250000-1.hex %{buildroot}%{_datadir}/%{name}/MarlinUltimaker-250000.hex
+install -Dpm0644 firmware-115200-2.hex %{buildroot}%{_datadir}/%{name}/MarlinUltimaker-115200-dual.hex
+install -Dpm0644 firmware-250000-2.hex %{buildroot}%{_datadir}/%{name}/MarlinUltimaker-250000-dual.hex
 
 %files
 %{_datadir}/%{name}
 %doc src/COPYING README.md
 
 %changelog
+* Wed Oct 16 2013 Miro Hrončok <mhroncok at redhat.com> - 13.03-1
+- New release
+- Also build for multiple (two) extruders
+- Write the information about the build into VERSION_PROFILE
+- Build for mega2560
+- Use forloops for preparing config and build
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.12-0.6.RC1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild