From 0ccaac395947f19982dade7cbabf0978d755807a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 10 May 2016 15:36:50 -0600 Subject: [PATCH] UnitTests: Handle the unusual case where 'make clean' is executed with no .config or Make.defs file --- ChangeLog.txt | 3 +++ UnitTests/CButton/Makefile | 6 +++++- UnitTests/CButtonArray/Makefile | 6 +++++- UnitTests/CCheckBox/Makefile | 6 +++++- UnitTests/CGlyphButton/Makefile | 6 +++++- UnitTests/CGlyphSliderHorizontal/Makefile | 6 +++++- UnitTests/CImage/Makefile | 6 +++++- UnitTests/CKeypad/Makefile | 6 +++++- UnitTests/CLabel/Makefile | 6 +++++- UnitTests/CLatchButton/Makefile | 6 +++++- UnitTests/CLatchButtonArray/Makefile | 6 +++++- UnitTests/CListBox/Makefile | 6 +++++- UnitTests/CProgressBar/Makefile | 6 +++++- UnitTests/CRadioButton/Makefile | 6 +++++- UnitTests/CScrollbarHorizontal/Makefile | 6 +++++- UnitTests/CScrollbarVertical/Makefile | 6 +++++- UnitTests/CSliderHorizonal/Makefile | 6 +++++- UnitTests/CSliderVertical/Makefile | 6 +++++- UnitTests/CTextBox/Makefile | 6 +++++- UnitTests/nxwm/Makefile | 4 ++++ 20 files changed, 97 insertions(+), 18 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 1c7c2eb77..f8afa4668 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -571,4 +571,7 @@ required by the current apps/Makefile. Hmmm.. This means that no one has built the NxWidgets packages in the last several realeases! (2016-04-23). +* UnitTests: Add some default definitions to handle the (unusual) case + where 'make clean' is called with no .config or Make.defs file installed + (2016-05-10). diff --git a/UnitTests/CButton/Makefile b/UnitTests/CButton/Makefile index 4b31857a1..7cb4142f7 100644 --- a/UnitTests/CButton/Makefile +++ b/UnitTests/CButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/Unitests/CButton/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CButtonArray/Makefile b/UnitTests/CButtonArray/Makefile index 22d2390c3..cf58f548b 100644 --- a/UnitTests/CButtonArray/Makefile +++ b/UnitTests/CButtonArray/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CButtonArray/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CCheckBox/Makefile b/UnitTests/CCheckBox/Makefile index bc7c2da6d..5efaaa0ce 100644 --- a/UnitTests/CCheckBox/Makefile +++ b/UnitTests/CCheckBox/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CCheckBox/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CGlyphButton/Makefile b/UnitTests/CGlyphButton/Makefile index 4e0975e9b..2ee9463b9 100644 --- a/UnitTests/CGlyphButton/Makefile +++ b/UnitTests/CGlyphButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CGlyphButton/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CGlyphSliderHorizontal/Makefile b/UnitTests/CGlyphSliderHorizontal/Makefile index 96d825953..9bbe295a0 100644 --- a/UnitTests/CGlyphSliderHorizontal/Makefile +++ b/UnitTests/CGlyphSliderHorizontal/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CImage/Makefile b/UnitTests/CImage/Makefile index 7fc9cd9af..f15308dc0 100644 --- a/UnitTests/CImage/Makefile +++ b/UnitTests/CImage/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CImage/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CKeypad/Makefile b/UnitTests/CKeypad/Makefile index 28571f2b2..0dcc1136a 100644 --- a/UnitTests/CKeypad/Makefile +++ b/UnitTests/CKeypad/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CKeyPad/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CLabel/Makefile b/UnitTests/CLabel/Makefile index 44c21b801..e1519a76e 100644 --- a/UnitTests/CLabel/Makefile +++ b/UnitTests/CLabel/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CLabel/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CLatchButton/Makefile b/UnitTests/CLatchButton/Makefile index 5dde0324c..79dcd8967 100644 --- a/UnitTests/CLatchButton/Makefile +++ b/UnitTests/CLatchButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CLatchButton/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CLatchButtonArray/Makefile b/UnitTests/CLatchButtonArray/Makefile index 1280727e9..e5cde9f25 100644 --- a/UnitTests/CLatchButtonArray/Makefile +++ b/UnitTests/CLatchButtonArray/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CLatchButtonArray/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CListBox/Makefile b/UnitTests/CListBox/Makefile index b30278cc3..f31c3528e 100644 --- a/UnitTests/CListBox/Makefile +++ b/UnitTests/CListBox/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CListBox/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CProgressBar/Makefile b/UnitTests/CProgressBar/Makefile index d05b7311a..221f45c1b 100644 --- a/UnitTests/CProgressBar/Makefile +++ b/UnitTests/CProgressBar/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CProgressBar/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CRadioButton/Makefile b/UnitTests/CRadioButton/Makefile index a977b4e95..44afdee4a 100644 --- a/UnitTests/CRadioButton/Makefile +++ b/UnitTests/CRadioButton/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CRadioButton/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CScrollbarHorizontal/Makefile b/UnitTests/CScrollbarHorizontal/Makefile index 5a7038790..d0d10c963 100644 --- a/UnitTests/CScrollbarHorizontal/Makefile +++ b/UnitTests/CScrollbarHorizontal/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CScrollbarHorizontal/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CScrollbarVertical/Makefile b/UnitTests/CScrollbarVertical/Makefile index 290e9736c..f7bd98840 100644 --- a/UnitTests/CScrollbarVertical/Makefile +++ b/UnitTests/CScrollbarVertical/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CScrollbarVertical/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CSliderHorizonal/Makefile b/UnitTests/CSliderHorizonal/Makefile index 3d4881d03..1b8d0cd4d 100644 --- a/UnitTests/CSliderHorizonal/Makefile +++ b/UnitTests/CSliderHorizonal/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CSliderHorizontal/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CSliderVertical/Makefile b/UnitTests/CSliderVertical/Makefile index 1fc39d29a..a22c4ba18 100644 --- a/UnitTests/CSliderVertical/Makefile +++ b/UnitTests/CSliderVertical/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CSliderVertical/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/CTextBox/Makefile b/UnitTests/CTextBox/Makefile index 3d96662a6..da229542d 100644 --- a/UnitTests/CTextBox/Makefile +++ b/UnitTests/CTextBox/Makefile @@ -1,7 +1,7 @@ ################################################################################# # NxWidgets/UnitTests/CTextBox/Makefile # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS diff --git a/UnitTests/nxwm/Makefile b/UnitTests/nxwm/Makefile index 22fab3194..8789e972c 100644 --- a/UnitTests/nxwm/Makefile +++ b/UnitTests/nxwm/Makefile @@ -36,6 +36,10 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs + +OBJEXT ?= .o +DELIM ?= / + include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS