diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

Browse Source 
get corrected indent
This commit is contained in:
vscosta 2014-10-30 16:38:24 +00:00
parent 0f87d6a5f0
commit 84c763b4b4
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
misc/mkwin
View File

@ -28,6 +28,7 @@ MXE=$HOME/Yap/mxe/usr
THREADS=no THREADS=no
# use 64 bits # use 64 bits
ABI=64 ABI=64
SRC=/c/cygwin/Yap/yap-6.3 SRC=/c/cygwin/Yap/yap-6.3
#SRC=/l/work/noth/git #SRC=/l/work/noth/git
#SRC_WIN=L:\\work\\noth\\git #SRC_WIN=L:\\work\\noth\\git
@ -60,6 +61,7 @@ done
# srcdir comes from here, please avoid relative paths # srcdir comes from here, please avoid relative paths
CONFIGURE="$SRC"/configure CONFIGURE="$SRC"/configure
DEBUG=" --enable-debug-yap --enable-low-level-tracer"
# debugging setup # debugging setup
do_compile=true do_compile=true
@ -105,6 +107,7 @@ fi
# HOME WIN32 configuration # HOME WIN32 configuration
if test $ABI = 32; then if test $ABI = 32; then
ABI=32
case $( uname ) in case $( uname ) in
*Darwin*) *Darwin*)
#use mxe as a cross compiler #use mxe as a cross compiler
@ -120,12 +123,27 @@ if test $ABI = 32; then
;; ;;
esac esac
PYTHON_PATH="/c/Python27" case $( uname ) in
export PATH="$GCC_DIR"/bin:$PATH *Darwin*)
GECODE_PATH="/c/Program Files/Gecode" GCC_DIR="$MXE"
GMP=/c/cygwin/Yap/win32 HOST="x86_64-w64-mingw32"
CUDD_PATH=/c/cygwin/Yap/cudd-2.5.0-mingw32 LIB_PATH="$MXE"/"$HOST"/lib
JAVA_PATH="/c/Program Files (x86)/Java/jdk1.7.0_51" ;;
*MINGW64*)
GCC_DIR=/c/TDM-GCC-64
HOST="x86_64-w64-mingw32"
LIB_PATH="$GCC_DIR"/"$HOST"/lib
;;
esac
# ok.
# BDD compiler package. Get version that compiles on Windows from Vitor!
# GMP=/l/Work/noth/msys/1.0/local
GMP=/c/msys64/usr/win32
CUDD=/c/cygwin/Yap/cudd-2.5.0-mingw32
GECODE=no # "/c/Program Files/Gecode"
JAVA="$( echo /c/Program\ Files\ */Java/jdk* )"
PYTHON="/c/Python27"
R="$( echo /c/Program\ Files/R/R-*/bin/i* )"
HOST+=" --enable-abi=32" HOST+=" --enable-abi=32"
fi fi
@ -199,15 +217,14 @@ if test "$do_compile" = true; then
mkdir -p "$BUILD" mkdir -p "$BUILD"
# /bin/rm -rf "$BUILD"/* # /bin/rm -rf "$BUILD"/*
"$CONFIGURE" --host="$HOST" \ "$CONFIGURE" --host="$HOST" \
--prefix="$TARGET" \ --prefix="$TARGET" $DEBUG\
--with-R="$R" \ --with-R="$R" \
--with-java="$JAVA" \ --with-java="$JAVA" \
--with-gmp="$GMP" \ --with-gmp="$GMP" \
--with-python="$PYTHON" \ --with-python="$PYTHON" \
--with-cudd="$CUDD" --enable-bddlib="$BDDLIB" --with-cplint="$CPLINT" \ --with-cudd="$CUDD" --enable-bddlib="$BDDLIB" --with-cplint="$CPLINT" \
--with-gecode="$GECODE" \ --with-gecode="$GECODE" \
--enable-threads="$THREADS" --enable-pthread-locking \ --enable-threads="$THREADS" --enable-pthread-locking
--enable-debug-yap --enable-low-level-tracer
make #-j 4 install make #-j 4 install
fi fi