buildsystem,epj2make,ide: fix makefile generation to stop trying to echo empty lists...

diff --git a/audio/Makefile b/audio/Makefile
index a5749df..73ecae5 100644 (file)
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -136,8 +136,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
@@ -149,8 +149,8 @@ $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
-       @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(OBJ)$(MODULE).main$(O),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME) $(SONAME)
 ifndef NOSTRIP

diff --git a/compiler/ecc/Makefile.bootstrap b/compiler/ecc/Makefile.bootstrap
index 8aac596..7588ff3 100644 (file)
--- a/compiler/ecc/Makefile.bootstrap
+++ b/compiler/ecc/Makefile.bootstrap
@@ -95,8 +95,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) -console $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec

diff --git a/compiler/ecp/Makefile.bootstrap b/compiler/ecp/Makefile.bootstrap
index 6441d7a..0b110e9 100644 (file)
--- a/compiler/ecp/Makefile.bootstrap
+++ b/compiler/ecp/Makefile.bootstrap
@@ -97,8 +97,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) -console $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec

diff --git a/compiler/ecs/Makefile.bootstrap b/compiler/ecs/Makefile.bootstrap
index b7d703a..692765a 100644 (file)
--- a/compiler/ecs/Makefile.bootstrap
+++ b/compiler/ecs/Makefile.bootstrap
@@ -95,8 +95,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) -console $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec

diff --git a/compiler/libec/Makefile.bootstrap b/compiler/libec/Makefile.bootstrap
index 0227592..4760745 100644 (file)
--- a/compiler/libec/Makefile.bootstrap
+++ b/compiler/libec/Makefile.bootstrap
@@ -116,8 +116,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec

diff --git a/crossplatform.mk b/crossplatform.mk
index 769ac63..bfe31a0 100644 (file)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -281,6 +281,7 @@ endif
 ifeq ($(D),1)
    DEBUG_IS_ON := defined
 endif
+addtolistfile = $(if $(1),@$(call echo,$(1)) >> $(2),)
 ifdef WIN_SHELL_COMMANDS
    cd = @cd
    nullerror = 2>NUL

diff --git a/deps/jpeg-9a/Makefile b/deps/jpeg-9a/Makefile
index 340a33e..1aab257 100644 (file)
--- a/deps/jpeg-9a/Makefile
+++ b/deps/jpeg-9a/Makefile
@@ -168,8 +168,8 @@ $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
-       @$(call echo,$(_OBJECTS1)) >> $(OBJ)objects.lst
-       @$(call echo,$(_OBJECTS2)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(_OBJECTS1),$(OBJ)objects.lst)
+       $(call addtolistfile,$(_OBJECTS2),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)
 ifndef NOSTRIP

diff --git a/deps/libpng-1.6.12/Makefile b/deps/libpng-1.6.12/Makefile
index 65a8f23..d61570d 100644 (file)
--- a/deps/libpng-1.6.12/Makefile
+++ b/deps/libpng-1.6.12/Makefile
@@ -104,7 +104,7 @@ $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
-       @$(call echo,$(_OBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(_OBJECTS),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)
 ifndef NOSTRIP

diff --git a/deps/zlib-1.2.8/Makefile b/deps/zlib-1.2.8/Makefile
index 7a753ca..dd8f35b 100644 (file)
--- a/deps/zlib-1.2.8/Makefile
+++ b/deps/zlib-1.2.8/Makefile
@@ -102,7 +102,7 @@ $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
-       @$(call echo,$(_OBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(_OBJECTS),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)
 ifndef NOSTRIP

diff --git a/ecere/Makefile b/ecere/Makefile
index 4de114a..559fb07 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -537,12 +537,12 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS1)) >> $(OBJ)symbols.lst
-       @$(call echo,$(SYMBOLS2)) >> $(OBJ)symbols.lst
-       @$(call echo,$(SYMBOLS3)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS1)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS2)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS3)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS1),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(SYMBOLS2),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(SYMBOLS3),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS1),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS2),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS3),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
@@ -575,11 +575,11 @@ endif
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
-       @$(call echo,$(_OBJECTS)) >> $(OBJ)objects.lst
-       @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS1)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS2)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS3)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(_OBJECTS),$(OBJ)objects.lst)
+       $(call addtolistfile,$(OBJ)$(MODULE).main$(O),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS1),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS2),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS3),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(SONAME) $(INSTALLNAME)
 ifndef NOSTRIP

diff --git a/ecere/Makefile.bootstrap b/ecere/Makefile.bootstrap
index a05d012..2fb84ce 100644 (file)
--- a/ecere/Makefile.bootstrap
+++ b/ecere/Makefile.bootstrap
@@ -123,8 +123,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec

diff --git a/ide/src/IDESettings.ec b/ide/src/IDESettings.ec
index 1476d6b..83954ea 100644 (file)
--- a/ide/src/IDESettings.ec
+++ b/ide/src/IDESettings.ec
@@ -957,6 +957,7 @@ public:
       get { return sysroot; }
       isset { return sysroot && sysroot[0]; }
    }
+   bool resourcesDotEar;
    property Array<String> includeDirs
    {
       set
@@ -1096,7 +1097,6 @@ public:
       get { return executableLauncher; }
       isset { return false; }
    }
-   bool resourcesDotEar;
 private:
    Array<String> includeDirs { };
    Array<String> libraryDirs { };
@@ -1190,7 +1190,8 @@ public:
          false,
          distccHosts,
          gnuToolchainPrefix,
-         sysroot
+         sysroot,
+         resourcesDotEar
       };
       for(s : includeDirs) copy.includeDirs.Add(CopyString(s));
       for(s : libraryDirs) copy.libraryDirs.Add(CopyString(s));

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 8934619..8f5df27 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -587,9 +587,11 @@ void OutputFileListActions(File f, const char * name, int parts, const char * fi
    {
       int c;
       for(c=0; c<parts; c++)
-         f.Printf("\t@$(call echo,$(%s%d)) >> %s\n", name, c+1, fileName);
-   } else if(parts) {
-      f.Printf("\t@$(call echo,$(%s)) >> %s\n", name, fileName);
+         f.Printf("\t$(call addtolistfile,$(%s%d),%s)\n", name, c+1, fileName);
+   }
+   else if(parts)
+   {
+      f.Printf("\t$(call addtolistfile,$(%s),%s)\n", name, fileName);
    }
 }
 
@@ -3402,7 +3404,7 @@ private:
          }
          if(numCObjects)
          {
-            f.Printf("\t@$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst\n");
+            f.Printf("\t$(call addtolistfile,$(OBJ)$(MODULE).main$(O),$(OBJ)objects.lst)\n");
             OutputFileListActions(f, "ECOBJECTS", eCsourcesParts, "$(OBJ)objects.lst");
          }
 

diff --git a/installer/Makefile b/installer/Makefile
index 5cc4277..800a5c6 100644 (file)
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -5404,8 +5404,8 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 pots: $(OBJ)$(MODULE).main.ec  
@@ -5420,10 +5420,10 @@ $(TARGET): $(SOURCES) $(RCSOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
 ifdef WINDOWS_TARGET
-       @$(call echo,$(RCOBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(RCOBJECTS),$(OBJ)objects.lst)
 endif
-       @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(OBJ)$(MODULE).main$(O),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)
 ifndef NOSTRIP