diff options
Diffstat (limited to '')
| -rw-r--r-- | install-win32/maketap | 100 | ||||
| -rw-r--r-- | install-win32/maketapinstall | 72 |
2 files changed, 13 insertions, 159 deletions
diff --git a/install-win32/maketap b/install-win32/maketap index 0d33329..b9c4070 100644 --- a/install-win32/maketap +++ b/install-win32/maketap @@ -1,101 +1,17 @@ #!/bin/sh -# Build the x86 and x64 versions of the TAP driver -# Requires the Windows DDK +# Get the x86 and x64 versions of the TAP driver # get version.nsi definitions . autodefs/defs.sh -if [ -n "$DDKVER" ] && [ -d "/c/WINDDK/$DDKVER" ] ; then - -# common declarations for all DDK build targets -. install-win32/ddk-common - -# configure tap driver sources -MACRO="perl install-win32/macro.pl autodefs/defs.in" -IFDEF="perl install-win32/ifdef.pl" -rm -rf tap-win32/amd64 -mkdir tap-win32/amd64 -$MACRO <tap-win32/SOURCES.in >tap-win32/SOURCES -$MACRO <tap-win32/i386/OemWin2k.inf.in | $IFDEF >tap-win32/i386/OemWin2k.inf -$MACRO <tap-win32/i386/OemWin2k.inf.in | $IFDEF -DAMD64 >tap-win32/amd64/OemWin2k.inf - -if [ -n "$PRODUCT_TAP_DEBUG" ] ; then - w2ktarget="w2k c" - amdtarget="chk $x64_tag WNET" -else - w2ktarget="w2k f" - amdtarget="fre $x64_tag WNET" -fi - -if [ -z "$DRVBINSRC" ] ; then - if [ -n "$TAP_BIN_AMD64" ]; then - amdtarget="" - fi - - cd tap-win32 - t=`pwd` - cd .. - - for mode in "$w2ktarget" "$amdtarget"; do - echo '**********' build TAP $mode - cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef" - mv tap-win32/tapdrvr.cod "tap-win32/tapdrvr-$(echo $mode | tr ' ' '-').cod" +if [ -d "$TAPBINSRC" ]; then + mkdir -p $GENOUT/driver/i386 &>/dev/null + mkdir -p $GENOUT/driver/amd64 &>/dev/null + for arch in i386 amd64; do + s=$TAPBINSRC/$arch + cp $s/*.sys $s/*.cat $s/*.inf $GENOUT/driver/$arch done - - title openvpn-build &>/dev/null - - if [ -n "$TAP_BIN_AMD64" ]; then - mkdir -p $t/amd64 - cp "$TAP_BIN_AMD64" $t/amd64 - fi - - # copy driver files into tap-win32/dist - cd tap-win32 - rm -rf dist - mkdir dist - cd dist - mkdir i386 - mkdir amd64 - cd i386 - x86=`pwd` - cd ../amd64 - x64=`pwd` - cd ../.. - cp i386/OemWin2k.inf $x86 - cp i386/*.sys $x86 - cp amd64/OemWin2k.inf $x64 - cp amd64/*.sys $x64 - out="TAP driver catalog file is undefined"; - echo "$out" >$x86/$PRODUCT_TAP_ID.cat - echo "$out" >$x64/$PRODUCT_TAP_ID.cat - cd .. -fi - -# $DRVBINSRC, if defined, points to prebuilt TAP driver and -# tapinstall.exe. -mkdir $GENOUT &>/dev/null -rm -rf $GENOUT/driver -if [ -z "$DRVBINSRC" ] ; then - # Get TAP drivers - cp -a tap-win32/dist $GENOUT/driver - - # Sign TAP drivers - if [ -d "$SIGNTOOL" ]; then - $SIGNTOOL/signtap - fi -else - cp -a $DRVBINSRC/driver $GENOUT/driver -fi - -# $DRVBINDEST, if defined, points to a destination directory -# where TAP driver and tapinstall.exe will be saved, to be used -# as a $DRVBINSRC in future builds. -if [ -n "$DRVBINDEST" ] ; then - mkdir $DRVBINDEST &>/dev/null - cp -a $GENOUT/driver $DRVBINDEST -fi - else - echo Not building TAP driver -- DDK version $DDKVER NOT FOUND + echo Cannot find pre-built tap drivers fi diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall index eae4471..9fe0470 100644 --- a/install-win32/maketapinstall +++ b/install-win32/maketapinstall @@ -1,77 +1,15 @@ #!/bin/sh -# Build the x86 and x64 versions of the tapinstall tool -# Requires the Windows DDK. -# TISRC should be set to directory containing -# tapinstall source code. +# Get the x86 and x64 versions of the tapinstall tool # get version.nsi definitions . autodefs/defs.sh -if [ -n "$DDKVER" ] && [ -d "/c/WINDDK/$DDKVER" ] ; then - -if ! [ -d "$TISRC" ] ; then - echo "$TISRC" NOT INSTALLED - exit 1 -fi - -# common declarations for all DDK build targets -. install-win32/ddk-common - -amdtarget="" -if [ -z "$TI_BIN_AMD64" ]; then - amdtarget="fre $x64_tag WNET" -fi - -if [ -z "$DRVBINSRC" ] ; then - rm -rf tapinstall - cp -a "$TISRC" tapinstall - - if [ -e tapinstall/sources.in ]; then - perl install-win32/ifdef.pl autodefs/defs.in <tapinstall/sources.in >tapinstall/sources - fi - - cd tapinstall - t=`pwd` - cd .. - - for mode in "w2k f" "$amdtarget"; do - if [ -n "$mode" ]; then - echo '**********' build TAPINSTALL $mode - cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef" - fi - done -fi - -if [ -n "$TI_BIN_AMD64" ]; then - mkdir -p $t/objfre_wnet_amd64/amd64 - cp "$TI_BIN_AMD64" $t/objfre_wnet_amd64/amd64 -fi - -# $DRVBINSRC, if defined, points to prebuilt TAP driver and -# tapinstall.exe. -if [ -z "$DRVBINSRC" ] ; then - # Get tapinstall +if [ -d "$TAPBINSRC" ]; then mkdir -p $GENOUT/tapinstall/i386 &>/dev/null mkdir -p $GENOUT/tapinstall/amd64 &>/dev/null - cp tapinstall/objfre_w2k_x86/i386/tapinstall.exe $GENOUT/tapinstall/i386 - cp tapinstall/objfre_wnet_amd64/amd64/tapinstall.exe $GENOUT/tapinstall/amd64 -else - mkdir $GENOUT &>/dev/null - cp -a $DRVBINSRC/tapinstall $GENOUT/tapinstall -fi - -# $DRVBINDEST, if defined, points to a destination directory -# where TAP driver and tapinstall.exe will be saved, to be used -# as a $DRVBINSRC in future builds. -if [ -n "$DRVBINDEST" ] ; then - mkdir $DRVBINDEST &>/dev/null - cp -a $GENOUT/driver $DRVBINDEST - cp -a $GENOUT/tapinstall $DRVBINDEST -fi - -title openvpn-build &>/dev/null - + cp $TAPBINSRC/i386/tapinstall.exe $GENOUT/tapinstall/i386 + cp $TAPBINSRC/amd64/tapinstall.exe $GENOUT/tapinstall/amd64 else - echo Not building tapinstall -- DDK version $DDKVER NOT BUILT + echo Cannot find pre-built tapinstall fi |