ecs, buildsystem, tarball; added -outputpot argument for ecs. .pot fi…

…les will not be generated unless -outputpot arg is specified. also added OUTPUT_POT variable support to buildsystem and tarball. quick fix for #858.
ecere · May 20, 2013 · 2fd59c5 · 2fd59c5
1 parent 04054af
commit 2fd59c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/compiler/ecs/ecs.ec b/compiler/ecs/ecs.ec
@@ -8,6 +8,7 @@ import "ec"
 
 static define localeDir = "locale";
 static bool i18n;
+static bool outputPot;
 
 static Platform targetPlatform;
 static int targetBits;
@@ -1616,6 +1617,7 @@ class SymbolgenApp : Application
       bool valid = true;
       char * output = null;
 
+      outputPot = false;
       targetPlatform = GetRuntimePlatform();
       targetBits = GetHostBits();
 
@@ -1682,6 +1684,8 @@ class SymbolgenApp : Application
                else
                   valid = false;
             }
+            else if(!strcmp(arg, "-outputpot"))
+               outputPot = true;
             else if(!strcmp(arg, "-console"))
                isConsole = true;
             else if(!strcmp(arg, "-dynamiclib"))
@@ -1744,7 +1748,7 @@ class SymbolgenApp : Application
          {
             String symbolsDir = GetSymbolsDir();
             // Only generating .pot files when building from release.* directory for now
-            bool outputPot = symbolsDir && SearchString(symbolsDir, 0, "release.", false, false);
+            //bool outputPot = symbolsDir && SearchString(symbolsDir, 0, "release.", false, false);
             Map<ContextStringPair, List<String> > intlStrings { };
             MapIterator<ContextStringPair, List<String>> it { map = intlStrings };
 

diff --git a/default.cf b/default.cf
@@ -16,7 +16,7 @@ export AR      = $(GCC_PREFIX)ar
 export STRIP   = $(GCC_PREFIX)strip
 export ECP := $(call psep,$(EC_BINS)ecp$(HOST_E))
 export ECC := $(call psep,$(EC_BINS)ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
-export ECS := $(call psep,$(EC_BINS)ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+export ECS := $(call psep,$(EC_BINS)ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(OUTPUT_POT),-outputpot,)
 export EAR := $(call psep,$(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/ear$(HOST_E))
 ifdef WINDOWS_TARGET
 WINDRES := $(GCC_PREFIX)windres

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
@@ -2391,7 +2391,7 @@ private:
             f.Printf("CXX := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cxxCommand);
             f.Printf("ECP := $(if $(ECP_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecp/ecp.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)\n", compiler.ecpCommand);
             f.Printf("ECC := $(if $(ECC_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecc/ecc.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)\n", compiler.eccCommand);
-            f.Printf("ECS := $(if $(ECS_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecs/ecs.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)\n", compiler.ecsCommand);
+            f.Printf("ECS := $(if $(ECS_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecs/ecs.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(OUTPUT_POT),-outputpot,)\n", compiler.ecsCommand);
             f.Printf("EAR := %s\n", compiler.earCommand);
 
             f.Puts("AS := $(GCC_PREFIX)as\n");