WXP: small build anomaly

[Francis ANDRE]

Kelly


This patch may fix the ABS_OUTPUTDIR problem: it just avoid to transform the 
windows-i586-debug into a short name as WINDOW~1. The control of absence of 
space and the value of the path are still in place.

I will open a change request as a remainder.

Francis

diff -r 75fca0b0ab83 make/common/shared/Defs-windows.gmk
--- a/make/common/shared/Defs-windows.gmk       Thu Mar 27 12:09:50 2008 -0700
+++ b/make/common/shared/Defs-windows.gmk       Wed Apr 02 10:55:07 2008 +0200
@@ -85,6 +85,10 @@
  # We assume cygpath is available in the search path
  #    NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
  CYGPATH_CMD=cygpath -a -s -m
+CYGPATH_CMD_LONG=cygpath -a -m
+define FullPathLong
+$(shell $(CYGPATH_CMD_LONG) $1 2> $(DEV_NULL))
+endef
  define FullPath
  $(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL))
  endef
diff -r 75fca0b0ab83 make/common/shared/Defs.gmk
--- a/make/common/shared/Defs.gmk       Thu Mar 27 12:09:50 2008 -0700
+++ b/make/common/shared/Defs.gmk       Wed Apr 02 10:55:07 2008 +0200
@@ -456,7 +456,7 @@
  endif
  # Define absolute path if needed and check for spaces and null value
  ifndef ABS_OUTPUTDIR
-  ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
+  ABS_OUTPUTDIR:=$(call FullPathLong,$(OUTPUTDIR))
  endif
  ABS_OUTPUTDIR:=$(call AltCheckSpaces,ABS_OUTPUTDIR)
  ABS_OUTPUTDIR:=$(call AltCheckValue,ABS_OUTPUTDIR)

Kelly O'Hair a écrit :
> It is not doing this on purpose. Has something to do with the
> way Windows works.
> 
> Also, make sure you get the very latest changes in the repositories,
> some work in this area has been done.
> 
> -kto
> 
> Francis ANDRE wrote:
>> Hi
>>
>> When building first OpenJDK in product mode and then build it again in 
>> debug mode, one gets a somewhat confusing anomaly:
>>
>> Z:\DEV\OpenJDK\build>dir /X
>>  Le volume dans le lecteur Z s'appelle Developpement
>>  Le numéro de série du volume est A0AB-7CB1
>>
>>  Répertoire de Z:\DEV\OpenJDK\build
>>
>> 01/04/2008  09:15    <REP>                       .
>> 01/04/2008  09:15    <REP>                       ..
>> 01/04/2008  09:15    <REP>          WINDOW~1     windows-i586
>> 01/04/2008  09:17    <REP>          WINDOW~2     WINDOW~1-debug
>>                0 fichier(s)                0 octets
>>
>>
>> IMHO, it would be less confusing to create a 'windows-i586' directory 
>> for the release mode and a 'windows-i586-debug' directory for the 
>> debug mode to get something like
>>
>> 01/04/2008  09:15    <REP>          WINDOW~1     windows-i586
>> 01/04/2008  09:17    <REP>          WINDOW~2     windows-i586-debug
>>
>>
>> Francis
> 
> 
-------------- next part --------------
diff -r 75fca0b0ab83 make/common/shared/Defs-windows.gmk
--- a/make/common/shared/Defs-windows.gmk	Thu Mar 27 12:09:50 2008 -0700
+++ b/make/common/shared/Defs-windows.gmk	Wed Apr 02 10:56:30 2008 +0200
@@ -85,6 +85,10 @@
 # We assume cygpath is available in the search path
 #    NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
 CYGPATH_CMD=cygpath -a -s -m
+CYGPATH_CMD_LONG=cygpath -a -m
+define FullPathLong
+$(shell $(CYGPATH_CMD_LONG) $1 2> $(DEV_NULL))
+endef
 define FullPath
 $(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL))
 endef
diff -r 75fca0b0ab83 make/common/shared/Defs.gmk
--- a/make/common/shared/Defs.gmk	Thu Mar 27 12:09:50 2008 -0700
+++ b/make/common/shared/Defs.gmk	Wed Apr 02 10:56:30 2008 +0200
@@ -456,7 +456,7 @@
 endif
 # Define absolute path if needed and check for spaces and null value
 ifndef ABS_OUTPUTDIR
-  ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
+  ABS_OUTPUTDIR:=$(call FullPathLong,$(OUTPUTDIR))
 endif
 ABS_OUTPUTDIR:=$(call AltCheckSpaces,ABS_OUTPUTDIR)
 ABS_OUTPUTDIR:=$(call AltCheckValue,ABS_OUTPUTDIR)