changeset 693:6ef801fa38b7

6979564: ":" for path separator in dist/bin/javac does not work on Windows Reviewed-by: jjh
author jjg
date Wed, 25 Aug 2010 11:24:30 -0700
parents f3323b1c65ee
children 70ebdef189c9
files make/build.xml src/share/bin/launcher.sh-template
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/build.xml	Tue Aug 24 15:09:21 2010 -0700
+++ b/make/build.xml	Wed Aug 25 11:24:30 2010 -0700
@@ -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"/>
--- a/src/share/bin/launcher.sh-template	Tue Aug 24 15:09:21 2010 -0700
+++ b/src/share/bin/launcher.sh-template	Wed Aug 25 11:24:30 2010 -0700
@@ -40,8 +40,8 @@
 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