Skip to content

Commit

Permalink
Use acr 0.9.6 to fix r2-bindings configure and dist with xz
Browse files Browse the repository at this point in the history
  • Loading branch information
radare committed Nov 10, 2013
1 parent fd27df8 commit e578289
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ purge: purge-doc purge-dev
rm -rf ${DESTDIR}/${INCLUDEDIR}/libr

dist:
-[ configure -nt config-user.mk ] && ./configure --prefix=${PREFIX}
git log $$(git show-ref `git tag |tail -n1`)..HEAD > ChangeLog
DIR=`basename $$PWD` ; \
FILES=`git ls-files | sed -e s,^,radare2-${VERSION}/,` ; \
Expand Down
6 changes: 3 additions & 3 deletions r2-bindings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ PYTHON2_CONFIG=python2.7-config
PYTHON3_CONFIG=python3.2-config

ifneq ($(shell bsdtar -h 2>/dev/null|grep bsdtar),)
TAR=bsdtar czvf
TAR=bsdtar cJvf
else
TAR=tar -czvf
TAR=tar -cJvf
endif

W32PY="${HOME}/.wine/drive_c/Python27/"
Expand Down Expand Up @@ -95,7 +95,7 @@ dist:
CXXFILES=`cd .. ; find r2-bindings | grep -e cxx$$ -e py$$ | sed -e "s,r2-bindings/,$${PKG}/,"` ; \
cd .. && mv $${DIR} $${PKG} && \
echo $$FILES ; \
${TAR} $${PKG}.tar.gz $${FILES} $${CXXFILES} ; \
${TAR} $${PKG}.tar.xz $${FILES} $${CXXFILES} ; \
mv $${PKG} $${DIR}

# TODO: valadoc
Expand Down
12 changes: 6 additions & 6 deletions r2-bindings/configure
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# This script was automatically generated by ACR v0.9.5
# This script was automatically generated by ACR v0.9.6
# @author: pancake <youterm.com>
# @url: http://www.nopcode.org
# @repo: hg clone http://hg.youterm.com/acr
Expand Down Expand Up @@ -174,7 +174,7 @@ take_environ() {
}

show_version() {
echo "radare2-bindings-0.9.6 configuration script done with acr v0.9.5.
echo "radare2-bindings-0.9.6 configuration script done with acr v0.9.6.
The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <youterm.com>."
exit 0
Expand Down Expand Up @@ -302,7 +302,7 @@ if [ "${CROSSBUILD}" = 1 ]; then
if [ "$?" = 0 ]; then CXX="${HOST}-${CXX}"; fi
fi
echo "#include <iostream>" > test.cxx
echo "main(){ std::cout << 1; }" >> test.cxx
echo "int main(){ std::cout << 1; return 0;}" >> test.cxx
(exec ${CXX} ${CXXFLAGS} ${LDFLAGS} test.cxx -lstdc++ >/dev/null 2>&1)
if [ $? = 0 ]; then echo ${CXX}; else
HAVE_LANG_CXX=0
Expand All @@ -324,7 +324,7 @@ else
break;
fi
done
unset IFS=:
unset IFS
fi
if [ -n "${FIND}" ]; then
echo ${FIND};
Expand All @@ -346,7 +346,7 @@ else
break;
fi
done
unset IFS=:
unset IFS
fi
if [ -n "${FIND}" ]; then
echo ${FIND};
Expand All @@ -368,7 +368,7 @@ else
break;
fi
done
unset IFS=:
unset IFS
fi
if [ -n "${FIND}" ]; then
echo ${FIND};
Expand Down

0 comments on commit e578289

Please sign in to comment.