Skip to content

Commit f0564ec

Browse files
committed
Release 2.0.0
1 parent e674b6e commit f0564ec

3 files changed

Lines changed: 58 additions & 20 deletions

File tree

autogen.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
[ -z "${EDITOR}" ] && EDITOR=vim
3+
${EDITOR} configure.acr
4+
# ${EDITOR} meson.build
5+
acr -p

configure

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# This script was automatically generated by ACR v1.9.8
2+
# This script was automatically generated by ACR v2.2.6
33
# @author: pancake <nopcode.org>
44
# @url: http://www.nopcode.org
55
# @repo: git clone https://github.com/radare/acr
@@ -67,13 +67,27 @@ if [ -e "${VPATH}/config.guess" ]; then
6767
sh ${VPATH}/config.guess
6868
return
6969
fi
70-
CPU="`uname -m|sed -e 's, ,,g'|cut -d - -f 1`"
70+
CPU="`uname -m | tr 'A-Z' 'a-z' | sed -e 's, ,,g' | cut -d - -f 1`"
7171
OS="`uname -s|tr A-Z a-z`"
7272
uname -r | grep -qE "(Microsoft|WSL)" 2>/dev/null && OS="wsl"
7373
GNU="`uname --help 2>&1 | grep gnu`"
7474
[ "${GNU}" ] && OS="${OS}-gnu"
75-
[ "${CPU}" = ppc ] && CPU="powerpc"
76-
echo "${CPU}-unknown-${OS}"
75+
# normalize CPU
76+
case "${CPU}" in
77+
ppc*|powermac*|powermacintosh*|powerpc*)
78+
if echo "${CPU}" | grep -q '64'; then
79+
CPU=powerpc64
80+
else
81+
CPU=powerpc
82+
fi
83+
;;
84+
*) ;;
85+
esac
86+
VENDOR="unknown"
87+
if [ "${OS}" = "darwin" ]; then
88+
VENDOR=apple
89+
fi
90+
echo "${CPU}-${VENDOR}-${OS}"
7791
}
7892

7993
SEARCHPATH="/usr /usr/local /usr/pkg /sw"
@@ -83,15 +97,19 @@ CROSSBUILD=0
8397
BUILD=`guess_os`
8498
HOST="${BUILD}"
8599
TARGET="${HOST}"
100+
ETCDIR="/etc"
86101
SYSCONFDIR=""
102+
DESCRIPTION=""
87103

88104
create_environ() {
89105
: ${EPREFIX:="${PREFIX}"}
90106
: ${SPREFIX:="${PREFIX}"}
91107
: ${BINDIR:="${SPREFIX}/bin"}
92108
: ${SBINDIR:="${PREFIX}/sbin"}
93-
: ${SYSCONFDIR:="${SPREFIX}/etc"}
109+
: ${ETCDIR:="${SPREFIX}/etc"}
94110
: ${LIBDIR:="${SPREFIX}/lib"}
111+
: ${PKGCFG_LIBDIR:='${exec_prefix}/lib'}
112+
: ${PKGCFG_INCDIR:='${prefix}/include'}
95113
: ${LIBEXECDIR:="${SPREFIX}/libexec"}
96114
: ${INCLUDEDIR:="${SPREFIX}/include"}
97115
: ${DATADIR:="${SPREFIX}/share"}
@@ -110,12 +128,12 @@ done
110128
: ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
111129
: ${INSTALL_MAN:=${INSTALL} -m 444}
112130
: ${INSTALL_LIB:=${INSTALL} -m 755 -c}
113-
PKGNAME='valabind' ; VERSION='1.8.0' ; VERSION_MAJOR=1; VERSION_MINOR=8; VERSION_PATCH=0; VERSION_NUMBER=10800; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
131+
PKGNAME='valabind' ; VERSION='2.0.0' ; VERSION_MAJOR=2; VERSION_MINOR=0; VERSION_PATCH=0; VERSION_NUMBER=20000; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
114132
}
115133

