6979564: ":" for path separator in dist/bin/javac does not work on Windows

Reviewed-by: jjh
This commit is contained in:
Jonathan Gibbons 2010-08-25 11:24:30 -07:00
parent 19a9622303
commit 0e1661c2f1
2 changed files with 3 additions and 2 deletions

View file

@ -673,6 +673,7 @@
<filterset begintoken="#" endtoken="#">
<filter token="PROGRAM" value="@{name}"/>
<filter token="TARGET_JAVA" value="@{java}"/>
<filter token="PS" value="${path.separator}"/>
</filterset>
</copy>
<chmod file="@{bin.dir}/@{name}" perm="ugo+rx"/>

View file

@ -40,8 +40,8 @@ mylib="`dirname $mydir`"/lib
if [ "$LANGTOOLS_USE_BOOTCLASSPATH" != "no" ]; then
cp=`unzip -c "$mylib/#PROGRAM#.jar" META-INF/MANIFEST.MF |
grep "Class-Path:" |
sed -e 's|Class-Path: *||' -e 's|\([a-z]*\.jar\) *|'"$mylib"'/\1:|g'`
bcp="$mylib/#PROGRAM#.jar":$cp
sed -e 's|Class-Path: *||' -e 's|\([a-z]*\.jar\) *|'"$mylib"'/\1#PS#|g'`
bcp="$mylib/#PROGRAM#.jar#PS#$cp"
fi
# tools currently assumes that assertions are enabled in the launcher