Added extra.time.* entries to build properties

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/constants/constants.go

@@ -48,6 +48,10 @@ const BUILD_PROPERTIES_BUILD_VARIANT_PATH = "build.variant.path"
 const BUILD_PROPERTIES_COMPILER_CPP_FLAGS = "compiler.cpp.flags"
 const BUILD_PROPERTIES_COMPILER_PATH = "compiler.path"
 const BUILD_PROPERTIES_COMPILER_WARNING_FLAGS = "compiler.warning_flags"
+const BUILD_PROPERTIES_EXTRA_TIME_DST = "extra.time.dst"
+const BUILD_PROPERTIES_EXTRA_TIME_LOCAL = "extra.time.local"
+const BUILD_PROPERTIES_EXTRA_TIME_UTC = "extra.time.utc"
+const BUILD_PROPERTIES_EXTRA_TIME_ZONE = "extra.time.zone"
 const BUILD_PROPERTIES_INCLUDES = "includes"
 const BUILD_PROPERTIES_OBJECT_FILE = "object_file"
 const BUILD_PROPERTIES_OBJECT_FILES = "object_files"

Diff for: src/arduino.cc/builder/setup_build_properties.go

@@ -35,6 +35,7 @@ import (
 	"arduino.cc/builder/utils"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
 type SetupBuildProperties struct{}
@@ -105,6 +106,12 @@ func (s *SetupBuildProperties) Run(context map[string]interface{}) error {
 		buildProperties[constants.BUILD_PROPERTIES_SOURCE_PATH] = sourcePath
 	}
 
+	now := time.Now()
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_UTC] = string(now.Unix())
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_LOCAL] = string(utils.LocalUnix(now))
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE] = string(utils.TimezoneOffset())
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_DST] = string(utils.DaylightSavingsOffset(now))
+
 	context[constants.CTX_BUILD_PROPERTIES] = buildProperties
 
 	return nil

Diff for: src/arduino.cc/builder/test/setup_build_properties_test.go

@@ -34,6 +34,7 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
+	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
@@ -99,6 +100,11 @@ func TestSetupBuildProperties(t *testing.T) {
 	require.Equal(t, Abs(t, "./downloaded_tools/avr-gcc/4.8.1-arduino5"), buildProperties["runtime.tools.avr-gcc-4.8.1-arduino5.path"])
 
 	require.Equal(t, Abs(t, filepath.Join("sketch1", "sketch.ino")), buildProperties[constants.BUILD_PROPERTIES_SOURCE_PATH])
+
+	require.True(t, utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_EXTRA_TIME_UTC))
+	require.True(t, utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_EXTRA_TIME_LOCAL))
+	require.True(t, utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE))
+	require.True(t, utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_EXTRA_TIME_DST))
 }
 
 func TestSetupBuildPropertiesWithSomeCustomOverrides(t *testing.T) {

Diff for: src/arduino.cc/builder/test/time_test.go

@@ -0,0 +1,54 @@
+/*
+ * This file is part of Arduino Builder.
+ *
+ * Arduino Builder is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package test
+
+import (
+	"arduino.cc/builder/utils"
+	"github.com/stretchr/testify/require"
+	"testing"
+	"time"
+)
+
+func TestTime(t *testing.T) {
+	loc, err := time.LoadLocation("CET")
+	NoError(t, err)
+
+	firstJanuary2015 := time.Date(2015, 1, 1, 0, 0, 0, 0, loc)
+	require.Equal(t, int64(1420066800), firstJanuary2015.Unix())
+	require.Equal(t, int64(1420066800+3600), utils.LocalUnix(firstJanuary2015))
+	require.Equal(t, 3600, utils.TimezoneOffset())
+	require.Equal(t, 0, utils.DaylightSavingsOffset(firstJanuary2015))
+
+	thisFall := time.Date(2015, 9, 23, 0, 0, 0, 0, loc)
+	require.Equal(t, int64(1442959200), thisFall.Unix())
+	require.Equal(t, int64(1442959200+3600+3600), utils.LocalUnix(thisFall))
+	require.Equal(t, 3600, utils.TimezoneOffset())
+	require.Equal(t, 3600, utils.DaylightSavingsOffset(thisFall))
+}

Diff for: src/arduino.cc/builder/utils/time.go

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Arduino Builder.
+ *
+ * Arduino Builder is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package utils
+
+import "time"
+
+func TimezoneOffset() int {
+	_, offset := time.Unix(0, 0).Zone()
+	return offset
+}
+
+func DaylightSavingsOffset(t time.Time) int {
+	_, offset := t.Zone()
+	return offset - TimezoneOffset()
+}
+
+func LocalUnix(t time.Time) int64 {
+	return t.Unix() + int64(TimezoneOffset()) + int64(DaylightSavingsOffset(t))
+}