116134
show_usage() {
117135
cat <<EOF2
118-
'configure' configures valabind-1.8.0 to adapt to many kinds of systems.
136+
'configure' configures valabind-2.0.0 to adapt to many kinds of systems.
119137
120138
Usage: ./configure [OPTION]... [VAR=VALUE]...
121139
@@ -147,6 +165,7 @@ Fine tuning of the installation directories:
147165
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
148166
--mandir=DIR man documentation [DATADIR/man]
149167
--sbindir=DIR system admin executables [EPREFIX/sbin]
168+
--etcdir=DIR same as --sysconfdir (/etc)
150169
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
151170
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
152171
@@ -198,10 +217,10 @@ ocho() {
198217

199218
show_version() {
200219
if [ "$QUIET" = 1 ]; then
201-
echo "1.8.0"
220+
echo "2.0.0"
202221
exit 0
203222
fi
204-
echo "valabind-1.8.0 configuration script done with acr v1.9.8.
223+
echo "valabind-2.0.0 configuration script done with acr v2.2.6.
205224
The 'Free Software Foundation' message is only for autodetection.
206225
Originally written by pancake <nopcode.org>."
207226
exit 0
@@ -229,10 +248,12 @@ case $flag in
229248
-V|-version|--version)
230249
show_version ; ;;
231250
-r|--r|--report)
232-
echo "PKGNAME: valabind"
233-
echo "VERSION: 1.8.0"
234-
echo "LANGS: c vala"
235-
echo "FLAGS: --with-vala=vala --with-valac=valac"
251+
echo "PKGNAME: valabind"
252+
echo "VERSION: 2.0.0"
253+
echo "AUTHOR: pancake"
254+
echo "EMAIL: pancake@nopcode.org"
255+
echo "LANGS: c vala"
256+
echo "FLAGS: --with-vala=vala --with-valac=valac"
236257
exit 0
237258
;;
238259
--cache-file)
@@ -262,16 +283,22 @@ echo "FLAGS: --with-vala=vala --with-valac=valac"
262283
--datadir)
263284
DATADIR="$value"; ;;
264285
--sysconfdir)
265-
SYSCONFDIR="$value"; ;;
286+
SYSCONFDIR="$value"
287+
ETCDIR="$value"; ;;
288+
--etcdir)
289+
SYSCONFDIR="$value"
290+
ETCDIR="$value"; ;;
266291
--sharedstatedir)
267292
SHAREDSTATEDIR="$value"; ;;
268293
--localstatedir)
269294
LOCALSTATEDIR="$value"; ;;
270295
--libdir)
271-
LIBDIR="$value"; ;;
296+
LIBDIR="$value"
297+
PKGCFG_LIBDIR="$value"; ;;
272298
--libpath)
273299
LDFLAGS="${LDFLAGS} ${LIBPATH}$value"; ;;
274300
--includedir)
301+
PKGCFG_INCDIR="$value"
275302
INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;;
276303
--infodir)
277304
INFODIR="$value"; ;;
@@ -297,7 +324,7 @@ parse_options "$1"
297324
shift
298325
done
299326

300-
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C VALA VALAC"
327+
ENVWORDS="MANDIR DESCRIPTION INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGCFG_LIBDIR PKGCFG_INCDIR PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C VALA VALAC"
301328

302329
create_environ
303330

@@ -312,7 +339,6 @@ ocho "checking for working directories... ${WODIS}"
312339
ocho "using prefix '${PREFIX}'"
313340
ACR_RMFILES=" test.c a.out a.exe .test.vala .test"
314341

315-
316342
COMPILER=CC
317343
ochof "checking for c compiler... "
318344
HAVE_LANG_C=1
@@ -321,7 +347,7 @@ if [ "${CROSSBUILD}" = 1 ]; then
321347
if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
322348
fi
323349
echo "int main(int argc, char **argv){return 0;}" > test.c
324-
(exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
350+
(exec ${CC} -o a.out ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
325351
if [ $? = 0 ]; then echo ${CC}; else
326352
echo no ; HAVE_LANG_C=0
327353
do_remove
@@ -357,7 +383,14 @@ for A in ${ENVWORDS} ; do
357383
[ "${A}" = VPATH ] && continue
358384
[ "${A}" = srcdir ] && continue
359385
eval "VAR=\$${A}"
360-
VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
386+
case "" in
387+
mingw*|cygwin*|msys*)
388+
VAR="`echo ${VAR} | sed -e 's/\\/\\\\/g' -e 's/\,/\\\,/g'`"
389+
;;
390+
*)
391+
VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
392+
;;
393+
esac
361394
[ $COUNT = 10 ] && COUNT=0 && SEDFLAGS="${SEDFLAGS}' -e '"
362395
COUNT=$(($COUNT+1))
363396
SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"

configure.acr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKGNAME valabind
2-
VERSION 1.8.2
2+
VERSION 2.0.0
33
CONTACT pancake ; pancake@nopcode.org
44

55
LANG_C!

0 commit comments

Comments
 (0)