apps/system/zoneinfo: All logic to build timezone info. Does not do much else yet

8 files changed, 277 insertions, 2 deletions

diff --git a/apps/system/Kconfig b/apps/system/Kconfig
index 505c180ea..f888c5f43 100644
--- a/apps/system/Kconfig
+++ b/apps/system/Kconfig
@@ -29,3 +29,5 @@ source "$APPSDIR/system/composite/Kconfig"
 source "$APPSDIR/system/usbmsc/Kconfig"
 source "$APPSDIR/system/usbmonitor/Kconfig"
 source "$APPSDIR/system/zmodem/Kconfig"
+source "$APPSDIR/system/zoneinfo/Kconfig"
+
diff --git a/apps/system/Make.defs b/apps/system/Make.defs
index 62c2958a2..e769009d1 100644
--- a/apps/system/Make.defs
+++ b/apps/system/Make.defs
@@ -137,3 +137,8 @@ endif
 ifeq ($(CONFIG_SYSTEM_ZMODEM),y)
 CONFIGURED_APPS += system/zmodem
 endif
+
+ifeq ($(CONFIG_SYSTEM_ZONEINFO),y)
+CONFIGURED_APPS += system/zoneinfo
+endif
+
diff --git a/apps/system/Makefile b/apps/system/Makefile
index cf77709de..05e02dab8 100644
--- a/apps/system/Makefile
+++ b/apps/system/Makefile
@@ -40,6 +40,7 @@
 SUBDIRS  = cdcacm cle composite cu flash_eraseall free i2c hex2bin inifile
 SUBDIRS += install lm75 mdio nxplayer poweroff ramtest ramtron readline
 SUBDIRS += sdcard stackmonitor sudoku sysinfo usbmonitor usbmsc vi zmodem
+SUBDIRS += zoneinfo
 
 # Create the list of installed runtime modules (INSTALLED_DIRS)
 
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index ace779de6..fb6aa73a2 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -42,8 +42,7 @@ ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
-# Hello Application
-# TODO: appname can be automatically extracted from the directory name
+# Replacement free command
 
 APPNAME = free
 PRIORITY = SCHED_PRIORITY_DEFAULT
diff --git a/apps/system/zoneinfo/.gitignore b/apps/system/zoneinfo/.gitignore
new file mode 100644
index 000000000..6c67706bd
--- /dev/null
+++ b/apps/system/zoneinfo/.gitignore
@@ -0,0 +1,14 @@
+/Make.dep
+/.depend
+/.built
+/.tzbin
+/.tzcode
+/tz*-latest.tar.gz
+/*.asm
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
+/*.obj
diff --git a/apps/system/zoneinfo/Kconfig b/apps/system/zoneinfo/Kconfig
new file mode 100644
index 000000000..fbbe4b00a
--- /dev/null
+++ b/apps/system/zoneinfo/Kconfig
@@ -0,0 +1,15 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config SYSTEM_ZONEINFO
+	bool "TZ database"
+	default n
+	depends on LIBC_LOCALTIME && EXPERIMENTAL
+	---help---
+		Build the TZ/Olson database.
+
+if SYSTEM_ZONEINFO
+endif
+
diff --git a/apps/system/zoneinfo/Makefile b/apps/system/zoneinfo/Makefile
new file mode 100755
index 000000000..1e8ebc50d
--- /dev/null
+++ b/apps/system/zoneinfo/Makefile
@@ -0,0 +1,174 @@
+############################################################################
+# apps/system/zoneinfo/Makefile
+#
+#   Copyright (C) 2015, Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
+# Zoneinfo database
+
+APPNAME = tzmount
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = 768
+
+ASRCS =
+CSRCS =
+MAINSRC = tzmount.c
+
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
+OBJS = $(AOBJS) $(COBJS)
+
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+  OBJS += $(MAINOBJ)
+endif
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  BIN = ..\..\libapps$(LIBEXT)
+else
+ifeq ($(WINTOOL),y)
+  BIN = ..\\..\\libapps$(LIBEXT)
+else
+  BIN = ../../libapps$(LIBEXT)
+endif
+endif
+
+ifeq ($(WINTOOL),y)
+  INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}"
+else
+  INSTALL_DIR = $(BIN_DIR)
+endif
+
+CONFIG_XYZ_PROGNAME ?= free$(EXEEXT)
+PROGNAME = $(CONFIG_XYZ_PROGNAME)
+
+ROOTDEPPATH = --dep-path .
+
+# Common build
+
+VPATH =
+
+all: .built
+.PHONY: tzcode_unpack tzdata_unpack tzcode_build tzbuild register context depend clean distclean
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+.built: $(OBJS)
+	$(call ARCHIVE, $(BIN), $(OBJS))
+	$(Q) touch .built
+
+ifeq ($(CONFIG_BUILD_KERNEL),y)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
+	$(Q) $(NM) -u  $(INSTALL_DIR)$(DELIM)$(PROGNAME)
+
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
+
+else
+install:
+
+endif
+
+# Build TZ database
+
+tzcode:
+	mkdir tzcode
+
+tzbin:
+	mkdir tzbin
+
+tzcode-latest.tar.gz:
+	$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzcode-latest.tar.gz
+
+tzdata-latest.tar.gz:
+	$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzdata-latest.tar.gz
+
+tzcode_unpack: tzcode tzcode-latest.tar.gz
+	$(Q) tar zx -C tzcode -f tzcode-latest.tar.gz
+
+tzdata_unpack: tzcode tzdata-latest.tar.gz
+	$(Q) tar zx -C tzcode -f tzdata-latest.tar.gz
+
+tzcode_build: tzcode_unpack
+
+tzbuild: tzcode_build tzdata_unpack tzbin
+	$(Q) $(MAKE) -C tzcode TOPDIR=$(PWD)$(DELIM)tzbin install
+
+# Register application
+
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
+register: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
+register:
+endif
+
+context: tzbuild register
+
+# Create dependencies
+
+.depend: Makefile $(SRCS)
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
+
+depend: .depend
+
+clean:
+	$(call DELFILE, .built)
+	$(call DELDIR, tzbin)
+	$(call DELDIR, tzcode)
+	$(call CLEAN)
+
+distclean: clean
+	$(call DELFILE, Make.dep)
+	$(call DELFILE, .depend)
+	$(call DELFILE, tzdata-latest.tar.gz)
+	$(call DELFILE, tzcode-latest.tar.gz)
+
+-include Make.dep
diff --git a/apps/system/zoneinfo/tzmount.c b/apps/system/zoneinfo/tzmount.c
new file mode 100644
index 000000000..def05e4f4
--- /dev/null
+++ b/apps/system/zoneinfo/tzmount.c
@@ -0,0 +1,65 @@
+/****************************************************************************
+ * apps/system/zoninfo/tzmount.c
+ *
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/progmem.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_BUILD_KERNEL
+int main(int argc, FAR char *argv[])
+#else
+int tzmount_main(int argc, char **argv)
+#endif
+{
+  /* This function is currently just a placeholder.  Future logic will
+   * mount a ROMFS volume here that hold the TZ database.
+   */
+
+  return OK;
+}