2010-06-17 23:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/globsh.mk
    + 'FALSE' variable set for 'nt' shells.
    * 'FALSE' variable set to a dummy value ($(TRUE)) for 'dos' and 'os2' shells.

  * config/wce/mingwarm.mk
  * config/win/mingw.mk
  * config/win/cygwin.mk
    ! Fixed to fail after deleting the library on 'ar' failure.

harbour/ChangeLog

@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-17 23:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/globsh.mk
+    + 'FALSE' variable set for 'nt' shells.
+    * 'FALSE' variable set to a dummy value ($(TRUE)) for 'dos' and 'os2' shells.
+
+  * config/wce/mingwarm.mk
+  * config/win/mingw.mk
+  * config/win/cygwin.mk
+    ! Fixed to fail after deleting the library on 'ar' failure.
+
 2010-06-17 22:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbfsapi.c
     ! hb_fsFName*(): Fixed to not GPF when called with NULL parameters.
@@ -92,7 +102,7 @@
            IOW I'm looking for a win shell equivalent of this sequence:
               AR_RULE = $(AR) ... || ( $(RM) ... && **false** )
            where **false** is something which creates no output and returns
-           non-zero errorlevel.
+           non-zero errorlevel. [PENDING: dos and os2 shells]
 
   * ChangeLog
     + More explanation to prev log entry.

harbour/config/globsh.mk

@@ -101,7 +101,7 @@ MDP := mkdir
 ECHO := echo
 ECHOQUOTE :=
 TRUE := $(ECHO) > nul
-FALSE :=
+FALSE := $(MD) . 2> nul
 
 dirbase::
 	-@if not exist "$(OBJ_DIR_OS)" $(MDP) "$(OBJ_DIR_OS)"
@@ -155,7 +155,7 @@ MDP := $(TOOL_DIR)os2mkdir -p
 ECHO := echo
 ECHOQUOTE :=
 TRUE := $(ECHO) > nul
-FALSE :=
+FALSE := $(TRUE)
 
 dirbase::
 	-@$(MDP) $(OBJ_DIR)
@@ -205,7 +205,7 @@ MDP := $(TOOL_DIR)dosmkdir -p
 ECHO := $(TOOL_DIR)dosecho
 ECHOQUOTE := "
 TRUE := $(ECHO) > nul
-FALSE :=
+FALSE := $(TRUE)
 
 dirbase::
 	-@$(MDP) $(OBJ_DIR_OS)

harbour/config/wce/mingwarm.mk

@@ -66,7 +66,7 @@ endef
 define create_library
    $(if $(wildcard __lib__.tmp),@$(RM) __lib__.tmp,)
    $(foreach file,$^,$(library_object))
-   ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ @__lib__.tmp $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
+   ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ @__lib__.tmp $(ARSTRIP) ) || ( $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) && $(FALSE) )
 endef
 
 AR_RULE = $(create_library)

harbour/config/win/cygwin.mk

@@ -63,7 +63,7 @@ endef
 define create_library
    $(if $(wildcard __lib__.tmp),@$(RM) __lib__.tmp,)
    $(foreach file,$^,$(library_object))
-   ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ @__lib__.tmp $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
+   ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ @__lib__.tmp $(ARSTRIP) ) || ( $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) && $(FALSE) )
 endef
 
 AR_RULE = $(create_library)

harbour/config/win/mingw.mk

@@ -107,7 +107,7 @@ endef
 define create_library
    $(if $(wildcard __lib__.tmp),@$(RM) __lib__.tmp,)
    $(foreach file,$^,$(library_object))
-   ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ @__lib__.tmp $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
+   ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ @__lib__.tmp $(ARSTRIP) ) || ( $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) && $(FALSE) )
 endef
 
 AR_RULE = $(create_library)