ide: makefile generation and makefiles: added NOSTRIP option.

Conflicts:

	compiler/ecc/Makefile
	compiler/ecp/Makefile
	compiler/ecs/Makefile
	compiler/libec/Makefile
	eda/drivers/sqlite/Makefile
	eda/drivers/sqliteCipher/Makefile
	eda/libeda/Makefile

diff --git a/compiler/bootstrap/ecc/Makefile b/compiler/bootstrap/ecc/Makefile
index d4766d4..4c3bb03 100644 (file)
--- a/compiler/bootstrap/ecc/Makefile
+++ b/compiler/bootstrap/ecc/Makefile
@@ -78,7 +78,9 @@ objdir:
 
 $(TARGET): $(SOURCES) $(RESOURCES) | objdir $(SYMBOLS) $(OBJECTS)
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
 
 # OBJECT RULES
 

diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index 37e05cd..08c699f 100644 (file)
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -77,7 +77,9 @@ objdir:
 
 $(TARGET): $(SOURCES) $(RESOURCES) | objdir $(SYMBOLS) $(OBJECTS)
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
 
 $(OBJ)ecp.o: bootstrap/ecp.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c bootstrap/ecp.c -o $(OBJ)ecp.o

diff --git a/compiler/bootstrap/ecs/Makefile b/compiler/bootstrap/ecs/Makefile
index 96f028a..1a31927 100644 (file)
--- a/compiler/bootstrap/ecs/Makefile
+++ b/compiler/bootstrap/ecs/Makefile
@@ -78,7 +78,9 @@ objdir:
 
 $(TARGET): $(SOURCES) $(RESOURCES) | objdir $(SYMBOLS) $(OBJECTS)
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
 
 $(OBJ)ecs.o: bootstrap/ecs.c
        $(CC) $(CFLAGS) -c bootstrap/ecs.c -o $(OBJ)ecs.o

diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index ce9b65d..680b68c 100644 (file)
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -87,7 +87,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/ecc.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/ecc.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../../obj/$(PLATFORM)/bin/)

diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index 57505fb..6f26b5b 100644 (file)
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -87,7 +87,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/ecp.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/ecp.mo "locale/es_ES"
        $(call cpq,$(TARGET),../../obj/$(PLATFORM)/bin/)

diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index 45bf2e9..70372b1 100644 (file)
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -87,7 +87,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/ecs.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/ecs.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../../obj/$(PLATFORM)/bin/)

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index 541e397..1ab5403 100644 (file)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -193,7 +193,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/ec.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/ec.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../../$(SODESTDIR))

diff --git a/documentor/Makefile b/documentor/Makefile
index c0723d0..40a4deb 100644 (file)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -127,7 +127,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) res/documentorIcon.png ""
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/documentor.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/documentor.mo "locale/es_ES/LC_MESSAGES"

diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index cfcb617..24c0519 100644 (file)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -88,12 +88,16 @@ $(OBJECTS): | objdir
 
 nores: $(SOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(call cpq,$(TARGET),../../obj/$(PLATFORM)/bin/)
 
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) ../extract/obj/release.$(PLATFORM)/extract$(E) ""
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/ear.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/ear.mo "locale/es_ES/LC_MESSAGES"

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 7e7f82c..f4de083 100644 (file)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -141,7 +141,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
 ifndef WINDOWS
 ifeq "$(TARGET_TYPE)" "executable"
        @-$(call psep,$(UPX) $(UPXFLAGS) $(TARGET)) || $(call echo,upx not installed; not compressing.)

diff --git a/ecere/Makefile b/ecere/Makefile
index 36e9ee0..eeea80f 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -940,7 +940,9 @@ $(OBJECTS): | objdir
 
 nores: $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
 ifdef WINDOWS
        $(call cpq,$(TARGET),../compiler/bootstrap/obj/bin.$(PLATFORM)/)
 endif
@@ -952,7 +954,9 @@ endif
 
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(SONAME) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) $(RES)actions/editFind.png $(RES)actions/folderNew.png $(RES)actions/goDown.png $(RES)actions/goHome.png $(RES)actions/goNext.png $(RES)actions/goPrevious.png $(RES)actions/goUp.png $(RES)actions/listAdd.png $(RES)actions/listRemove.png $(RES)actions/viewRefresh.png "actions"
        $(EAR) awq $(TARGET) $(RES)actions/windowNew.png "actions"
        $(EAR) awq $(TARGET) $(RES)constructs/class.png $(RES)constructs/data.png $(RES)constructs/dataPrivate.png $(RES)constructs/dataType.png $(RES)constructs/enum.png $(RES)constructs/enumValue.png $(RES)constructs/event.png $(RES)constructs/library.png $(RES)constructs/method.png $(RES)constructs/methodPrivate.png "constructs"

diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index bd5b3d8..87fbb38 100644 (file)
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -171,7 +171,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME) $(SONAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(call cpq,$(TARGET),../$(SODESTDIR))
 ifdef LINUX
        ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO).0

diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index ff66531..405d043 100644 (file)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -107,7 +107,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME) $(SONAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/EDASQLite.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/EDASQLite.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../../../$(SODESTDIR))

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index de7986a..01f9f40 100644 (file)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -130,7 +130,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME) $(SONAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/EDASQLiteCipher.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/EDASQLiteCipher.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../../../$(SODESTDIR))

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 9edb56e..3db1e67 100644 (file)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -125,7 +125,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME) $(SONAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/EDA.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/EDA.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../../$(SODESTDIR))

diff --git a/epj2make/Makefile b/epj2make/Makefile
index ad2af7d..7b6bf9f 100644 (file)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -123,7 +123,9 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) ../include.mk ""
        $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/epj2make.mo "locale/zh_CN/LC_MESSAGES"
        $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/epj2make.mo "locale/es_ES/LC_MESSAGES"

diff --git a/ide/Makefile b/ide/Makefile
index 95988fb..2e50268 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -351,7 +351,9 @@ ifdef WINDOWS
 $(TARGET): obj/resources.o
 endif
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
        $(EAR) awq $(TARGET) res/ecere.jpg res/ecereBack.jpg res/icon.png ../include.mk ""
        $(EAR) awq $(TARGET) $(RES)actions/attach.png $(RES)actions/delete.png $(RES)actions/detach.png $(RES)actions/docNew.png $(RES)actions/editCopy.png $(RES)actions/editDelete.png $(RES)actions/delete2.png "actions"
        $(EAR) awq $(TARGET) $(RES)codeMarks/breakpoint.png $(RES)codeMarks/breakpointDisabled.png $(RES)codeMarks/breakpointHalf.png $(RES)codeMarks/breakpointHalfDisabled.png $(RES)codeMarks/cursor.png $(RES)codeMarks/cursorError.png $(RES)codeMarks/topFrame.png $(RES)codeMarks/topFrameError.png $(RES)codeMarks/topFrameHalf.png $(RES)codeMarks/topFrameHalfError.png "codeMarks"

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 1e20a63..3068e25 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2139,7 +2139,9 @@ private:
 
             if(!GetDebug(config))
             {
+               f.Printf("ifndef NOSTRIP\n");
                f.Printf("\t$(STRIP) $(STRIPOPT) $(TARGET)\n");
+               f.Printf("endif\n");
 
                if(GetCompress(config))
                {