ide, tarball: changed target name and module name from ide to ecere-ide.

diff --git a/Makefile b/Makefile
index 3e249a8..3ac08c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,7 @@ endif
        $(call rm,$(OBJBINDIR)ecp$(E))
        $(call rm,$(OBJBINDIR)ecs$(E))
        $(call rm,$(OBJBINDIR)epj2make$(E))
-       $(call rm,$(OBJBINDIR)ide$(E))
+       $(call rm,$(OBJBINDIR)ecere-ide$(E))
        $(call rm,$(OBJBINDIR)documentor$(E))
 ifdef CodeGuard
        $(call rm,$(OBJBINDIR)CodeGuard$(E))
@@ -488,7 +488,7 @@ BINARIES = \
        ear/cmd/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ear$(E) \
        epj2make/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/epj2make$(E) \
        documentor/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/documentor$(E) \
-       ide/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ide$(E) \
+       ide/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecere-ide$(E) \
        eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SOV) \
        eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SOV)
 
@@ -575,7 +575,7 @@ endif
 endif
 endif
 
-       $(call cp,ide/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ide$(E),$(OBJBINDIR))
+       $(call cp,ide/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecere-ide$(E),$(OBJBINDIR))
        $(call cp,ear/cmd/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ear$(E),$(OBJBINDIR))
        $(call cp,compiler/ecc/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecc$(E),$(OBJBINDIR))
        $(call cp,compiler/ecp/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecp$(E),$(OBJBINDIR))
@@ -610,7 +610,7 @@ endif
 ifneq ($(ECERE_AUDIO),n)
        $(call cp,$(OBJBINDIR)$(LP)EcereAudio$(SO),"$(DESTLIBDIR)/")
 endif
-       $(call cp,$(OBJBINDIR)ide$(E),"$(BINDIR)/")
+       $(call cp,$(OBJBINDIR)ecere-ide$(E),"$(BINDIR)/")
        $(call cp,$(OBJBINDIR)ear$(E),"$(BINDIR)/")
        $(call cp,$(OBJBINDIR)ecc$(E),"$(BINDIR)/")
        $(call cp,$(OBJBINDIR)ecp$(E),"$(BINDIR)/")
@@ -639,7 +639,7 @@ endif
 ifneq ($(ECERE_AUDIO),n)
        install $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/
 endif
-       install $(OBJBINDIR)ide$(E) $(BINDIR)/
+       install $(OBJBINDIR)ecere-ide$(E) $(BINDIR)/
        install $(OBJBINDIR)ear$(E) $(BINDIR)/
        install $(OBJBINDIR)ecc$(E) $(BINDIR)/
        install $(OBJBINDIR)ecp$(E) $(BINDIR)/
@@ -713,7 +713,7 @@ else
        install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ecere$(SO) $(DESTLIBDIR)/$(LP)ecere$(SO)
        install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ecereCOM$(SO) $(DESTLIBDIR)/$(LP)ecereCOM$(SO)
 endif
-       install $(INSTALL_FLAGS) $(OBJBINDIR)ide$(E) $(BINDIR)/ide$(E)
+       install $(INSTALL_FLAGS) $(OBJBINDIR)ecere-ide$(E) $(BINDIR)/ecere-ide$(E)
        install $(INSTALL_FLAGS) $(OBJBINDIR)ear$(E) $(BINDIR)/ear$(E)
        install $(INSTALL_FLAGS) $(OBJBINDIR)ecc$(E) $(BINDIR)/ecc$(E)
        install $(INSTALL_FLAGS) $(OBJBINDIR)ecp$(E) $(BINDIR)/ecp$(E)
@@ -788,7 +788,7 @@ ifneq ($(ECERE_AUDIO),n)
        $(call rm,"$(DESTLIBDIR)/$(LP)EcereAudio$(SO)")
 endif
 endif
-       $(call rm,"$(BINDIR)/ide$(E)")
+       $(call rm,"$(BINDIR)/ecere-ide$(E)")
        $(call rm,"$(BINDIR)/ear$(E)")
        $(call rm,"$(BINDIR)/ecc$(E)")
        $(call rm,"$(BINDIR)/ecp$(E)")

diff --git a/ide/Makefile b/ide/Makefile
index e29be27..74a39bd 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -2,7 +2,7 @@
 
 # CORE VARIABLES
 
-MODULE := ide
+MODULE := ecere-ide
 VERSION := 
 CONFIG := release
 ifndef COMPILER
@@ -42,7 +42,7 @@ OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = res/
 
-TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ide$(E)
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecere-ide$(E)
 
 _ECSOURCES = \
        ../extras/FileSystemIterator.ec \

diff --git a/ide/ide.epj b/ide/ide.epj
index 8e576c1..21b5d85 100644 (file)
--- a/ide/ide.epj
+++ b/ide/ide.epj
@@ -1,6 +1,6 @@
 {
    "Version" : 0.2,
-   "ModuleName" : "ide",
+   "ModuleName" : "ecere-ide",
    "Options" : {
       "Warnings" : "All",
       "PreprocessorDefinitions" : [
@@ -10,7 +10,7 @@
          "../extras/include"
       ],
       "TargetType" : "Executable",
-      "TargetFileName" : "ide",
+      "TargetFileName" : "ecere-ide",
       "Libraries" : [
          "ecere"
       ]

diff --git a/ide/src/ide.ec b/ide/src/ide.ec
index 6238aaa..487c662 100644 (file)
--- a/ide/src/ide.ec
+++ b/ide/src/ide.ec
@@ -759,7 +759,7 @@ class IDEWorkSpace : Window
                isProjectFile = (!strcmpi(extension, "epj") || !strcmpi(extension, "ews"));
                if(mods.ctrl)
                {
-                  char * command = PrintString("ide ", isProjectFile ? "-t " : "", file);
+                  char * command = PrintString("ecere-ide ", isProjectFile ? "-t " : "", file);
                   Execute(command);
                   delete command;
                }
@@ -784,7 +784,7 @@ class IDEWorkSpace : Window
             {
                if(mods.ctrl)
                {
-                  char * command = PrintString("ide ", file);
+                  char * command = PrintString("ecere-ide ", file);
                   Execute(command);
                   delete command;
                }

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index fe287f5..1c9f9c1 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2261,7 +2261,7 @@ private:
                            strcpy(command, line+5);
                            error = true;
                         }
-                        if(!error && (singleProjectOnlyNode || !found) && strstr(line, "ide ") == line)
+                        if(!error && (singleProjectOnlyNode || !found) && strstr(line, "ecere-ide ") == line)
                         {
                            strcpy(command, line);
                            found = true;
@@ -2563,9 +2563,9 @@ private:
             f.Printf("CXX := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)$(if $(GCC_CXX_FLAGS),$(space)$(GCC_CXX_FLAGS),)\n", compiler.cxxCommand);
             if(eC)
             {
-               f.Printf("ECP := $(if $(ECP_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecp/ecp.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\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),)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\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),)$(if $(OUTPUT_POT), -outputpot,)$(if $(DISABLED_POOLING), -disabled-pooling,)\n", compiler.ecsCommand);
+               f.Printf("ECP := $(if $(ECP_DEBUG),ecere-ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecp/ecp.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\n", compiler.ecpCommand);
+               f.Printf("ECC := $(if $(ECC_DEBUG),ecere-ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecc/ecc.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\n", compiler.eccCommand);
+               f.Printf("ECS := $(if $(ECS_DEBUG),ecere-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,)$(if $(DISABLED_POOLING), -disabled-pooling,)\n", compiler.ecsCommand);
             }
             else
             {