diff options
| author | Patrik Nyblom <[email protected]> | 2011-06-08 10:00:48 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:21:10 +0100 |
| commit | f2fce18b897189a60c518017704bf3b100451a93 (patch) | |
| tree | 17e77a595f8f0f5c1f20813985b8a346b22abeee /erts/etc/win32/msys_tools | |
| parent | 7f9e276476c4939cf3c79f6786abf0b714cee333 (diff) | |
| download | otp-f2fce18b897189a60c518017704bf3b100451a93.tar.gz otp-f2fce18b897189a60c518017704bf3b100451a93.tar.bz2 otp-f2fce18b897189a60c518017704bf3b100451a93.zip | |
Get cerl and distribution working in Win64
Can still not setup -a, but cerl works.
Diffstat (limited to 'erts/etc/win32/msys_tools')
| -rw-r--r-- | erts/etc/win32/msys_tools/erlc | 10 | ||||
| -rw-r--r-- | erts/etc/win32/msys_tools/javac.sh | 24 | ||||
| -rw-r--r-- | erts/etc/win32/msys_tools/make_local_ini.sh | 2 |
3 files changed, 23 insertions, 13 deletions
diff --git a/erts/etc/win32/msys_tools/erlc b/erts/etc/win32/msys_tools/erlc index a18ec27bf4..3793182aa8 100644 --- a/erts/etc/win32/msys_tools/erlc +++ b/erts/etc/win32/msys_tools/erlc @@ -17,9 +17,7 @@ # # %CopyrightEnd% # -# Note! This shellscript expects to be run in a cygwin environment, -# it converts erlc command lines to native windows erlc commands, which -# basically means running the command cygpath on whatever is a path... + CMD="" ECHO_ONLY=false @@ -30,14 +28,14 @@ for x in "$@"; do -I/*|-o/*) y=`echo $x | sed 's,^-[Io]\(/.*\),\1,g'`; z=`echo $x | sed 's,^-\([Io]\)\(/.*\),\1,g'`; - MPATH=`cygpath -m $y`; + MPATH=`msys2win_path.sh -m $y`; CMD="$CMD -$z$MPATH";; -pa/*) y=`echo $x | sed 's,^-pa\(/.*\),\1,g'`; - MPATH=`cygpath -m $y`; + MPATH=`msys2win_path.sh -m $y`; CMD="$CMD -pa $MPATH";; /*) - MPATH=`cygpath -m $x`; + MPATH=`msys2win_path.sh -m $x`; CMD="$CMD \"$MPATH\"";; # Needed for +'{preproc_flags,whatever}' +{preproc_flags,*}) diff --git a/erts/etc/win32/msys_tools/javac.sh b/erts/etc/win32/msys_tools/javac.sh index f9ee24593f..3dc3c55b09 100644 --- a/erts/etc/win32/msys_tools/javac.sh +++ b/erts/etc/win32/msys_tools/javac.sh @@ -22,7 +22,19 @@ # basically means running the command cygpath on whatever is a path... CMD="" -CLASSPATH=`cygpath -m -p $CLASSPATH` +save_IFS=$IFS +IFS=":" +NEWCLASSPATH="" +for x in $CLASSPATH; do + TMP=`msys2win_path.sh -m $x` + if [ -z "$NEWCLASSPATH" ]; then + NEWCLASSPATH="$TMP" + else + NEWCLASSPATH="$NEWCLASSPATH;$TMP" + fi +done +IFS=$save_IFS +CLASSPATH="$NEWCLASSPATH" export CLASSPATH #echo "CLASSPATH=$CLASSPATH" SAVE="$@" @@ -33,15 +45,15 @@ while test -n "$1" ; do y=`echo $x | sed 's,^-[Iod]\(/.*\),\1,g'`; z=`echo $x | sed 's,^-\([Iod]\)\(/.*\),\1,g'`; #echo "Foooo:$z" - MPATH=`cygpath -m $y`; + MPATH=`msys2win_path.sh -m $y`; CMD="$CMD -$z\"$MPATH\"";; -d|-I|-o) shift; - MPATH=`cygpath -m $1`; + MPATH=`msys2win_path.sh -m $1`; CMD="$CMD $x $MPATH";; /*) #echo "absolute:"$x; - MPATH=`cygpath -m $x`; + MPATH=`msys2win_path.sh -m $x`; CMD="$CMD \"$MPATH\"";; *) y=`echo $x | sed 's,",\\\",g'`; @@ -49,5 +61,5 @@ while test -n "$1" ; do esac shift done -#echo javac.exe $CMD -eval javac.exe $CMD +#echo javac.exe "$CMD" +eval javac.exe "$CMD" diff --git a/erts/etc/win32/msys_tools/make_local_ini.sh b/erts/etc/win32/msys_tools/make_local_ini.sh index 8e29573dc4..01c536461e 100644 --- a/erts/etc/win32/msys_tools/make_local_ini.sh +++ b/erts/etc/win32/msys_tools/make_local_ini.sh @@ -29,7 +29,7 @@ else RDIR=$1 fi -DDIR=`(cygpath -d $RDIR 2>/dev/null || cygpath -w $RDIR) | sed 's,\\\,\\\\\\\\,g'` +DDIR=`msys2win_path.sh $RDIR | sed 's,\\\,\\\\\\\\,g'` cat > $RDIR/bin/erl.ini <<EOF |